MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle tests] move test not related to buildSrc issues to another test suite

Browse Source 
GitOrigin-RevId: 36c504c64f7f62192f0c65350b3d6af191afa038
This commit is contained in:
Vladislav.Soroka
2020-12-14 10:06:04 +00:00
committed by intellij-monorepo-bot
parent 42ae2c5f3c
commit 864f81ea17
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/testSources/importing/GradleBuildSrcImportingTest.kt
-24
View File
@@ -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);
plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java
+25
View File
@@ -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());