From 8cb03fcdeccd84a0f2df423a8bc2a93b5a8b1e38 Mon Sep 17 00:00:00 2001 From: Lucas Smaira Date: Fri, 27 Jul 2018 16:49:36 +0100 Subject: [PATCH] Fix model tests in Windows By comparing files instead of paths, avoiding problems with separator '/' or '\'. --- .../kotlin/gradle/model/KaptModelIT.kt | 12 +++---- .../kotlin/gradle/model/KotlinProjectIT.kt | 36 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt index 68156d9ccfb..2a7c6deee16 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt @@ -25,14 +25,14 @@ class KaptModelIT : BaseGradleIT() { val testSourceSet = kaptModel.kaptSourceSets.find { it.name == "test" }!! assertEquals(KaptSourceSet.KaptSourceSetType.PRODUCTION, mainSourceSet.type) - assertTrue(mainSourceSet.generatedSourcesDirectory.absolutePath.contains("build/generated/source/kapt/main")) - assertTrue(mainSourceSet.generatedKotlinSourcesDirectory.absolutePath.contains("build/generated/source/kaptKotlin/main")) - assertTrue(mainSourceSet.generatedClassesDirectory.absolutePath.contains("tmp/kapt3/classes/main")) + assertEquals(project.projectDir.resolve("build/generated/source/kapt/main"), mainSourceSet.generatedSourcesDirectory) + assertEquals(project.projectDir.resolve("build/generated/source/kaptKotlin/main"), mainSourceSet.generatedKotlinSourcesDirectory) + assertEquals(project.projectDir.resolve("build/tmp/kapt3/classes/main"), mainSourceSet.generatedClassesDirectory) assertEquals(KaptSourceSet.KaptSourceSetType.TEST, testSourceSet.type) - assertTrue(testSourceSet.generatedSourcesDirectory.absolutePath.contains("build/generated/source/kapt/test")) - assertTrue(testSourceSet.generatedKotlinSourcesDirectory.absolutePath.contains("build/generated/source/kaptKotlin/test")) - assertTrue(testSourceSet.generatedClassesDirectory.absolutePath.contains("tmp/kapt3/classes/test")) + assertEquals(project.projectDir.resolve("build/generated/source/kapt/test"), testSourceSet.generatedSourcesDirectory) + assertEquals(project.projectDir.resolve("build/generated/source/kaptKotlin/test"), testSourceSet.generatedKotlinSourcesDirectory) + assertEquals(project.projectDir.resolve("build/tmp/kapt3/classes/test"), testSourceSet.generatedClassesDirectory) } @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index 7f595a83b55..3972f3f1f55 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -29,22 +29,22 @@ class KotlinProjectIT : BaseGradleIT() { testSourceSet.assertBasics("test", SourceSet.SourceSetType.TEST, listOf("main")) assertEquals(2, mainSourceSet.sourceDirectories.size) - assertEquals(1, mainSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/main/kotlin") }.size) - assertEquals(1, mainSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/main/java") }.size) + assertTrue(mainSourceSet.sourceDirectories.contains(project.projectDir.resolve("src/main/kotlin"))) + assertTrue(mainSourceSet.sourceDirectories.contains(project.projectDir.resolve("src/main/java"))) assertEquals(1, mainSourceSet.resourcesDirectories.size) - assertEquals(1, mainSourceSet.resourcesDirectories.filter { it.absolutePath.contains("src/main/resources") }.size) - assertTrue(mainSourceSet.classesOutputDirectory.absolutePath.contains("build/classes/kotlin/main")) - assertTrue(mainSourceSet.resourcesOutputDirectory.absolutePath.contains("build/resources/main")) + assertTrue(mainSourceSet.resourcesDirectories.contains(project.projectDir.resolve("src/main/resources"))) + assertEquals(project.projectDir.resolve("build/classes/kotlin/main"), mainSourceSet.classesOutputDirectory) + assertEquals(project.projectDir.resolve("build/resources/main"), mainSourceSet.resourcesOutputDirectory) assertTrue(mainSourceSet.compilerArguments.compileClasspath.any { it.absolutePath.contains("guava") }) assertFalse(mainSourceSet.compilerArguments.compileClasspath.any { it.absolutePath.contains("testng") }) assertEquals(2, testSourceSet.sourceDirectories.size) - assertEquals(1, testSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/test/kotlin") }.size) - assertEquals(1, testSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/test/java") }.size) + assertTrue(testSourceSet.sourceDirectories.contains(project.projectDir.resolve("src/test/kotlin"))) + assertTrue(testSourceSet.sourceDirectories.contains(project.projectDir.resolve("src/test/java"))) assertEquals(1, testSourceSet.resourcesDirectories.size) - assertEquals(1, testSourceSet.resourcesDirectories.filter { it.absolutePath.contains("src/test/resources") }.size) - assertTrue(testSourceSet.classesOutputDirectory.absolutePath.contains("build/classes/kotlin/test")) - assertTrue(testSourceSet.resourcesOutputDirectory.absolutePath.contains("build/resources/test")) + assertTrue(testSourceSet.resourcesDirectories.contains(project.projectDir.resolve("src/test/resources"))) + assertEquals(project.projectDir.resolve("build/classes/kotlin/test"), testSourceSet.classesOutputDirectory) + assertEquals(project.projectDir.resolve("build/resources/test"), testSourceSet.resourcesOutputDirectory) assertTrue(testSourceSet.compilerArguments.compileClasspath.any { it.absolutePath.contains("guava") }) assertTrue(testSourceSet.compilerArguments.compileClasspath.any { it.absolutePath.contains("testng") }) } @@ -99,18 +99,18 @@ class KotlinProjectIT : BaseGradleIT() { testJsSourceSet.assertBasics("test", SourceSet.SourceSetType.TEST, listOf("main")) assertEquals(1, mainJsSourceSet.sourceDirectories.size) - assertEquals(1, mainJsSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/main/kotlin") }.size) + assertTrue(mainJsSourceSet.sourceDirectories.contains(project.projectDir.resolve("libJs/src/main/kotlin"))) assertEquals(1, mainJsSourceSet.resourcesDirectories.size) - assertEquals(1, mainJsSourceSet.resourcesDirectories.filter { it.absolutePath.contains("src/main/resources") }.size) - assertTrue(mainJsSourceSet.classesOutputDirectory.absolutePath.contains("build/classes/kotlin/main")) - assertTrue(mainJsSourceSet.resourcesOutputDirectory.absolutePath.contains("build/resources/main")) + assertTrue(mainJsSourceSet.resourcesDirectories.contains(project.projectDir.resolve("libJs/src/main/resources"))) + assertEquals(project.projectDir.resolve("libJs/build/classes/kotlin/main"), mainJsSourceSet.classesOutputDirectory) + assertEquals(project.projectDir.resolve("libJs/build/resources/main"), mainJsSourceSet.resourcesOutputDirectory) assertEquals(1, testJsSourceSet.sourceDirectories.size) - assertEquals(1, testJsSourceSet.sourceDirectories.filter { it.absolutePath.contains("src/test/kotlin") }.size) + assertTrue(testJsSourceSet.sourceDirectories.contains(project.projectDir.resolve("libJs/src/test/kotlin"))) assertEquals(1, testJsSourceSet.resourcesDirectories.size) - assertEquals(1, testJsSourceSet.resourcesDirectories.filter { it.absolutePath.contains("src/test/resources") }.size) - assertTrue(testJsSourceSet.classesOutputDirectory.absolutePath.contains("build/classes/kotlin/test")) - assertTrue(testJsSourceSet.resourcesOutputDirectory.absolutePath.contains("build/resources/test")) + assertTrue(testJsSourceSet.resourcesDirectories.contains(project.projectDir.resolve("libJs/src/test/resources"))) + assertEquals(project.projectDir.resolve("libJs/build/classes/kotlin/test"), testJsSourceSet.classesOutputDirectory) + assertEquals(project.projectDir.resolve("libJs/build/resources/test"), testJsSourceSet.resourcesOutputDirectory) } @Test