Skip to content

Commit b4fbf77

Browse files
committed
Fix tests
1 parent 33dd81e commit b4fbf77

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/MppProjectTest.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,29 @@ class MppProjectTest : BaseKotlinGradleTest() {
1717
":transformJvmMainAtomicfu",
1818
":transformJvmTestAtomicfu",
1919
":compileKotlinJs",
20-
":compileTestKotlinJs",
21-
":transformJsMainAtomicfu",
22-
":transformJsTestAtomicfu"
20+
":transformJsMainAtomicfu"
2321
)
2422

2523
build("build") {
2624
checkOutcomes(TaskOutcome.SUCCESS, *tasksToCheck)
2725

2826
fun checkPlatform(platform: String, fileInMainName: String) {
27+
val isJs = platform == "js"
2928
val testCompileClasspathFiles = projectDir.resolve("build/classpath/$platform/test_compile.txt")
3029
.readLines().asSequence().flatMapTo(HashSet()) { File(it).walk().filter(File::isFile) }
31-
32-
val testRuntimeClasspathFiles = projectDir.resolve("build/classpath/$platform/test_runtime.txt")
30+
val testRuntimeClasspathFiles = if (isJs) emptySet<File>() else projectDir.resolve("build/classpath/$platform/test_runtime.txt")
3331
.readLines().asSequence().flatMapTo(HashSet()) { File(it).walk().filter(File::isFile) }
3432

3533
projectDir.resolve("build/classes/kotlin/$platform/main/$fileInMainName").let {
3634
it.checkExists()
3735
check(it in testCompileClasspathFiles) { "Original '$it' is missing from $platform test compile classpath" }
38-
check(it in testRuntimeClasspathFiles) { "Original '$it' is missing from $platform test runtime classpath" }
36+
if (!isJs) check(it in testRuntimeClasspathFiles) { "Original '$it' is missing from $platform test runtime classpath" }
3937
}
4038

4139
projectDir.resolve("build/classes/atomicfu/jvm/main/IntArithmetic.class").let {
4240
it.checkExists()
4341
check(it !in testCompileClasspathFiles) { "Transformed '$it' is present in $platform test compile classpath" }
44-
check(it !in testRuntimeClasspathFiles) { "Transformed '$it' is present in $platform test runtime classpath" }
42+
if (!isJs) check(it !in testRuntimeClasspathFiles) { "Transformed '$it' is present in $platform test runtime classpath" }
4543
}
4644

4745
}

atomicfu-gradle-plugin/src/test/resources/projects/mpp-simple/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def File classpathFile(String platform, String fileName) {
4949
return file("$dir/$fileName")
5050
}
5151

52+
5253
compileTestKotlinJvm.doLast {
5354
classpathFile("jvm", "test_compile.txt").text = classpath.files.join("\n")
5455
}
@@ -62,6 +63,6 @@ compileTestKotlinJs.doLast {
6263
classpathFile("js", "test_compile.txt").text = classpath.files.join("\n")
6364
}
6465

65-
jsTest.doLast {
66-
classpathFile("js", "test_runtime.txt").text = classpath.files.join("\n")
67-
}
66+
jsTest.dependsOn(":compileTestKotlinJs")
67+
jsTest.dependsOn(":transformJsTestAtomicfu")
68+
check.dependsOn(":jsTest")

0 commit comments

Comments
 (0)