MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

workspace model: treeProjectModel -> workspace model

Browse Source 
GitOrigin-RevId: c8c0fdc5f629ccae51455001fe27217c858a98b7
This commit is contained in:
Leonid Shalupov
2019-10-29 20:32:24 +01:00
committed by intellij-monorepo-bot
parent e4a219484f
commit 64a56fc9a3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java
View File

@@ -145,11 +145,11 @@ public abstract class ModuleRootManagerTestCase extends JavaModuleTestCase {
return IntelliJProjectConfiguration.getJarFromSingleJarProjectLibrary("ASM");
}
protected boolean underTreeProjectModel() {
protected boolean underWorkspaceModel() {
return ModuleManager.getInstance(myProject).getClass().getName() == "com.intellij.workspace.legacyBridge.intellij.LegacyBridgeModuleManagerComponent";
}
protected void ignoreTestUnderTreeProjectModel() {
Assume.assumeFalse("Not applicable to treeProjectModel", underTreeProjectModel());
protected void ignoreTestUnderWorkspaceModel() {
Assume.assumeFalse("Not applicable to workspace model", underWorkspaceModel());
}
}

6
java/java-tests/testSrc/com/intellij/roots/libraries/LibraryTest.java
View File

@@ -132,7 +132,7 @@ public class LibraryTest extends ModuleRootManagerTestCase {
}
public void testModificationCount() {
ignoreTestUnderTreeProjectModel();
ignoreTestUnderWorkspaceModel();
final long moduleModificationCount = ModuleRootManagerEx.getInstanceEx(myModule).getModificationCountForTests();
@@ -169,7 +169,7 @@ public class LibraryTest extends ModuleRootManagerTestCase {
}
public void testReloadLibraryTable() {
ignoreTestUnderTreeProjectModel();
ignoreTestUnderWorkspaceModel();
((LibraryTableBase)getProjectLibraryTable()).loadState(new Element("component"));
createLibrary("a", null, null);
@@ -178,7 +178,7 @@ public class LibraryTest extends ModuleRootManagerTestCase {
}
public void testReloadLibraryTableWithoutChanges() {
ignoreTestUnderTreeProjectModel();
ignoreTestUnderWorkspaceModel();
((LibraryTableBase)getProjectLibraryTable()).loadState(new Element("component"));
createLibrary("a", null, null);

2
platform/workspaceModel-ide/src/META-INF/plugin.xml
View File

@@ -11,7 +11,7 @@
<extensions defaultExtensionNs="com.intellij">
<registryKey key="ide.new.project.model" defaultValue="false" restartRequired="false"
description="Enable new entities-based project model"/>
description="Enable new entities-based project model (workspace model)"/>
<cachesInvalidator implementation="com.intellij.workspace.legacyBridge.intellij.ProjectModelCachesInvalidator"/>