Skip to content

Commit 3f15dba

Browse files
committed
Remove TCK tests from JDK9 Flow integration
Since the JDK9 Flow integration is now implemented as thin wrappers around the Reactive Streams integration, there is no need for such thorough testing, and additional tests would only cause the overhead of needing to fix two copies at once when changing the Reactive Streams integration.
1 parent c9de9de commit 3f15dba

File tree

3 files changed

+0
-224
lines changed

3 files changed

+0
-224
lines changed

reactive/kotlinx-coroutines-jdk9/build.gradle

-34
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,9 @@
33
*/
44
targetCompatibility = 9
55

6-
76
dependencies {
87
compile project(":kotlinx-coroutines-reactive")
98
compile "org.reactivestreams:reactive-streams-flow-adapters:$reactive_streams_version"
10-
testCompile "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
11-
}
12-
13-
task testNG(type: Test) {
14-
useTestNG()
15-
reports.html.destination = file("$buildDir/reports/testng")
16-
include '**/*ReactiveStreamTckTest.*'
17-
// Skip testNG when tests are filtered with --tests, otherwise it simply fails
18-
onlyIf {
19-
filter.includePatterns.isEmpty()
20-
}
21-
doFirst {
22-
// Classic gradle, nothing works without doFirst
23-
println "TestNG tests: ($includes)"
24-
}
25-
}
26-
27-
task checkJdk11() {
28-
// only fail w/o JDK_11 when actually trying to compile, not during project setup phase
29-
doLast {
30-
if (!System.env.JDK_11) {
31-
throw new GradleException("JDK_11 environment variable is not defined. " +
32-
"Can't build against JDK 11 runtime and run JDK 11 compatibility tests. " +
33-
"Please ensure JDK 11 is installed and that JDK_11 points to it.")
34-
}
35-
}
369
}
3710

3811
compileTestKotlin {
@@ -41,13 +14,6 @@ compileTestKotlin {
4114

4215
compileKotlin {
4316
kotlinOptions.jvmTarget = "9"
44-
kotlinOptions.jdkHome = System.env.JDK_11
45-
dependsOn(checkJdk11)
46-
}
47-
48-
test {
49-
dependsOn(testNG)
50-
reports.html.destination = file("$buildDir/reports/junit")
5117
}
5218

5319
tasks.withType(dokka.getClass()) {

reactive/kotlinx-coroutines-jdk9/test/IterableFlowTckTest.kt

-135
This file was deleted.

reactive/kotlinx-coroutines-jdk9/test/ReactiveStreamTckTest.kt

-55
This file was deleted.

0 commit comments

Comments
 (0)