GEODE-5530: Removes test dependency from other test source sets (apache#2294)

Moves common sources to geode-dunit or geode-junit.

Co-authored-by: Finn Sutherland <[email protected]>

Author: jake-at-work

extensions/geode-modules-session/build.gradle

@@ -21,22 +21,18 @@ dependencies {
   compile project(':extensions/geode-modules-session-internal')
   compile project(':geode-core')
 
-  testCompile project(':geode-junit')
-
-  testCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
-  testCompile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
-  testCompile('com.mockrunner:mockrunner-servlet:' + project.'mockrunner.version') {
+  integrationTestCompile project(":geode-dunit")
+  integrationTestCompile ('org.httpunit:httpunit:' + project.'httpunit.version') {
+    exclude group: 'javax.servlet'
+  }
+  integrationTestCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version: project.'jetty.version', classifier: 'tests')
+  integrationTestCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: project.'jetty.version', classifier: 'tests')
+  integrationTestCompile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+  integrationTestCompile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+  integrationTestCompile('com.mockrunner:mockrunner-servlet:' + project.'mockrunner.version') {
     exclude group: 'jboss'
     exclude group: 'xerces'
   }
-  testCompile(group: 'org.eclipse.jetty', name: 'jetty-http', version: project.'jetty.version', classifier: 'tests')
-  testCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: project.'jetty.version', classifier: 'tests')
-  testCompile ('org.httpunit:httpunit:' + project.'httpunit.version') {
-    exclude group: 'javax.servlet'
-  }
-
-
-  integrationTestCompile project(":geode-dunit")
 }
 
 jar {

extensions/geode-modules-tomcat7/build.gradle

@@ -32,19 +32,17 @@ dependencies {
   }
   compile 'org.apache.tomcat:tomcat-juli:' + project.'tomcat7.version'
 
-  testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-
-  testRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
-  testRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
-  testRuntime 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
-  testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
-
-  testCompile project(path: ':geode-junit')
-  testCompile files(project(':extensions/geode-modules').sourceSets.test.output)
-
   integrationTestCompile project(":geode-dunit")
+  integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
+
+  // TODO fix test dependency on other projects
   integrationTestCompile files(project(':extensions/geode-modules').sourceSets.integrationTest.output)
 
+  integrationTestRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
+  integrationTestRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
+  integrationTestRuntime 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+  integrationTestRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
+
   eclipse.classpath.file {
     whenMerged { classpath ->
       classpath.entries.removeAll { entry -> entry.path.contains('geode-modules/build')}

extensions/geode-modules-tomcat8/build.gradle

@@ -30,12 +30,10 @@ dependencies {
     exclude module: 'tomcat-servlet-api'
   }
   compile 'org.apache.tomcat:tomcat-juli:' + project.'tomcat8.version'
-
-  testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
+  compile 'javax.servlet:javax.servlet-api:' + '3.1.0'
 
   testRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
   testRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
-  compile 'javax.servlet:javax.servlet-api:' + '3.1.0'
   testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
   testCompile 'javax.security.auth.message:javax.security.auth.message-api:' + '1.1'
 
@@ -45,6 +43,10 @@ dependencies {
   testCompile files(project(':geode-old-versions').sourceSets.main.output)
 
   distributedTestCompile project(":geode-dunit")
+  distributedTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
+  // TODO remove shared source dependency
+  distributedTestCompile sourceSets.integrationTest.output
+  distributedTestCompile project(':extensions/geode-modules').sourceSets.integrationTest.output
 
   eclipse.classpath.file {
     whenMerged { classpath ->

extensions/geode-modules/build.gradle

@@ -31,10 +31,10 @@ dependencies {
   testCompile project(':geode-junit')
 
   testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
-  testCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-  testRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
 
   integrationTestCompile project(":geode-dunit")
+  integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
+  integrationTestCompile 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
 }
 
 disableMavenPublishing()

extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Callback.java

@@ -65,9 +65,6 @@ configurations {
 }
 
 dependencies {
-  compileOnly project(':geode-core')
-  testCompile project(':geode-core')
-
   archives project(':geode-common')
   archives project(':geode-json')
   archives project(':geode-core')
@@ -82,74 +79,67 @@ dependencies {
   archives project(':geode-cq')
   archives project(':geode-rebalancer')
 
-  testCompile project(':geode-junit')
-  testCompile project(':geode-pulse')
-  testCompile files(project(':geode-core').sourceSets.test.output)
-  testCompile files(project(':geode-pulse').sourceSets.test.output)
-  testCompile ('org.springframework:spring-web:' + project.'springframework.version') {
-    exclude module: 'aopalliance'
-    exclude module: 'spring-aop'
-  }
-
-  testCompile 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
-  testCompile 'org.apache.httpcomponents:httpcore:' + project.'httpcore.version'
-  testCompile 'com.google.guava:guava:' + project.'guava.version'
-  testCompile 'org.apache.commons:commons-exec:' + project.'commons-exec.version'
 
-  testCompile group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
-
-  testCompile (project(':extensions/geode-modules')) {
-    // Remove everything related to Tomcat
-    exclude group: 'org.apache.tomcat'
-  }
-  testCompile (project(':extensions/geode-modules-session-internal')) {
-    // Remove everything related to Tomcat
-    exclude group: 'org.apache.tomcat'
-  }
+  testCompile project(':geode-core')
+  testCompile project(':geode-junit')
 
-  testCompile project(':extensions/session-testing-war')
 
-  testCompile 'org.seleniumhq.selenium:selenium-api:' + project.'selenium.version'
-  testCompile 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
-  testCompile 'org.seleniumhq.selenium:selenium-support:' + project.'selenium.version'
+  integrationTestCompile project(':geode-core')
+  integrationTestCompile project(":geode-junit")
+  integrationTestCompile project(":geode-dunit")
+  integrationTestCompile project(":geode-pulse")
+  integrationTestCompile 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
 
-  testRuntime files("${System.getProperty('java.home')}/../lib/tools.jar")
-  testRuntime files("$buildDir/install/${distributions.main.baseName}/lib/geode-dependencies.jar")
 
+  distributedTestCompile project(':geode-core')
+  distributedTestCompile project(':extensions/session-testing-war')
+  distributedTestCompile group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
+  distributedTestCompile 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
+  // TODO refactor out common test framework
+  distributedTestCompile sourceSets.integrationTest.output
 
-  gfshDependencies ('org.springframework:spring-web:' + project.'springframework.version'){
-    exclude module: 'spring-core'
-    exclude module: 'commons-logging'
+  distributedTestRuntime (project(':extensions/geode-modules-session-internal')) {
+    exclude group: 'org.apache.tomcat'
   }
 
-  testCompile files(project(':geode-old-versions').sourceSets.main.output)
 
-  integrationTestCompile project(":geode-dunit")
+  acceptanceTestCompile project(':geode-core')
+  acceptanceTestCompile project(":geode-dunit")
 
-  distributedTestCompile project(":geode-dunit")
 
-  acceptanceTestCompile project(":geode-dunit")
+  uiTestCompile project(':geode-core')
+  uiTestCompile project(":geode-dunit")
+  uiTestCompile project(":geode-pulse")
+  uiTestCompile 'org.seleniumhq.selenium:selenium-api:' + project.'selenium.version'
+  uiTestCompile 'org.seleniumhq.selenium:selenium-remote-driver:' + project.'selenium.version'
+  uiTestCompile 'org.seleniumhq.selenium:selenium-support:' + project.'selenium.version'
   // TODO refactor out common test framework
-  upgradeTestCompile sourceSets.distributedTest.output
+  uiTestCompile sourceSets.integrationTest.output
+  uiTestCompile project(":geode-pulse").sourceSets.uiTest.output
 
-  uiTestCompile project(":geode-dunit")
+  uiTestRuntime project(":geode-core")
+  uiTestRuntime 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
 
+
+  upgradeTestCompile project(':geode-core')
   upgradeTestCompile project(":geode-dunit")
   // TODO refactor out common test framework
   upgradeTestCompile sourceSets.distributedTest.output
-}
+  upgradeTestCompile sourceSets.test.output
 
-sourceSets {
-}
+  upgradeTestRuntime group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
+  upgradeTestRuntime 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
+  upgradeTestRuntime project(':extensions/session-testing-war')
 
-test {
-  // test from the actual classpath not the gradle classpath
-  dependsOn installDist
-  // @TODO: this doesn't seem to be working need to get basename first.
-  classpath += files "$buildDir/install/${distributions.main.baseName}/lib/geode-dependencies.jar"
+
+  gfshDependencies ('org.springframework:spring-web:' + project.'springframework.version'){
+    exclude module: 'spring-core'
+    exclude module: 'commons-logging'
+  }
 }
 
 tasks.withType(Test){
+  dependsOn installDist
   environment 'GEODE_HOME', "$buildDir/install/${distributions.main.baseName}"
 }
 

extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/CommandServlet.java

@@ -20,9 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.Properties;
 
 import org.junit.BeforeClass;
@@ -39,6 +36,7 @@
 import org.apache.geode.test.junit.categories.RestAPITest;
 import org.apache.geode.test.junit.rules.GeodeDevRestClient;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.util.test.TestUtil;
 
 @Category({RestAPITest.class})
 public class RestFunctionExecuteDUnitTest {
@@ -111,13 +109,12 @@ public void connectToServer2() throws Exception {
   }
 
   // find ImplementsFunction.java in the geode-core resource
-  private static File loadClassToFile() throws URISyntaxException {
-    URL resourceFileURL = Function.class.getClassLoader()
-        .getResource("org/apache/geode/management/internal/deployment/ImplementsFunction.java");
-    assertThat(resourceFileURL).isNotNull();
+  private static File loadClassToFile() {
+    String resourcePath = TestUtil.getResourcePath(Function.class.getClassLoader(),
+        "org/apache/geode/management/internal/deployment/ImplementsFunction.java");
+    assertThat(resourcePath).isNotNull();
 
-    URI resourceUri = resourceFileURL.toURI();
-    return new File(resourceUri);
+    return new File(resourcePath);
   }
 
 

extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/EmbeddedTomcat.java

@@ -18,35 +18,30 @@
 evaluationDependsOn(":geode-core")
 
 repositories {
-    maven {
-        url 'https://dl.bintray.com/palantir/releases'
-        // docker-compose-rule is published on bintray
-    }
+  maven {
+    // docker-compose-rule is published on bintray
+    url 'https://dl.bintray.com/palantir/releases'
+  }
 }
 
 dependencies {
-    compile project(':geode-core')
-    compile project(':geode-common')
-    compile group: 'com.zaxxer', name: 'HikariCP', version: project.'HikariCP.version'
+  compile project(':geode-core')
+  compile project(':geode-common')
+  compile group: 'com.zaxxer', name: 'HikariCP', version: project.'HikariCP.version'
 
 
-    testCompile project(':geode-junit')
+  testCompile project(':geode-junit')
 
-    //Connectors test framework.
-    testRuntime 'org.apache.derby:derby:' + project.'derby.version'
-    testCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
-    testCompile group: 'org.postgresql', name: 'postgresql', version: '42.2.2'
-    testCompile 'com.palantir.docker.compose:docker-compose-rule-junit4:0.31.1'
-    testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
-    testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
-    testCompile files(project(':geode-old-versions').sourceSets.main.output)
 
-    integrationTestCompile project(":geode-dunit")
+  integrationTestCompile project(":geode-dunit")
 
-    distributedTestCompile project(":geode-dunit")
 
-    acceptanceTestCompile project(":geode-dunit")
-}
+  acceptanceTestCompile project(":geode-dunit")
+  acceptanceTestCompile group: 'mysql', name: 'mysql-connector-java', version: '5.1.46'
+  acceptanceTestCompile group: 'com.palantir.docker.compose', name: 'docker-compose-rule-junit4', version: '0.31.1'
 
-integrationTest.forkEvery 0
+  acceptanceTestRuntime group: 'org.apache.derby', name: 'derby', version: project.'derby.version'
+  acceptanceTestRuntime group: 'org.postgresql', name: 'postgresql', version: '42.2.2'
+}
 
+integrationTest.forkEvery 0

extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/QueryCommand.java

@@ -19,7 +19,7 @@
 import org.apache.geode.test.junit.categories.SerializationTest;
 
 @Category({SerializationTest.class})
-public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTestBase {
 
   @Override
   protected String getModuleName() {

geode-assembly/build.gradle

@@ -46,7 +46,6 @@ dependencies {
 
   // External
   compileOnly files("${System.getProperty('java.home')}/../lib/tools.jar")
-  testCompile files("${System.getProperty('java.home')}/../lib/tools.jar")
   compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
   compile 'org.jgroups:jgroups:' + project.'jgroups.version'
   compile 'antlr:antlr:' + project.'antlr.version'
@@ -140,37 +139,49 @@ dependencies {
   compile project(':geode-common')
   compile project(':geode-json')
 
-  jcaCompile sourceSets.main.output
 
-  testCompile project(':geode-junit')
+  jcaCompile sourceSets.main.output
 
-  testCompile files(project(':geode-old-versions').sourceSets.main.output)
 
-  // Test Dependencies
-  // External
-  testCompile 'com.jayway.jsonpath:json-path-assert:' + project.'json-path-assert.version'
+  testCompile project(':geode-junit')
+  testCompile project(':geode-concurrency-test')
   testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
-  testRuntime 'org.apache.derby:derby:' + project.'derby.version'
   testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version'
+  testCompile 'org.springframework:spring-test:' + project.'springframework.version'
+  testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
+  testCompile files("${System.getProperty('java.home')}/../lib/tools.jar")
+
   testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
   testRuntime 'commons-configuration:commons-configuration:' + project.'commons-configuration.version'
   testRuntime 'commons-io:commons-io:' + project.'commons-io.version'
   testRuntime 'commons-validator:commons-validator:' + project.'commons-validator.version'
-  testCompile 'net.spy:spymemcached:' + project.'spymemcached.version'
-  testCompile 'redis.clients:jedis:' + project.'jedis.version'
-  testCompile 'org.springframework:spring-test:' + project.'springframework.version'
+  testRuntime 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
 
 
-  testCompile 'com.pholser:junit-quickcheck-core:' + project.'junit-quickcheck.version'
-  testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
-  testCompile 'com.pholser:junit-quickcheck-guava:' + project.'junit-quickcheck.version'
+  integrationTestCompile project(":geode-dunit")
+  integrationTestCompile project(':geode-concurrency-test')
+  integrationTestCompile 'redis.clients:jedis:' + project.'jedis.version'
+  integrationTestCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
+  integrationTestCompile 'org.springframework:spring-test:' + project.'springframework.version'
+  integrationTestCompile 'net.spy:spymemcached:' + project.'spymemcached.version'
+  integrationTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
+
+  integrationTestRuntime 'org.apache.derby:derby:' + project.'derby.version'
+  integrationTestRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
 
-  testRuntime 'xerces:xercesImpl:' + project.'xercesImpl.version'
-  testCompile project(':geode-concurrency-test')
 
-  integrationTestCompile project(":geode-dunit")
   distributedTestCompile project(":geode-dunit")
+  distributedTestCompile 'redis.clients:jedis:' + project.'jedis.version'
+  distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
+  distributedTestCompile 'com.jayway.jsonpath:json-path-assert:' + project.'json-path-assert.version'
+
+  distributedTestRuntime 'org.apache.derby:derby:' + project.'derby.version'
+
+
   upgradeTestCompile project(":geode-dunit")
+
+
+  performanceTestCompile project(":geode-junit")
 }
 
 def generatedResources = "$buildDir/generated-resources/main"