From 1fd50efc616cea1cb77c320c064f2ecf14354e64 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurkevich Date: Thu, 26 Mar 2020 22:00:00 +0300 Subject: [PATCH] [workspace model] Ignore not applicable tests GitOrigin-RevId: b4c19a053a228604671c917e90ebfae14f4766cd --- .../com/intellij/roots/ModuleRootManagerTestCase.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java b/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java index 9f227bc9a281..142b63c0571f 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java @@ -24,6 +24,7 @@ import com.intellij.openapi.projectRoots.SdkModificator; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.project.IntelliJProjectConfiguration; @@ -142,11 +143,7 @@ public abstract class ModuleRootManagerTestCase extends JavaModuleTestCase { return IntelliJProjectConfiguration.getJarFromSingleJarProjectLibrary("ASM"); } - protected boolean underWorkspaceModel() { - return ModuleManager.getInstance(myProject).getClass().getName() == "com.intellij.workspace.legacyBridge.intellij.LegacyBridgeModuleManagerComponent"; - } - - protected void ignoreTestUnderWorkspaceModel() { - Assume.assumeFalse("Not applicable to workspace model", underWorkspaceModel()); + protected static void ignoreTestUnderWorkspaceModel() { + Assume.assumeFalse("Not applicable to workspace model", Registry.is("ide.new.project.model")); } }