Skip to content

Commit 6ea22ad

Browse files
fzhinkinfzhinkin
authored
Fix functional tests not utilizing the API_DIR const value
Fix functional tests not utilizing the API_DIR const value Merge pull request Kotlin#154 from xtrm-en/fix/tests-hardcoded-dir
2 parents 0dc8cd9 + 7a4a098 commit 6ea22ad

File tree

6 files changed

+27
-21
lines changed

6 files changed

+27
-21
lines changed

‎src/functionalTest/kotlin/kotlinx/validation/api/BaseKotlinGradleTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.api
77

8+
import kotlinx.validation.API_DIR
89
import org.junit.Rule
910
import org.junit.rules.TemporaryFolder
1011
import java.io.File
@@ -16,5 +17,5 @@ public open class BaseKotlinGradleTest {
1617

1718
internal val rootProjectDir: File get() = testProjectDir.root
1819

19-
internal val rootProjectApiDump: File get() = rootProjectDir.resolve("api/${rootProjectDir.name}.api")
20+
internal val rootProjectApiDump: File get() = rootProjectDir.resolve("$API_DIR/${rootProjectDir.name}.api")
2021
}

‎src/functionalTest/kotlin/kotlinx/validation/test/DefaultConfigTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.test
77

8+
import kotlinx.validation.API_DIR
89
import kotlinx.validation.api.*
910
import org.assertj.core.api.*
1011
import org.junit.Test
@@ -183,7 +184,7 @@ internal class DefaultConfigTests : BaseKotlinGradleTest() {
183184
runner.build().apply {
184185
assertTaskSuccess(":apiDump")
185186

186-
val apiDumpFile = rootProjectDir.resolve("api/testproject.api")
187+
val apiDumpFile = rootProjectDir.resolve("$API_DIR/testproject.api")
187188
assertTrue(apiDumpFile.exists(), "api dump file ${apiDumpFile.path} should exist")
188189

189190
assertFalse(rootProjectApiDump.exists(), "api dump file ${rootProjectApiDump.path} should NOT exist " +

‎src/functionalTest/kotlin/kotlinx/validation/test/MultiPlatformSingleJvmTargetTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.test
77

8+
import kotlinx.validation.API_DIR
89
import kotlinx.validation.api.*
910
import org.assertj.core.api.Assertions.assertThat
1011
import org.junit.Test
@@ -29,7 +30,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
2930
arguments.add("--stacktrace")
3031
}
3132

32-
dir("api/") {
33+
dir("$API_DIR/") {
3334
file("testproject.api") {
3435
resolve("examples/classes/Subsub1Class.dump")
3536
resolve("examples/classes/Subsub2Class.dump")
@@ -61,7 +62,7 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
6162
arguments.add("--stacktrace")
6263
}
6364

64-
dir("api/") {
65+
dir("$API_DIR/") {
6566
file("testproject.api") {
6667
resolve("examples/classes/Subsub2Class.dump")
6768
resolve("examples/classes/Subsub1Class.dump")
@@ -116,6 +117,6 @@ internal class MultiPlatformSingleJvmTargetTest : BaseKotlinGradleTest() {
116117
}
117118
}
118119

119-
private val jvmApiDump: File get() = rootProjectDir.resolve("api/testproject.api")
120+
private val jvmApiDump: File get() = rootProjectDir.resolve("$API_DIR/testproject.api")
120121

121122
}

‎src/functionalTest/kotlin/kotlinx/validation/test/MultipleJvmTargetsTest.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.test
77

8+
import kotlinx.validation.API_DIR
89
import kotlinx.validation.api.*
910
import org.assertj.core.api.Assertions.assertThat
1011
import org.gradle.testkit.runner.GradleRunner
@@ -30,14 +31,14 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
3031
arguments.add(":apiCheck")
3132
}
3233

33-
dir("api/jvm/") {
34+
dir("$API_DIR/jvm/") {
3435
file("testproject.api") {
3536
resolve("examples/classes/Subsub1Class.dump")
3637
resolve("examples/classes/Subsub2Class.dump")
3738
}
3839
}
3940

40-
dir("api/anotherJvm/") {
41+
dir("$API_DIR/anotherJvm/") {
4142
file("testproject.api") {
4243
resolve("examples/classes/Subsub1Class.dump")
4344
}
@@ -69,14 +70,14 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
6970
arguments.add(":check")
7071
}
7172

72-
dir("api/jvm/") {
73+
dir("$API_DIR/jvm/") {
7374
file("testproject.api") {
7475
resolve("examples/classes/Subsub2Class.dump")
7576
resolve("examples/classes/Subsub1Class.dump")
7677
}
7778
}
7879

79-
dir("api/anotherJvm/") {
80+
dir("$API_DIR/anotherJvm/") {
8081
file("testproject.api") {
8182
resolve("examples/classes/Subsub2Class.dump")
8283
}
@@ -134,7 +135,7 @@ internal class MultipleJvmTargetsTest : BaseKotlinGradleTest() {
134135
}
135136
}
136137

137-
private val jvmApiDump: File get() = rootProjectDir.resolve("api/jvm/testproject.api")
138-
private val anotherApiDump: File get() = rootProjectDir.resolve("api/anotherJvm/testproject.api")
138+
private val jvmApiDump: File get() = rootProjectDir.resolve("$API_DIR/jvm/testproject.api")
139+
private val anotherApiDump: File get() = rootProjectDir.resolve("$API_DIR/anotherJvm/testproject.api")
139140

140141
}

‎src/functionalTest/kotlin/kotlinx/validation/test/SubprojectsWithPluginOnRootTests.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.test
77

8+
import kotlinx.validation.API_DIR
89
import kotlinx.validation.api.*
910
import kotlinx.validation.api.BaseKotlinGradleTest
1011
import kotlinx.validation.api.assertTaskSuccess
@@ -258,7 +259,7 @@ internal class SubprojectsWithPluginOnRootTests : BaseKotlinGradleTest() {
258259
runner.build().apply {
259260
assertTaskSuccess(":sub1:apiDump")
260261

261-
val apiDumpFile = rootProjectDir.resolve("sub1/api/sub1.api")
262+
val apiDumpFile = rootProjectDir.resolve("sub1/$API_DIR/sub1.api")
262263
assertTrue(apiDumpFile.exists(), "api dump file ${apiDumpFile.path} should exist")
263264

264265
Assertions.assertThat(apiDumpFile.readText()).isEqualToIgnoringNewLines("")
@@ -298,21 +299,21 @@ internal class SubprojectsWithPluginOnRootTests : BaseKotlinGradleTest() {
298299
assertTrue(rootProjectApiDump.exists(), "api dump file ${rootProjectApiDump.path} should exist")
299300
Assertions.assertThat(rootProjectApiDump.readText()).isEqualToIgnoringNewLines("")
300301

301-
val apiSub1 = rootProjectDir.resolve("sub1/api/sub1.api")
302+
val apiSub1 = rootProjectDir.resolve("sub1/$API_DIR/sub1.api")
302303
assertTrue(apiSub1.exists(), "api dump file ${apiSub1.path} should exist")
303304
Assertions.assertThat(apiSub1.readText()).isEqualToIgnoringNewLines("")
304305

305-
val apiSubsub1 = rootProjectDir.resolve("sub1/subsub1/api/subsub1.api")
306+
val apiSubsub1 = rootProjectDir.resolve("sub1/subsub1/$API_DIR/subsub1.api")
306307
assertTrue(apiSubsub1.exists(), "api dump file ${apiSubsub1.path} should exist")
307308
val apiSubsub1Expected = readFileList("examples/classes/Subsub1Class.dump")
308309
Assertions.assertThat(apiSubsub1.readText()).isEqualToIgnoringNewLines(apiSubsub1Expected)
309310

310-
val apiSubsub2 = rootProjectDir.resolve("sub1/subsub2/api/subsub2.api")
311+
val apiSubsub2 = rootProjectDir.resolve("sub1/subsub2/$API_DIR/subsub2.api")
311312
assertTrue(apiSubsub2.exists(), "api dump file ${apiSubsub2.path} should exist")
312313
val apiSubsub2Expected = readFileList("examples/classes/Subsub2Class.dump")
313314
Assertions.assertThat(apiSubsub2.readText()).isEqualToIgnoringNewLines(apiSubsub2Expected)
314315

315-
val apiSub2 = rootProjectDir.resolve("sub2/api/sub2.api")
316+
val apiSub2 = rootProjectDir.resolve("sub2/$API_DIR/sub2.api")
316317
assertTrue(apiSub2.exists(), "api dump file ${apiSub2.path} should exist")
317318
Assertions.assertThat(apiSub2.readText()).isEqualToIgnoringNewLines("")
318319
}

‎src/functionalTest/kotlin/kotlinx/validation/test/SubprojectsWithPluginOnSubTests.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package kotlinx.validation.test
77

8+
import kotlinx.validation.API_DIR
89
import kotlinx.validation.api.*
910
import kotlinx.validation.api.BaseKotlinGradleTest
1011
import kotlinx.validation.api.assertTaskSuccess
@@ -241,7 +242,7 @@ internal class SubprojectsWithPluginOnSubTests : BaseKotlinGradleTest() {
241242
runner.build().apply {
242243
assertTaskSuccess(":sub1:apiDump")
243244

244-
val apiDumpFile = rootProjectDir.resolve("sub1/api/sub1.api")
245+
val apiDumpFile = rootProjectDir.resolve("sub1/$API_DIR/sub1.api")
245246
assertTrue(apiDumpFile.exists(), "api dump file ${apiDumpFile.path} should exist")
246247

247248
Assertions.assertThat(apiDumpFile.readText()).isEqualToIgnoringNewLines("")
@@ -280,21 +281,21 @@ internal class SubprojectsWithPluginOnSubTests : BaseKotlinGradleTest() {
280281

281282
assertFalse(rootProjectApiDump.exists(), "api dump file ${rootProjectApiDump.path} should NOT exist")
282283

283-
val apiSub1 = rootProjectDir.resolve("sub1/api/sub1.api")
284+
val apiSub1 = rootProjectDir.resolve("sub1/$API_DIR/sub1.api")
284285
assertTrue(apiSub1.exists(), "api dump file ${apiSub1.path} should exist")
285286
Assertions.assertThat(apiSub1.readText()).isEqualToIgnoringNewLines("")
286287

287-
val apiSubsub1 = rootProjectDir.resolve("sub1/subsub1/api/subsub1.api")
288+
val apiSubsub1 = rootProjectDir.resolve("sub1/subsub1/$API_DIR/subsub1.api")
288289
assertTrue(apiSubsub1.exists(), "api dump file ${apiSubsub1.path} should exist")
289290
val apiSubsub1Expected = readFileList("examples/classes/Subsub1Class.dump")
290291
Assertions.assertThat(apiSubsub1.readText()).isEqualToIgnoringNewLines(apiSubsub1Expected)
291292

292-
val apiSubsub2 = rootProjectDir.resolve("sub1/subsub2/api/subsub2.api")
293+
val apiSubsub2 = rootProjectDir.resolve("sub1/subsub2/$API_DIR/subsub2.api")
293294
assertTrue(apiSubsub2.exists(), "api dump file ${apiSubsub2.path} should exist")
294295
val apiSubsub2Expected = readFileList("examples/classes/Subsub2Class.dump")
295296
Assertions.assertThat(apiSubsub2.readText()).isEqualToIgnoringNewLines(apiSubsub2Expected)
296297

297-
val apiSub2 = rootProjectDir.resolve("sub2/api/sub2.api")
298+
val apiSub2 = rootProjectDir.resolve("sub2/$API_DIR/sub2.api")
298299
assertFalse(apiSub2.exists(), "api dump file ${apiSub2.path} should NOT exist")
299300
}
300301
}

0 commit comments

Comments
 (0)