Fix location of the functional tests ('org.scoverage' -> 'org/scoverage') and separate the cross-version tests to a separate source set

Author: eyalroth

build.gradle

@@ -44,6 +44,7 @@ apply plugin: 'groovy'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
+
 dependencies {
     compileOnly "org.scoverage:scalac-scoverage-plugin_2.12:1.4.1"
     implementation group: 'commons-io', name: 'commons-io', version: '2.6'
@@ -58,38 +59,51 @@ dependencies {
 sourceSets {
     functionalTest {
         java.srcDir file('src/functionalTest/java')
-        resources.srcDir file('src/functionalTest/resources')
-        compileClasspath += sourceSets.main.output  + configurations.testRuntimeClasspath
-        runtimeClasspath += output + compileClasspath
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
+    crossScalaVersionTest {
+        java.srcDir file('src/crossScalaVersionTest/java')
+        compileClasspath += sourceSets.main.output + sourceSets.functionalTest.output
+        runtimeClasspath += sourceSets.main.output + sourceSets.functionalTest.output
     }
 }
 
-task crossScalaVersionFunctionalTest(type: Test) {
+configurations {
+    functionalTestImplementation.extendsFrom testImplementation
+    functionalTestRuntimeOnly.extendsFrom testRuntimeOnly
+
+    crossScalaVersionTestImplementation.extendsFrom testImplementation
+    crossScalaVersionTestRuntimeOnly.extendsFrom testRuntimeOnly
+}
+
+task crossScalaVersionTest(type: Test) {
     description = 'Runs the cross scala version functional test.'
     group = 'verification'
-    testClassesDirs = sourceSets.functionalTest.output.classesDirs
-    classpath = sourceSets.functionalTest.runtimeClasspath
-    include '**/crossversion/*'
+    testClassesDirs = sourceSets.crossScalaVersionTest.output
+    classpath = sourceSets.crossScalaVersionTest.runtimeClasspath
     forkEvery = 1 // crucial to run every test in its own JVM
 
     testLogging.showStandardStreams = true
 
     mustRunAfter test
 }
+check.dependsOn crossScalaVersionTest
 
 task functionalTest(type: Test) {
     description = 'Runs the functional tests.'
     group = 'verification'
-    testClassesDirs = sourceSets.functionalTest.output.classesDirs
+    testClassesDirs = sourceSets.functionalTest.output
     classpath = sourceSets.functionalTest.runtimeClasspath
-    exclude '**/crossversion/*'
 
-    dependsOn crossScalaVersionFunctionalTest
+    testLogging.showStandardStreams = true
+
+    mustRunAfter crossScalaVersionTest
 }
 check.dependsOn functionalTest
 
 gradlePlugin {
-    testSourceSets sourceSets.functionalTest
+    testSourceSets sourceSets.functionalTest, sourceSets.crossScalaVersionTest
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {

src/functionalTest/java/org/scoverage/crossversion/Scala211Test.java renamed to src/crossScalaVersionTest/java/org/scoverage/Scala211Test.java

@@ -1,4 +1,4 @@
-package org.scoverage.crossversion;
+package org.scoverage;
 
 public class Scala211Test extends ScalaVersionTest {
     public Scala211Test() {

src/functionalTest/java/org/scoverage/crossversion/Scala212Test.java renamed to src/crossScalaVersionTest/java/org/scoverage/Scala212Test.java

@@ -1,4 +1,4 @@
-package org.scoverage.crossversion;
+package org.scoverage;
 
 public class Scala212Test extends ScalaVersionTest {
     public Scala212Test() {

src/functionalTest/java/org/scoverage/crossversion/Scala213Test.java renamed to src/crossScalaVersionTest/java/org/scoverage/Scala213Test.java

@@ -1,4 +1,4 @@
-package org.scoverage.crossversion;
+package org.scoverage;
 
 public class Scala213Test extends ScalaVersionTest {
     public Scala213Test() {

src/functionalTest/java/org/scoverage/crossversion/ScalaCrossVersionAggregationTest.java renamed to src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java

@@ -1,4 +1,4 @@
-package org.scoverage.crossversion;
+package org.scoverage;
 
 import org.junit.Assert;
 import org.junit.Test;

src/functionalTest/java/org/scoverage/crossversion/ScalaVersionTest.java renamed to src/crossScalaVersionTest/java/org/scoverage/ScalaVersionTest.java

@@ -1,4 +1,4 @@
-package org.scoverage.crossversion;
+package org.scoverage;
 
 import org.junit.Assert;
 import org.junit.Test;