From 4bfcb4b0419ec179ec1a79b660307090b6589c1d Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 26 Jun 2020 12:31:51 +0300
Subject: [PATCH] [Gradle, JS] Use common projectName fun

---
 .../jetbrains/kotlin/gradle/DukatIntegrationIT.kt    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 116592d8c3b..218d2b36632 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
@@ -46,7 +46,7 @@ class DukatIntegrationIT : BaseGradleIT() {
         dependenciesLocation: DependenciesLocation
     ) {
         val project = Project(
-            projectName = "${dslType.value}-${dependenciesLocation.value}",
+            projectName = projectName(dslType, dependenciesLocation),
             directoryPrefix = "dukat-integration"
         )
         project.setupWorkingDir()
@@ -93,7 +93,7 @@ class DukatIntegrationIT : BaseGradleIT() {
         dslType: DslType,
         dependenciesLocation: DependenciesLocation
     ) {
-        val projectName = "${dslType.value}-${dependenciesLocation.value}"
+        val projectName = projectName(dslType, dependenciesLocation)
         val project = Project(
             projectName = projectName,
             directoryPrefix = "dukat-integration"
@@ -145,7 +145,7 @@ class DukatIntegrationIT : BaseGradleIT() {
         dslType: DslType,
         dependenciesLocation: DependenciesLocation
     ) {
-        val projectName = "${dslType.value}-${dependenciesLocation.value}"
+        val projectName = projectName(dslType, dependenciesLocation)
         val project = Project(
             projectName = projectName,
             directoryPrefix = "dukat-integration"
@@ -179,6 +179,12 @@ class DukatIntegrationIT : BaseGradleIT() {
         }
     }
 
+    private fun projectName(
+        dslType: DslType,
+        dependenciesLocation: DependenciesLocation
+    ): String =
+        "${dslType.value}-${dependenciesLocation.value}"
+
     private enum class DslType(
         val value: String
     ) {