Extract reusable test utilities out into separate project.

ldaley · ldaley · commit ba765866a664 · 2014-01-21T13:36:55.000Z
This allows them to be properly shared and tested, and this configuration maps to IDEs better.
diff --git a/rxjava-contrib/rxjava-async-util/build.gradle b/rxjava-contrib/rxjava-async-util/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    testCompile project(":rxjava-core").sourceSets.test.output
+    testCompile project(":rxjava-test")
 }
diff --git a/rxjava-contrib/rxjava-string/build.gradle b/rxjava-contrib/rxjava-string/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    testCompile project(":rxjava-core").sourceSets.test.output
+    testCompile project(":rxjava-test")
 }
diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'maven'
 
 dependencies {
-    testCompile 'junit:junit-dep:4.10'
-    testCompile 'org.mockito:mockito-core:1.8.5'
+    testCompile project(":rxjava-test")
 }
 
diff --git a/rxjava-test/src/main/java/rx/util/AssertObservable.java b/rxjava-test/src/main/java/rx/util/AssertObservable.java
diff --git a/rxjava-test/src/test/java/rx/util/AssertObservableTest.java b/rxjava-test/src/test/java/rx/util/AssertObservableTest.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,7 @@
 rootProject.name = 'rxjava'
 
 include 'rxjava-core',
+        'rxjava-test',
         'language-adaptors:rxjava-groovy',
         'language-adaptors:rxjava-clojure',
         'language-adaptors:rxjava-jruby',

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`dependencies {`
`2`		`- testCompile project(":rxjava-core").sourceSets.test.output`
	`2`	`+ testCompile project(":rxjava-test")`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`apply plugin: 'maven'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- testCompile 'junit:junit-dep:4.10'`
`5`		`- testCompile 'org.mockito:mockito-core:1.8.5'`
	`4`	`+ testCompile project(":rxjava-test")`
`6`	`5`	`}`
`7`	`6`