You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/08/20 15:31:25 UTC

[geode] branch develop updated: GEODE-5530 create geode-assembly-test for better dependency resolution (#2345)

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new d717fdb   GEODE-5530 create geode-assembly-test for better dependency resolution (#2345)
d717fdb is described below

commit d717fdb37326fbde7ba6bdd7d415cd4209ffb7db
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Mon Aug 20 08:31:17 2018 -0700

     GEODE-5530 create geode-assembly-test for better dependency resolution (#2345)
    
    
    Co-authored-by: Jacob Barrett <jb...@pivotal.io>
    Co-authored-by: Robert Houghton <rh...@pivotal.io>
    Co-authored-by: Dick Cavender <dc...@pivotal.io>
---
 geode-assembly/build.gradle                        | 37 ++++++++++------------
 .../geode-assembly-test}/build.gradle              | 10 +++++-
 .../web/controllers/AddFreeItemToOrders.java       |  0
 .../rest/internal/web/controllers/Customer.java    |  0
 .../internal/web/controllers/DateTimeUtils.java    |  0
 .../rest/internal/web/controllers/Gender.java      |  0
 .../internal/web/controllers/GetAllEntries.java    |  0
 .../web/controllers/GetDeliveredOrders.java        |  0
 .../rest/internal/web/controllers/GetRegions.java  |  0
 .../internal/web/controllers/GetValueForKey.java   |  0
 .../geode/rest/internal/web/controllers/Item.java  |  0
 .../web/controllers/NoArgumentFunction.java        |  0
 .../geode/rest/internal/web/controllers/Order.java |  0
 .../rest/internal/web/controllers/Person.java      |  0
 .../internal/web/controllers/PutKeyFunction.java   |  0
 .../web/controllers/RedactingPostProcessor.java    |  0
 .../internal/web/controllers/RestTestUtils.java    |  0
 .../org/apache/geode/session/tests/Client.java     |  0
 .../geode/session/tests/ContainerInstall.java      |  0
 .../geode/session/tests/ContainerManager.java      |  0
 .../geode/session/tests/ServerContainer.java       |  0
 .../geode/session/tests/TomcatContainer.java       |  0
 .../apache/geode/session/tests/TomcatInstall.java  |  0
 .../geode/test/junit/rules/EmbeddedPulseRule.java  |  0
 .../geode/test/junit/rules/GeodeDevRestClient.java |  0
 .../geode/test/junit/rules/HttpResponseAssert.java |  0
 geode-pulse/build.gradle                           |  3 --
 geode-pulse/geode-pulse-test/build.gradle          |  4 +++
 .../pulse/tests/rules/ScreenshotOnFailureRule.java |  0
 .../tools/pulse/tests/rules/WebDriverRule.java     |  0
 .../tools/pulse/tests/ui/PulseTestConstants.java   |  0
 settings.gradle                                    |  1 +
 32 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 40e42a6..312151f 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -88,19 +88,19 @@ dependencies {
   integrationTestCompile project(":geode-junit")
   integrationTestCompile project(":geode-dunit")
   integrationTestCompile project(":geode-pulse")
+  integrationTestCompile project(':geode-assembly/geode-assembly-test')
   integrationTestCompile 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
 
 
   distributedTestCompile project(':geode-core')
   distributedTestCompile project(':extensions/session-testing-war')
-  distributedTestCompile group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
+  distributedTestCompile project(':geode-assembly/geode-assembly-test')
   distributedTestCompile 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
-  // TODO refactor out common test framework
-  distributedTestCompile sourceSets.integrationTest.output
 
   distributedTestRuntime (project(':extensions/geode-modules-session-internal')) {
     exclude group: 'org.apache.tomcat'
   }
+  distributedTestRuntime group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
 
 
   acceptanceTestCompile project(':geode-core')
@@ -110,24 +110,19 @@ dependencies {
   uiTestCompile project(':geode-core')
   uiTestCompile project(":geode-dunit")
   uiTestCompile project(":geode-pulse")
+  uiTestCompile project(":geode-pulse/geode-pulse-test")
+  uiTestCompile project(':geode-assembly/geode-assembly-test')
   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
-  uiTestCompile sourceSets.integrationTest.output
-  uiTestCompile project(":geode-pulse").sourceSets.uiTest.output
 
   uiTestRuntime project(":geode-core")
   uiTestRuntime 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
 
 
   upgradeTestCompile project(':geode-core')
-  upgradeTestCompile (project(":geode-dunit")) {
-    exclude module: 'geode-core'
-  }
-  // TODO refactor out common test framework
-  upgradeTestCompile sourceSets.distributedTest.output
-  upgradeTestCompile sourceSets.test.output
+  upgradeTestCompile project(":geode-dunit")
+  upgradeTestCompile project(':geode-assembly/geode-assembly-test')
 
   upgradeTestRuntime group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
   upgradeTestRuntime 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
@@ -150,7 +145,7 @@ task defaultDistributionConfig(type: JavaExec, dependsOn: classes) {
   main 'org.apache.geode.distributed.internal.DefaultPropertiesGenerator'
   classpath project(':geode-core').sourceSets.main.runtimeClasspath
   workingDir buildDir
-  
+
   doFirst {
     buildDir.mkdirs()
   }
@@ -248,7 +243,7 @@ task depsJar (type: Jar, dependsOn: ':geode-core:classes') {
   description 'Assembles the jar archive that defines the gemfire classpath.'
   archiveName 'geode-dependencies.jar'
   doFirst {
-    manifest { 
+    manifest {
       attributes("Class-Path": cp())
     }
   }
@@ -261,7 +256,7 @@ task gfshDepsJar (type: Jar, dependsOn: ':geode-core:classes') {
   archiveName 'gfsh-dependencies.jar'
   doFirst {
     manifest {
-      attributes("Class-Path": cp() + 
+      attributes("Class-Path": cp() +
         ' ' + project(':geode-core').webJar.archiveName +
         ' ' + configurations.gfshDependencies.collect{ it.getName() }.flatten().join(' ')
       )
@@ -361,7 +356,7 @@ distributions {
     contents {
       duplicatesStrategy 'exclude'
       exclude '*.asc'
-      
+
       exclude '*.asc'
       exclude '*-sources.jar'
       exclude '*-javadoc.jar'
@@ -372,10 +367,10 @@ distributions {
         from defaultCacheConfig
         from defaultDistributionConfig
         from (project(':geode-core').sourceSets.main.resources.files.find {
-          it.name == 'log4j2.xml' 
+          it.name == 'log4j2.xml'
         })
       }
-      
+
       into ('lib') {
         from project(":geode-common").configurations.runtime
         from project(":geode-common").configurations.archives.allArtifacts.files
@@ -394,10 +389,10 @@ distributions {
 
         from project(":geode-lucene").configurations.runtime
         from project(":geode-lucene").configurations.archives.allArtifacts.files
-       
+
         from project(":geode-connectors").configurations.runtime
         from project(":geode-connectors").configurations.archives.allArtifacts.files
- 
+
         from project(":geode-old-client-support").configurations.runtime
         from project(":geode-old-client-support").configurations.archives.allArtifacts.files
 
@@ -480,7 +475,7 @@ upgradeTest.dependsOn ':geode-old-versions:build'
 
 /**Print the names of all jar files in a fileTree */
 def printJars(tree) {
-  tree.matching {include("**/*.jar")}.visit{ file -> 
+  tree.matching {include("**/*.jar")}.visit{ file ->
     if(!file.isDirectory()) {
       println file.name
     }
diff --git a/geode-pulse/geode-pulse-test/build.gradle b/geode-assembly/geode-assembly-test/build.gradle
similarity index 60%
copy from geode-pulse/geode-pulse-test/build.gradle
copy to geode-assembly/geode-assembly-test/build.gradle
index 07d0cb8..7ae92d1 100755
--- a/geode-pulse/geode-pulse-test/build.gradle
+++ b/geode-assembly/geode-assembly-test/build.gradle
@@ -19,8 +19,16 @@
 dependencies {
 
   compileOnly project(':geode-core')
-  compileOnly project(':geode-junit')
   compileOnly project(':geode-pulse')
+  compileOnly project(':extensions/geode-modules-test')
+
+  compileOnly group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3'
+  compileOnly 'org.assertj:assertj-core:' + project.'assertj-core.version'
+  compileOnly 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version'
+  compileOnly 'commons-io:commons-io:' + project.'commons-io.version'
+  compileOnly 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
+  compileOnly 'org.apache.httpcomponents:httpclient:' + project.'httpclient.version'
+  compileOnly 'junit:junit:' + project.'junit.version'
 }
 
 disableMavenPublishing()
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Customer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Customer.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Customer.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Customer.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Gender.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Gender.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Gender.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Gender.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Item.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Item.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Item.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Item.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/NoArgumentFunction.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Order.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Order.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Order.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Order.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Person.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Person.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/Person.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/Person.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/RedactingPostProcessor.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Client.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/Client.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Client.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/Client.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ContainerInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ContainerInstall.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ContainerInstall.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ContainerInstall.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ContainerManager.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ContainerManager.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ContainerManager.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ContainerManager.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ServerContainer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/ServerContainer.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatContainer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatContainer.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
similarity index 100%
rename from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/TomcatInstall.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/EmbeddedPulseRule.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/EmbeddedPulseRule.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/EmbeddedPulseRule.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/EmbeddedPulseRule.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/GeodeDevRestClient.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/GeodeDevRestClient.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/GeodeDevRestClient.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/GeodeDevRestClient.java
diff --git a/geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/HttpResponseAssert.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/HttpResponseAssert.java
similarity index 100%
rename from geode-assembly/src/integrationTest/java/org/apache/geode/test/junit/rules/HttpResponseAssert.java
rename to geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/test/junit/rules/HttpResponseAssert.java
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index ecfcd49..e860c6e 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -82,10 +82,7 @@ dependencies {
   uiTestCompile project(':geode-junit')
   uiTestCompile project(':geode-json')
   uiTestCompile project(':geode-pulse/geode-pulse-test')
-  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'
-  uiTestCompile 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
 
   uiTestRuntime project(':geode-core')
 }
diff --git a/geode-pulse/geode-pulse-test/build.gradle b/geode-pulse/geode-pulse-test/build.gradle
index 07d0cb8..1d32d2e 100755
--- a/geode-pulse/geode-pulse-test/build.gradle
+++ b/geode-pulse/geode-pulse-test/build.gradle
@@ -21,6 +21,10 @@ dependencies {
   compileOnly project(':geode-core')
   compileOnly project(':geode-junit')
   compileOnly project(':geode-pulse')
+
+  compile 'org.seleniumhq.selenium:selenium-api:' + project.'selenium.version'
+  compile 'org.seleniumhq.selenium:selenium-chrome-driver:' + project.'selenium.version'
+  compile 'org.seleniumhq.selenium:selenium-support:' + project.'selenium.version'
 }
 
 disableMavenPublishing()
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java b/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
similarity index 100%
rename from geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
rename to geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/ScreenshotOnFailureRule.java
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java b/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
similarity index 100%
rename from geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
rename to geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/rules/WebDriverRule.java
diff --git a/geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseTestConstants.java b/geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/ui/PulseTestConstants.java
similarity index 100%
rename from geode-pulse/src/uiTest/java/org/apache/geode/tools/pulse/tests/ui/PulseTestConstants.java
rename to geode-pulse/geode-pulse-test/src/main/java/org/apache/geode/tools/pulse/tests/ui/PulseTestConstants.java
diff --git a/settings.gradle b/settings.gradle
index 9e96508..11d3d06 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,6 +27,7 @@ include 'geode-web-api'
 include 'geode-pulse'
 include 'geode-pulse/geode-pulse-test'
 include 'geode-assembly'
+include 'geode-assembly/geode-assembly-test'
 include 'geode-rebalancer'
 include 'geode-lucene'
 include 'geode-lucene/geode-lucene-test'