Skip to content

Commit 1856739

Browse files
committed
Rewrite module test in kotlin
1 parent 2ab80d8 commit 1856739

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

okio/build.gradle.kts

+7-1
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,14 @@ tasks {
251251
options.release = 9
252252
}
253253

254+
val integrationTest = named<Test>("integrationTest") {
255+
jvmArgumentProviders.add(CommandLineArgumentProvider {
256+
listOf("--patch-module", "okio.test.integration=${sourceSets["integrationTest"].output.asPath}")
257+
})
258+
}
259+
254260
check {
255-
dependsOn(testing.suites.named("integrationTest"))
261+
dependsOn(integrationTest)
256262
}
257263
}
258264

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
open module okio.test.integration {
22
requires okio;
33
requires junit;
4+
requires kotlin.stdlib;
45
}

okio/src/jvmIntegrationTest/java/okio/test/integration/ModuleTest.java

-20
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package okio.test.integration
2+
3+
import okio.FileSystem
4+
import org.junit.Assert.*
5+
import org.junit.Test
6+
7+
class ModuleTest {
8+
@Test
9+
fun testModule() {
10+
// test okio.test.integration is modular
11+
assertTrue(ModuleTest::class.java.module.isNamed)
12+
assertEquals(ModuleTest::class.java.module.name, "okio.test.integration")
13+
assertFalse(ModuleTest::class.java.module.descriptor.isAutomatic)
14+
// test okio is modular
15+
assertTrue(FileSystem::class.java.module.isNamed)
16+
assertEquals(FileSystem::class.java.module.name, "okio")
17+
assertFalse(FileSystem::class.java.module.descriptor.isAutomatic)
18+
}
19+
}

0 commit comments

Comments
 (0)