From 864f81ea1763bbcf98dbc804e54b1c4eb5371605 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Mon, 14 Dec 2020 13:05:13 +0300
Subject: [PATCH] [Gradle tests] move test not related to buildSrc issues to
 another test suite

GitOrigin-RevId: 36c504c64f7f62192f0c65350b3d6af191afa038
---
 .../importing/GradleBuildSrcImportingTest.kt  | 24 ------------------
 .../importing/GradleMiscImportingTest.java    | 25 +++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt b/plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
index 3a5a49f1b392..8e811d2b1a5e 100644
--- a/plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
+++ b/plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
@@ -132,30 +132,6 @@ class GradleBuildSrcImportingTest : GradleImportingTestCase() {
     assertModuleLibDep("another-build.buildSrc.main", depJar.presentableUrl, depJar.url)
   }
 
-  @Test
-  fun `import project with existing fake module`() {
-    // After first opening of the project, IJ creates a fake module at the project root
-
-    edt<Throwable> {
-      ApplicationManager.getApplication().runWriteAction {
-        val module = ModuleManager.getInstance(myProject).newModule(projectPath + "/" + "project" + ModuleFileType.DOT_DEFAULT_EXTENSION,
-                                                                    StdModuleTypes.JAVA.id)
-        ModuleRootManager.getInstance(module).modifiableModel.also {
-          it.addContentEntry(myProjectRoot)
-          it.inheritSdk()
-          it.commit()
-        }
-      }
-    }
-
-    val module = ModuleManager.getInstance(myProject).findModuleByName("project")!!
-    assertFalse(ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module))
-
-    assertNoThrowable { importProject() }
-
-    val moduleAfter = ModuleManager.getInstance(myProject).findModuleByName("project")!!
-    assertTrue(ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, moduleAfter))
-  }
 
   private fun assertBuildScriptClassPathContains(moduleName: String, expectedEntries: Collection<VirtualFile>) {
     val module = ModuleManager.getInstance(myProject).findModuleByName(moduleName);
diff --git a/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java b/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java
index bcd9caaef4ad..b93b7136def0 100644
--- a/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java
+++ b/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.gradle.importing;
 
+import com.intellij.ide.highlighter.ModuleFileType;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.externalSystem.model.DataNode;
 import com.intellij.openapi.externalSystem.model.ExternalProjectInfo;
@@ -16,6 +17,7 @@ import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.StdModuleTypes;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.TestModuleProperties;
 import com.intellij.pom.java.LanguageLevel;
@@ -305,6 +307,29 @@ public class GradleMiscImportingTest extends GradleJavaImportingTestCase {
     assertThat(taskNames).containsOnlyOnce("\"descriptive task name\"");
   }
 
+  @Test
+  public void testImportProjectWithExistingFakeModule() {
+    // After first opening of the project, IJ creates a fake module at the project root
+    edt(() -> {
+      ApplicationManager.getApplication().runWriteAction(() -> {
+        Module module = ModuleManager.getInstance(myProject).newModule(
+          getProjectPath() + "/" + "project" + ModuleFileType.DOT_DEFAULT_EXTENSION, StdModuleTypes.JAVA.getId());
+        ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();
+        modifiableModel.addContentEntry(myProjectRoot);
+        modifiableModel.inheritSdk();
+        modifiableModel.commit();
+      });
+    });
+
+    Module module = ModuleManager.getInstance(myProject).findModuleByName("project");
+    assertFalse(ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module));
+
+    assertNoThrowable(() -> importProject());
+
+    Module moduleAfter = ModuleManager.getInstance(myProject).findModuleByName("project");
+    assertTrue(ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, moduleAfter));
+  }
+
   private static void assertExternalProjectIds(Map<String, ExternalProject> projectMap, String projectId, String... sourceSetModulesIds) {
     ExternalProject externalProject = projectMap.get(projectId);
     assertEquals(projectId, externalProject.getId());