From bed7b23d6c57a16bc931385b7fffedf3c24580b4 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 20 May 2020 19:20:52 +0300 Subject: [PATCH] [Gradle, JS] Fix naming of test and test data #KT-38592 fixed --- .../kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt | 6 +++--- .../my-lib-foo/build.gradle.kts | 0 .../my-lib-foo/gradle.properties | 0 .../my-lib-foo/settings.gradle.kts | 0 .../my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt | 0 .../third-party-lib/build.gradle.kts | 0 .../third-party-lib/settings.gradle.kts | 0 .../third-party-lib/src/main/kotlin/ThirdPartyJs.kt | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/my-lib-foo/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/my-lib-foo/gradle.properties (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/my-lib-foo/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/third-party-lib/build.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/third-party-lib/settings.gradle.kts (100%) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/{hierarchical-mpp-with-js-modules => hierarchical-mpp-with-js-published-modules}/third-party-lib/src/main/kotlin/ThirdPartyJs.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index fe641bc7ee8..2c1b712e50a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -146,8 +146,8 @@ class HierarchicalMppIT : BaseGradleIT() { } @Test - fun testHmppWithJsBothDependency() { - val directoryPrefix = "hierarchical-mpp-with-js-modules" + fun testHmppWithPublishedJsBothDependency() { + val directoryPrefix = "hierarchical-mpp-with-js-published-modules" publishThirdPartyLib( projectName = "third-party-lib", directoryPrefix = directoryPrefix, @@ -592,4 +592,4 @@ class HierarchicalMppIT : BaseGradleIT() { } } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/gradle.properties rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/gradle.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/src/jsMain/kotlin/FooJvmAndJs.kt diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/build.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/settings.gradle.kts similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/settings.gradle.kts rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/src/main/kotlin/ThirdPartyJs.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/src/main/kotlin/ThirdPartyJs.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-modules/third-party-lib/src/main/kotlin/ThirdPartyJs.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/src/main/kotlin/ThirdPartyJs.kt