From 891071e074c1ac580a9f5b0a2d6903d8300c10a7 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 26 Jun 2020 12:24:42 +0300 Subject: [PATCH] [Gradle, JS] Add assertSingleFileExists --- .../jetbrains/kotlin/gradle/BaseGradleIT.kt | 12 ++++++++++++ .../kotlin/gradle/DukatIntegrationIT.kt | 19 ++----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index b1352578220..bff8ab610c2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -426,6 +426,18 @@ abstract class BaseGradleIT { return this } + fun CompiledProject.assertSingleFileExists( + directory: String = "", + filePath: String = "" + ): CompiledProject { + val directoryFile = fileInWorkingDir(directory) + assertTrue( + directoryFile.listFiles()?.size == 1, + "[$directory] should contain only single file" + ) + return assertFileExists("$directory/$filePath") + } + fun CompiledProject.assertFileExists(path: String = ""): CompiledProject { assertTrue(fileInWorkingDir(path).exists(), "The file [$path] does not exist.") return this diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt index 48c86bfac90..033600b1c21 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt @@ -5,20 +5,8 @@ package org.jetbrains.kotlin.gradle -import org.gradle.api.logging.LogLevel -import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject -import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProjectModules -import org.jetbrains.kotlin.gradle.targets.js.npm.fromSrcPackageJson -import org.jetbrains.kotlin.gradle.tasks.USING_JS_INCREMENTAL_COMPILATION_MESSAGE -import org.jetbrains.kotlin.gradle.tasks.USING_JS_IR_BACKEND_MESSAGE -import org.jetbrains.kotlin.gradle.util.* -import org.junit.Assume.assumeFalse +import org.jetbrains.kotlin.gradle.util.modify import org.junit.Test -import java.io.File -import java.util.zip.ZipFile -import kotlin.test.assertEquals -import kotlin.test.assertTrue class DukatIntegrationIT : BaseGradleIT() { @Test @@ -117,10 +105,7 @@ class DukatIntegrationIT : BaseGradleIT() { project.build("generateExternalsIntegrated") { assertSuccessful() - assertTrue { - fileInWorkingDir(externalSrcs).listFiles()?.size == 1 - } - assertFileExists("$externalSrcs/index.module_decamelize.kt") + assertSingleFileExists(externalSrcs, "index.module_decamelize.kt") } }