Group test scope modules in testing dir (#1419)

.idea/compiler.xml

@@ -14,9 +14,6 @@
       <module name="client_test" target="1.8" />
       <module name="corda-project_main" target="1.8" />
       <module name="corda-project_test" target="1.8" />
-      <module name="corda-webserver_integrationTest" target="1.8" />
-      <module name="corda-webserver_main" target="1.8" />
-      <module name="corda-webserver_test" target="1.8" />
       <module name="cordform-common_main" target="1.8" />
       <module name="cordform-common_test" target="1.8" />
       <module name="core_main" target="1.8" />
@@ -28,9 +25,6 @@
       <module name="docs_source_example-code_main" target="1.8" />
       <module name="docs_source_example-code_test" target="1.8" />
       <module name="docs_test" target="1.8" />
-      <module name="driver_integrationTest" target="1.8" />
-      <module name="driver_main" target="1.8" />
-      <module name="driver_test" target="1.8" />
       <module name="experimental_main" target="1.8" />
       <module name="experimental_test" target="1.8" />
       <module name="explorer-capsule_main" target="1.6" />
@@ -64,8 +58,6 @@
       <module name="node-driver_integrationTest" target="1.8" />
       <module name="node-driver_main" target="1.8" />
       <module name="node-driver_test" target="1.8" />
-      <module name="node-schemas_main" target="1.8" />
-      <module name="node-schemas_test" target="1.8" />
       <module name="node_integrationTest" target="1.8" />
       <module name="node_main" target="1.8" />
       <module name="node_smokeTest" target="1.8" />
@@ -85,15 +77,15 @@
       <module name="simm-valuation-demo_integrationTest" target="1.8" />
       <module name="simm-valuation-demo_main" target="1.8" />
       <module name="simm-valuation-demo_test" target="1.8" />
-      <module name="smoke-test-utils_main" target="1.8" />
-      <module name="smoke-test-utils_test" target="1.8" />
-      <module name="test-common_main" target="1.8" />
-      <module name="test-common_test" target="1.8" />
-      <module name="test-utils_main" target="1.8" />
-      <module name="test-utils_test" target="1.8" />
       <module name="testing-node-driver_integrationTest" target="1.8" />
       <module name="testing-node-driver_main" target="1.8" />
       <module name="testing-node-driver_test" target="1.8" />
+      <module name="testing-smoke-test-utils_main" target="1.8" />
+      <module name="testing-smoke-test-utils_test" target="1.8" />
+      <module name="testing-test-common_main" target="1.8" />
+      <module name="testing-test-common_test" target="1.8" />
+      <module name="testing-test-utils_main" target="1.8" />
+      <module name="testing-test-utils_test" target="1.8" />
       <module name="tools_main" target="1.8" />
       <module name="tools_test" target="1.8" />
       <module name="trader-demo_integrationTest" target="1.8" />
@@ -104,8 +96,6 @@
       <module name="verifier_test" target="1.8" />
       <module name="webcapsule_main" target="1.6" />
       <module name="webcapsule_test" target="1.6" />
-      <module name="webserver-webcapsule_main" target="1.6" />
-      <module name="webserver-webcapsule_test" target="1.6" />
       <module name="webserver_integrationTest" target="1.8" />
       <module name="webserver_main" target="1.8" />
       <module name="webserver_test" target="1.8" />

docs/source/changelog.rst

@@ -6,6 +6,9 @@ from the previous milestone release.
 
 UNRELEASED
 ----------
+* About half of the code in test-utils has been moved to a new module ``node-driver``,
+  and the test scope modules are now located in a ``testing`` directory.
+
 * Contract Upgrades: deprecated RPC authorisation / deauthorisation API calls in favour of equivalent flows in ContractUpgradeFlow.
   Implemented contract upgrade persistence using JDBC backed persistent map.
 

settings.gradle

@@ -22,7 +22,10 @@ include 'test-common'
 include 'test-utils'
 include 'smoke-test-utils'
 include 'node-driver'
-project(':node-driver').projectDir = new File("$settingsDir/testing/node-driver")
+// Avoid making 'testing' a project, and allow build.gradle files to refer to these by their simple names:
+['test-common', 'test-utils', 'smoke-test-utils', 'node-driver'].each {
+    project(":$it").projectDir = new File("$settingsDir/testing/$it")
+}
 include 'tools:explorer'
 include 'tools:explorer:capsule'
 include 'tools:demobench'