From b1965e746f9b04a924919324cc01bd6f2652ac07 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 21 Aug 2023 19:20:41 +0200
Subject: [PATCH] [Gradle] Move project isolation test to separate test suite

^KT-59826 In Progress
---
 .../kotlin/gradle/ProjectIsolationIT.kt       | 32 +++++++++++++++++++
 .../kotlin/gradle/SimpleKotlinGradleIT.kt     | 16 ----------
 2 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ProjectIsolationIT.kt

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ProjectIsolationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ProjectIsolationIT.kt
new file mode 100644
index 00000000000..1ec66ba372f
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ProjectIsolationIT.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+import org.gradle.util.GradleVersion
+import org.jetbrains.kotlin.gradle.testbase.*
+import org.junit.jupiter.api.DisplayName
+
+class ProjectIsolationIT : KGPBaseTest() {
+
+    override val defaultBuildOptions: BuildOptions
+        get() = super.defaultBuildOptions.copy(configurationCache = true, projectIsolation = true)
+
+    @DisplayName("Should be compatible with project isolation")
+    @JvmGradlePluginTests
+    @GradleTestVersions(
+        minVersion = TestVersions.Gradle.G_7_1,
+        maxVersion = TestVersions.Gradle.G_7_6
+    )
+    @GradleTest
+    fun testProjectIsolationInJvmSimple(gradleVersion: GradleVersion) {
+        project(
+            projectName = "instantExecution",
+            gradleVersion = gradleVersion,
+        ) {
+            build(":main-project:compileKotlin")
+        }
+    }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
index 6e7d60d4cb9..e63cdf56c31 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
@@ -199,22 +199,6 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
         }
     }
 
-    @GradleTest
-    @DisplayName("Should be compatible with project isolation")
-    @GradleTestVersions(
-        minVersion = TestVersions.Gradle.G_7_1,
-        maxVersion = TestVersions.Gradle.G_7_6
-    )
-    fun testProjectIsolation(gradleVersion: GradleVersion) {
-        project(
-            projectName = "instantExecution",
-            gradleVersion = gradleVersion,
-            buildOptions = defaultBuildOptions.copy(configurationCache = true, projectIsolation = true),
-        ) {
-            build(":main-project:compileKotlin")
-        }
-    }
-
     @DisplayName("Proper Gradle plugin variant is used")
     @GradleTestVersions(
         additionalVersions = [