Remove junit-quickcheck from Corda because it is only used for testing. (#416)

client/jackson/build.gradle

@@ -23,5 +23,12 @@ dependencies {
     // This adds support for java.time types.
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
 
+    testCompile project(':core').sourceSets.test.output
     testCompile "junit:junit:$junit_version"
+
+    // TODO: Upgrade to junit-quickcheck 0.8, once it is released,
+    //       because it depends on org.javassist:javassist instead
+    //       of javassist:javassist.
+    testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
+    testCompile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 }

core/build.gradle

@@ -63,8 +63,8 @@ dependencies {
     // TODO: Upgrade to junit-quickcheck 0.8, once it is released,
     //       because it depends on org.javassist:javassist instead
     //       of javassist:javassist.
-    compile "com.pholser:junit-quickcheck-core:$quickcheck_version"
-    compile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
+    testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
+    testCompile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 
     // Guava: Google utilities library.
     compile "com.google.guava:guava:$guava_version"

core/src/test/kotlin/net/corda/core/testing/Generators.kt

@@ -65,7 +65,7 @@ class PartyAndReferenceGenerator : Generator<PartyAndReference>(PartyAndReferenc
 
 class SecureHashGenerator : Generator<SecureHash>(SecureHash::class.java) {
     override fun generate(random: SourceOfRandomness, status: GenerationStatus): SecureHash {
-        return SecureHash.Companion.sha256(random.nextBytes(16))
+        return SecureHash.sha256(random.nextBytes(16))
     }
 }
 

finance/build.gradle

@@ -24,7 +24,14 @@ dependencies {
     compile project(':core')
 
     testCompile project(':test-utils')
+    testCompile project(':core').sourceSets.test.output
     testCompile "junit:junit:$junit_version"
+
+    // TODO: Upgrade to junit-quickcheck 0.8, once it is released,
+    //       because it depends on org.javassist:javassist instead
+    //       of javassist:javassist.
+    testCompile "com.pholser:junit-quickcheck-core:$quickcheck_version"
+    testCompile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 }
 
 sourceSets {
@@ -34,3 +41,10 @@ sourceSets {
         }
     }
 }
+
+configurations.testCompile {
+    // Excluding javassist:javassist because it clashes with Hibernate's
+    // transitive org.javassist:javassist dependency.
+    // TODO: Remove this exclusion once junit-quickcheck 0.8 is released.
+    exclude group: 'javassist', module: 'javassist'
+}

finance/src/test/kotlin/net/corda/flows/BroadcastTransactionFlowTest.kt

@@ -1,4 +1,4 @@
-package net.corda.core.flows
+package net.corda.flows
 
 import com.pholser.junit.quickcheck.From
 import com.pholser.junit.quickcheck.Property

node-schemas/build.gradle

@@ -44,6 +44,7 @@ sourceSets {
 dependencies {
     compile project(':core')
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testCompile "junit:junit:$junit_version"
 
     // Requery: SQL based query & persistence for Kotlin
     kapt "io.requery:requery-processor:$requery_version"

node/build.gradle

@@ -27,6 +27,17 @@ configurations {
         // We don't need these because we already include netty-all.
         exclude group: 'io.netty', module: 'netty-transport'
         exclude group: 'io.netty', module: 'netty-handler'
+
+        // We want to use SLF4J's version of these bindings: jcl-over-slf4j
+        // Remove any transitive dependency on Apache's version.
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+
+    testCompile {
+        // Excluding javassist:javassist because it clashes with Hibernate's
+        // transitive org.javassist:javassist dependency.
+        // TODO: Remove this exclusion once junit-quickcheck 0.8 is released.
+        exclude group: 'javassist', module: 'javassist'
     }
 
     integrationTestCompile.extendsFrom testCompile
@@ -58,16 +69,8 @@ sourceSets {
 
 dependencies {
 
-    // Excluding javassist:javassist (which is a transitive dependency of core)
-    // because it clashes with Hibernate's transitive org.javassist:javassist
-    // dependency.
-    // TODO: Remove both of these exclusions once junit-quickcheck 0.8 is released.
-    compile (project(':finance')) {
-        exclude group: 'javassist', module: 'javassist'
-    }
-    compile (project(':node-schemas')) {
-        exclude group: 'javassist', module: 'javassist'
-    }
+    compile project(':finance')
+    compile project(':node-schemas')
     compile project(':node-api')
     compile project(':client:rpc')
 
@@ -165,12 +168,6 @@ dependencies {
     integrationTestCompile "junit:junit:$junit_version"
 }
 
-configurations.compile {
-    // We want to use SLF4J's version of these binding: jcl-over-slf4j
-    // Remove any transitive dependency on Apache's version.
-    exclude group: 'commons-logging', module: 'commons-logging'
-}
-
 task integrationTest(type: Test) {
     testClassesDir = sourceSets.integrationTest.output.classesDir
     classpath = sourceSets.integrationTest.runtimeClasspath