Group test scope modules in testing dir (corda#1419)

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'