CI test results report (WIP)

.github/workflows/gradle.yml

@@ -11,8 +11,19 @@ on:
 
 jobs:
   build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 'ignore warnings'
+            additional-check-args: ''
+            continue-on-error: false
+          - name: 'fail on warning'
+            additional-check-args: '--warning-mode=fail -PfailOnWarning'
+            continue-on-error: true
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.continue-on-error }}
 
     steps:
     - uses: actions/checkout@v2
@@ -24,4 +35,10 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run: ./gradlew --info --stacktrace check
+      run: ./gradlew --info --stacktrace functionalTest --tests ScalaSingleModuleTest ${{ matrix.additional-check-args }}
+
+    - name: Publish Unit Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v1
+      if: always()
+      with:
+        files: test-results/**/*.xml

build.gradle

@@ -104,6 +104,8 @@ task functionalTest(type: Test) {
         showStandardStreams = System.env.CI == 'true'
     }
 
+    systemProperty 'failOnWarning', project.hasProperty('failOnWarning')
+
     mustRunAfter crossScalaVersionTest
 }
 check.dependsOn functionalTest
@@ -206,4 +208,4 @@ idea.project.settings {
     taskTriggers {
         beforeBuild fixIdeaPluginClasspath, pluginUnderTestMetadata
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java

@@ -30,7 +30,7 @@ public void checkAndAggregateAll() throws Exception {
     private void assertAggregationFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "2_12/src/main/scala/org/hello/World2_12.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "2_13/src/main/scala/org/hello/World2_13.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World2_12.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World2_13.scala.html").exists());
     }
 }

src/crossScalaVersionTest/java/org/scoverage/ScalaVersionTest.java

@@ -27,6 +27,6 @@ public void report() throws Exception {
 
         File reportDir = reportDir(projectDir().toPath().resolve(scalaVersion).toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World" + scalaVersion + ".scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/World" + scalaVersion + ".scala.html").exists());
     }
-}
+}

src/functionalTest/java/org/scoverage/ScalaJavaAnnotationProcessorTest.java

@@ -44,13 +44,13 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());
     }
 
     private void assertMixedScalaJavaReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());
     }
 }

src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java

@@ -46,21 +46,21 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "scala_only/src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScalaOnly.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());
     }
 
     private void assertScalaOnlyReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("scala_only").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScalaOnly.scala.html").exists());
     }
 
     private void assertMixedScalaJavaReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());
     }
 }

src/functionalTest/java/org/scoverage/ScalaMultiModuleTest.java

@@ -297,35 +297,35 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());
     }
 
     private void assertRootReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 
     private void assertAReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());
     }
 
     private void assertBReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());
     }
 
     private void assertCommonReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());
     }
 }

src/functionalTest/java/org/scoverage/ScalaMultiModuleWithMultipleTestTasksTest.java

@@ -294,35 +294,35 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());
     }
 
     private void assertRootReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 
     private void assertAReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());
     }
 
     private void assertBReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());
     }
 
     private void assertCommonReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());
     }
 }

src/functionalTest/java/org/scoverage/ScalaSingleModuleTest.java

@@ -91,7 +91,7 @@ public void reportScoverageWithExcludedClasses() throws Exception {
         result.assertTaskDoesntExist(ScoveragePlugin.getAGGREGATE_NAME());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -125,7 +125,7 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
                 "-PexcludedFile=.*", "-P" + ScoveragePlugin.getSCOVERAGE_COMPILE_ONLY_PROPERTY());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -136,6 +136,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 }

src/functionalTest/java/org/scoverage/ScalaSingleModuleWithDependencyManagerTest.java

@@ -26,6 +26,6 @@ public void checkScoverage() throws Exception {
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
-}
+}