move 2.13 to the multi-module test

Author: maiflai

src/functionalTest/java/org.scoverage/ScalaMultiModuleCrossVersionTest.java

@@ -33,6 +33,7 @@ private void assertAllReportFilesExist() {
 
         assert211ReportFilesExist();
         assert212ReportFilesExist();
+        assert213ReportFilesExist();
         assertAggregationFilesExist();
     }
 
@@ -56,4 +57,11 @@ private void assert212ReportFilesExist() {
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
         Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World212.scala.html").exists());
     }
+
+    private void assert213ReportFilesExist() {
+
+        File reportDir = reportDir(projectDir().toPath().resolve("2_13").toFile());
+        Assert.assertTrue(resolve(reportDir, "index.html").exists());
+        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World213.scala.html").exists());
+    }
 }

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

@@ -133,15 +133,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
         Assert.assertFalse(resolve(buildDir(), "classes/scala/scoverage/org/hello/World.class").exists());
     }
 
-    @Test
-    public void reportScoverageUnder2_13() throws Exception {
-        run("clean", ScoveragePlugin.getREPORT_NAME(),
-                "-PscalaVersionMinor=13",
-                "-PscalaVersionBuild=0",
-                "-Pscoverage.scoverageScalaVersion=2_13");
-        assertReportFilesExist();
-    }
-
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile group: 'org.scala-lang', name: 'scala-library', version: "2.13.0"
+    testCompile group: 'org.scalatest', name: "scalatest_2.13", version: scalatestVersion
+}

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/src/main/scala/org/hello/World213.scala

@@ -0,0 +1,9 @@
+package org.hello
+
+class World213 {
+
+  def foo(): String = {
+    val s = "2" + "12"
+    s
+  }
+}

src/functionalTest/resources/projects/scala-multi-module-cross-version/2_13/src/test/scala/org/hello/World213Suite.scala

@@ -0,0 +1,13 @@
+package org.hello
+
+import org.junit.runner.RunWith
+import org.scalatest.FunSuite
+import org.scalatest.junit.JUnitRunner
+
+@RunWith(classOf[JUnitRunner])
+class World212Suite extends FunSuite {
+
+  test("foo") {
+    new World213().foo()
+  }
+}

src/functionalTest/resources/projects/scala-multi-module-cross-version/build.gradle

@@ -33,4 +33,6 @@ scoverage {
     minimumRate = 0.5
 }
 
-project(":2_11").tasks.reportScoverage.mustRunAfter(project(":2_12").tasks.reportScoverage)
+project(":2_11").tasks.reportScoverage
+        .mustRunAfter(project(":2_12").tasks.reportScoverage)
+        .mustRunAfter(project(":2_13").tasks.reportScoverage)

src/functionalTest/resources/projects/scala-multi-module-cross-version/settings.gradle

@@ -1 +1 @@
-include '2_11', '2_12'
+include '2_11', '2_12', '2_13'