MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Gradle|TestFramework] cleanup: extracted importProject method to the ExternalSystemImportingTestCase

Browse Source 
GitOrigin-RevId: b4a961997b8a62092c537c4e4db813ad5b0115e7
This commit is contained in:
Sergei Vorobyov
2024-05-24 10:48:36 +02:00
committed by intellij-monorepo-bot
parent f14f2a0c90
commit faf339efb5
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/external-system-api/testFramework/src/com/intellij/platform/externalSystem/testFramework/ExternalSystemImportingTestCase.java
View File

@@ -47,7 +47,6 @@ import com.intellij.testFramework.utils.module.ModuleAssertions;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.CommonProcessors;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.model.java.JavaResourceRootType;
@@ -438,21 +437,21 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
ProjectDataManager.getInstance().importData(projectDataNode, myProject);
}
protected void importProject(@NonNls String config, Boolean skipIndexing) throws IOException {
protected void importProject(@NotNull String config, @Nullable Boolean skipIndexing) throws IOException {
createProjectConfig(config);
importProject(skipIndexing);
}
protected void importProject(Boolean skipIndexing) {
protected void importProject(@Nullable Boolean skipIndexing) {
if (skipIndexing != null) {
PlatformTestUtil.withSystemProperty("idea.skip.indices.initialization", skipIndexing.toString(), () -> doImportProject());
PlatformTestUtil.withSystemProperty("idea.skip.indices.initialization", skipIndexing.toString(), () -> importProject());
}
else {
doImportProject();
importProject();
}
}
private void doImportProject() {
protected void importProject() {
AbstractExternalSystemSettings systemSettings = ExternalSystemApiUtil.getSettings(myProject, getExternalSystemId());
final ExternalProjectSettings projectSettings = getCurrentExternalProjectSettings();
projectSettings.setExternalProjectPath(getProjectPath());

6
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
View File

@@ -350,10 +350,6 @@ public abstract class GradleImportingTestCase extends JavaExternalSystemImportin
importProject();
}
protected void importProject() {
importProject((Boolean)null);
}
protected void importProjectUsingSingeModulePerGradleProject(@NonNls String config, Boolean skipIndexing)
throws IOException {
getCurrentExternalProjectSettings().setResolveModulePerSourceSet(false);
@@ -365,7 +361,7 @@ public abstract class GradleImportingTestCase extends JavaExternalSystemImportin
}
@Override
protected void importProject(@NonNls String config, Boolean skipIndexing) throws IOException {
protected void importProject(@NotNull String config, @Nullable Boolean skipIndexing) throws IOException {
if (UsefulTestCase.IS_UNDER_TEAMCITY) {
config = injectRepo(config);
}