From 32d6fe6043b6d94d5369c3e088cc340f59d2d4b8 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 16 Jul 2015 21:33:38 +0300 Subject: [PATCH] removed unnecessary 'initPlatformPrefix' calls --- .../com/intellij/codeInsight/AddAnnotationFixTest.java | 4 ---- .../intellij/codeInsight/ClsGenericsHighlightingTest.java | 5 ----- .../intellij/codeInsight/MultipleJdksHighlightingTest.java | 5 ----- .../com/intellij/codeInsight/SuppressExternalTest.java | 4 ---- .../NotNullVerifyingInstrumenterTest.java | 5 ----- .../ide/fileStructure/JavaFileStructureTestCase.java | 4 ---- .../com/intellij/lang/java/parser/JavaParsingTestCase.java | 2 -- .../refactoring/AbstractJavaInplaceIntroduceTest.java | 6 ------ .../src/com/intellij/testFramework/IdeaTestCase.java | 1 - .../fixtures/JavaCodeInsightFixtureTestCase.java | 6 ------ .../com.intellij.dvcs/VcsRepositoryManagerTest.java | 6 ------ .../externalSystem/test/ExternalSystemTestCase.java | 4 ---- .../RemotelyConfigurableStatServiceTest.java | 6 ------ .../execution/testframework/sm/SMLightFixtureTestCase.java | 6 ------ .../testframework/sm/runner/BaseSMTRunnerTestCase.java | 5 ----- .../com/intellij/structuralsearch/SSRCodeInsightTest.java | 4 ---- .../com/intellij/testFramework/PlatformLangTestCase.java | 4 ---- .../openapi/vcs/roots/VcsIntegrationEnablerTest.java | 5 ----- .../intellij/openapi/vcs/roots/VcsRootPlatformTest.java | 5 ----- .../test/com/intellij/vcs/log/impl/VcsLogPlatformTest.java | 5 ----- .../testSrc/com/intellij/xdebugger/XDebuggerTestCase.java | 4 ---- .../git4idea/test-stepdefs/git4idea/GitCucumberWorld.java | 2 -- plugins/git4idea/tests/git4idea/test/GitPlatformTest.java | 6 ------ .../codeInsight/actions/AddGradleDslPluginActionTest.java | 4 ---- .../actions/AddGradleDslDependencyActionTest.java | 4 ---- plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java | 5 ----- plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java | 5 ----- .../test/java/org/jetbrains/idea/maven/MavenTestCase.java | 4 ---- .../idea/maven/utils/MavenTemplateFileProcessorTest.java | 4 ---- .../testSource/org/jetbrains/idea/SvnTestCase.java | 1 - .../test/com/intellij/tasks/TaskManagerTestCase.java | 5 ----- .../tasks-tests/test/com/intellij/tasks/TaskUiTest.java | 5 ----- .../test/com/intellij/tasks/jira/jql/CompletionTest.java | 7 ------- xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java | 7 ------- xml/tests/src/com/intellij/xml/XmlFoldingTest.java | 5 ----- xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java | 5 ----- .../src/com/intellij/xml/index/XmlSchemaIndexTest.java | 5 ----- .../intellij/xml/index/XmlSchemaTypeInheritanceTest.java | 6 ------ 38 files changed, 176 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java index 5ffb15646b3c..671ef78fb08b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/AddAnnotationFixTest.java @@ -67,10 +67,6 @@ public class AddAnnotationFixTest extends UsefulTestCase { private boolean myUnexpectedEventWasProduced = false; private MessageBusConnection myBusConnection = null; - public AddAnnotationFixTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override public void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java index 61392252f861..b656156df36f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java @@ -39,11 +39,6 @@ public abstract class ClsGenericsHighlightingTest extends UsefulTestCase { private CodeInsightTestFixture myFixture; private Module myModule; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public ClsGenericsHighlightingTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override public void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java index d7f76d72de67..8dd77a1f47ad 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java @@ -36,11 +36,6 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase { private Module myJava7Module; private Module myJava8Module; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public MultipleJdksHighlightingTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override protected void tearDown() throws Exception { try { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/SuppressExternalTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/SuppressExternalTest.java index 961aa5690fdf..b9f6366d5b62 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/SuppressExternalTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/SuppressExternalTest.java @@ -45,10 +45,6 @@ public class SuppressExternalTest extends UsefulTestCase { private LanguageLevel myLanguageLevel; - public SuppressExternalTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override public void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java b/java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java index 3bdd0c5e2f0b..163a87f95b02 100644 --- a/java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java +++ b/java/java-tests/testSrc/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenterTest.java @@ -45,11 +45,6 @@ public class NotNullVerifyingInstrumenterTest extends UsefulTestCase { private boolean myJava6; private IdeaProjectTestFixture myFixture; - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"}) - public NotNullVerifyingInstrumenterTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureTestCase.java b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureTestCase.java index c4d3538e1532..372b50568dba 100644 --- a/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureTestCase.java +++ b/java/java-tests/testSrc/com/intellij/ide/fileStructure/JavaFileStructureTestCase.java @@ -29,10 +29,6 @@ import com.intellij.testFramework.IdeaTestCase; public abstract class JavaFileStructureTestCase extends FileStructureTestBase { private boolean myShowAnonymousByDefault; - protected JavaFileStructureTestCase() { - IdeaTestCase.initPlatformPrefix(); - } - protected abstract String getTestDataFolderName(); @Override diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/JavaParsingTestCase.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/JavaParsingTestCase.java index 084d34c2194e..9bf669dc6350 100644 --- a/java/java-tests/testSrc/com/intellij/lang/java/parser/JavaParsingTestCase.java +++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/JavaParsingTestCase.java @@ -33,7 +33,6 @@ import com.intellij.psi.impl.source.tree.FileElement; import com.intellij.psi.impl.source.tree.JavaASTFactory; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.util.PsiUtil; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.LightVirtualFile; import com.intellij.testFramework.ParsingTestCase; import org.jetbrains.annotations.NonNls; @@ -47,7 +46,6 @@ public abstract class JavaParsingTestCase extends ParsingTestCase { @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"}) public JavaParsingTestCase(@NonNls final String dataPath) { super("psi/"+dataPath, "java", new JavaParserDefinition()); - IdeaTestCase.initPlatformPrefix(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/refactoring/AbstractJavaInplaceIntroduceTest.java b/java/java-tests/testSrc/com/intellij/refactoring/AbstractJavaInplaceIntroduceTest.java index 9cd5d069c875..37da84a67e2e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/AbstractJavaInplaceIntroduceTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/AbstractJavaInplaceIntroduceTest.java @@ -35,12 +35,6 @@ import org.jetbrains.annotations.Nullable; */ public abstract class AbstractJavaInplaceIntroduceTest extends AbstractInplaceIntroduceTest { - @Override - protected void setUp() throws Exception { - IdeaTestCase.initPlatformPrefix(); - super.setUp(); - } - @Nullable protected PsiExpression getExpressionFromEditor() { final PsiExpression expression = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiExpression.class); diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java index 9826066cbf43..b4cac26a9a87 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java @@ -66,7 +66,6 @@ public abstract class IdeaTestCase extends PlatformTestCase { * @deprecated calling this method is no longer necessary */ public static void initPlatformPrefix() { - initPlatformPrefix("com.intellij.idea.IdeaUltimateApplication", "Idea"); } protected static void sortClassesByName(final PsiClass[] classes) { diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java index 1e343ec680b4..167eb1041e87 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java @@ -22,7 +22,6 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiElementFactory; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiManagerEx; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; import org.jetbrains.annotations.NonNls; @@ -36,11 +35,6 @@ public abstract class JavaCodeInsightFixtureTestCase extends UsefulTestCase{ protected JavaCodeInsightTestFixture myFixture; protected Module myModule; - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"}) - protected JavaCodeInsightFixtureTestCase() { - IdeaTestCase.initPlatformPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java b/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java index c45b606398bc..64c222910ad7 100644 --- a/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java +++ b/platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java @@ -26,7 +26,6 @@ import com.intellij.openapi.vcs.VcsKey; import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs; import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; @@ -56,11 +55,6 @@ public class VcsRepositoryManagerTest extends UsefulTestCase { private VirtualFile myProjectRoot; private VcsRepositoryCreator myMockCreator; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public VcsRepositoryManagerTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java index 56277f77f2b3..58a4ac8bdef2 100644 --- a/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java +++ b/platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemTestCase.java @@ -86,10 +86,6 @@ public abstract class ExternalSystemTestCase extends UsefulTestCase { private List myAllowedRoots = new ArrayList(); - static { - IdeaTestCase.initPlatformPrefix(); - } - @Before @Override public void setUp() throws Exception { diff --git a/platform/platform-tests/testSrc/com/intellij/usagesStatistics/RemotelyConfigurableStatServiceTest.java b/platform/platform-tests/testSrc/com/intellij/usagesStatistics/RemotelyConfigurableStatServiceTest.java index 2b76e6947636..5cb815cfec04 100644 --- a/platform/platform-tests/testSrc/com/intellij/usagesStatistics/RemotelyConfigurableStatServiceTest.java +++ b/platform/platform-tests/testSrc/com/intellij/usagesStatistics/RemotelyConfigurableStatServiceTest.java @@ -20,7 +20,6 @@ import com.intellij.internal.statistic.connect.RemotelyConfigurableStatisticsSer import com.intellij.internal.statistic.connect.StatisticsConnectionService; import com.intellij.internal.statistic.connect.StatisticsHttpClientSender; import com.intellij.internal.statistic.connect.StatisticsResult; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.util.net.NetUtils; import org.jetbrains.annotations.NotNull; import org.junit.BeforeClass; @@ -35,11 +34,6 @@ public class RemotelyConfigurableStatServiceTest { private static String STAT_URL; private static String STAT_CONFIG_URL; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public RemotelyConfigurableStatServiceTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @BeforeClass public static void init() throws Exception { int port = NetUtils.findAvailableSocketPort(); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java index d5cdbefdfafa..828e9a6f39a1 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java @@ -18,7 +18,6 @@ package com.intellij.execution.testframework.sm; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; @@ -31,11 +30,6 @@ import org.jetbrains.annotations.Nullable; * @author Roman.Chernyatchik */ public abstract class SMLightFixtureTestCase extends UsefulTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected SMLightFixtureTestCase() { - PlatformTestCase.initPlatformLangPrefix(); - } - protected CodeInsightTestFixture myFixture; @Override diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/BaseSMTRunnerTestCase.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/BaseSMTRunnerTestCase.java index 2eb255307f0b..734e59f044a5 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/BaseSMTRunnerTestCase.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/BaseSMTRunnerTestCase.java @@ -19,7 +19,6 @@ import com.intellij.execution.configurations.ModuleRunConfiguration; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.testFramework.LightPlatformTestCase; -import com.intellij.testFramework.PlatformTestCase; /** * @author Roman Chernyatchik @@ -28,10 +27,6 @@ public abstract class BaseSMTRunnerTestCase extends LightPlatformTestCase { protected SMTestProxy mySuite; protected SMTestProxy mySimpleTest; - protected BaseSMTRunnerTestCase() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java index 8fd6b8ba1ebd..32be74e6fa7e 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/SSRCodeInsightTest.java @@ -16,10 +16,6 @@ public class SSRCodeInsightTest extends UsefulTestCase { protected CodeInsightTestFixture myFixture; private SSBasedInspection myInspection; - public SSRCodeInsightTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformLangTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformLangTestCase.java index 10efdd7a311f..ce2387deab16 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformLangTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformLangTestCase.java @@ -18,8 +18,4 @@ package com.intellij.testFramework; /** @deprecated platform autodetection should work well enough, just use base class instead (to be removed in IDEA 16) */ @SuppressWarnings("unused") public abstract class PlatformLangTestCase extends PlatformTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected PlatformLangTestCase() { - initPlatformLangPrefix(); - } } diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java index ef04ac562f97..6eba51eab213 100644 --- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsIntegrationEnablerTest.java @@ -39,11 +39,6 @@ public class VcsIntegrationEnablerTest extends VcsRootPlatformTest { private VirtualFile myTestRoot; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public VcsIntegrationEnablerTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void setUp() throws Exception { super.setUp(); MutablePicoContainer picoContainer = (MutablePicoContainer)myProject.getPicoContainer(); diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java index d59f7176253c..301d07960061 100644 --- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootPlatformTest.java @@ -68,11 +68,6 @@ public abstract class VcsRootPlatformTest extends UsefulTestCase { protected static final Collection myFilesToDelete = new HashSet(); protected IdeaProjectTestFixture myProjectFixture; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected VcsRootPlatformTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/VcsLogPlatformTest.java b/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/VcsLogPlatformTest.java index 89c7bbb410a6..41bfaf587c0b 100644 --- a/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/VcsLogPlatformTest.java +++ b/platform/vcs-log/impl/test/com/intellij/vcs/log/impl/VcsLogPlatformTest.java @@ -44,11 +44,6 @@ public abstract class VcsLogPlatformTest extends UsefulTestCase { private IdeaProjectTestFixture myProjectFixture; private String myTestStartedIndicator; - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors", "UnusedDeclaration"}) - protected VcsLogPlatformTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestCase.java b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestCase.java index ec6724891de7..132cf71c59ac 100644 --- a/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestCase.java +++ b/platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestCase.java @@ -34,10 +34,6 @@ public abstract class XDebuggerTestCase extends PlatformTestCase { public static final MyLineBreakpointType MY_LINE_BREAKPOINT_TYPE = new MyLineBreakpointType(); protected static final MySimpleBreakpointType MY_SIMPLE_BREAKPOINT_TYPE = new MySimpleBreakpointType(); - protected XDebuggerTestCase() { - initPlatformLangPrefix(); - } - @Override protected void initApplication() throws Exception { super.initApplication(); diff --git a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java index eec46f87561a..cce4cd7dd7de 100644 --- a/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java +++ b/plugins/git4idea/test-stepdefs/git4idea/GitCucumberWorld.java @@ -25,7 +25,6 @@ import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.TestLoggerFactory; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; @@ -97,7 +96,6 @@ public class GitCucumberWorld { @Before public void setUp() throws Throwable { - PlatformTestCase.initPlatformLangPrefix(); IdeaTestApplication.getInstance(null); myTestName = createTestName(); diff --git a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java index eb7dcad3370e..68616869c189 100644 --- a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java +++ b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.java @@ -23,7 +23,6 @@ import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.TestLoggerFactory; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; @@ -67,11 +66,6 @@ public abstract class GitPlatformTest extends UsefulTestCase { private IdeaProjectTestFixture myProjectFixture; private String myTestStartedIndicator; - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors", "UnusedDeclaration"}) - protected GitPlatformTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java index 6e0e9edd07f2..a79179c023a4 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionTest.java @@ -28,10 +28,6 @@ import java.io.File; */ public class AddGradleDslPluginActionTest extends LightPlatformCodeInsightFixtureTestCase { - public AddGradleDslPluginActionTest() { - IdeaTestCase.initPlatformPrefix(); - } - public void testApplyPlugin() throws Exception { doTest("testApplyPlugin.gradle", "java"); } diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java index c2daa4fca58b..fdf9473a4c73 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionTest.java @@ -30,10 +30,6 @@ import java.io.File; */ public class AddGradleDslDependencyActionTest extends LightPlatformCodeInsightFixtureTestCase { - public AddGradleDslDependencyActionTest() { - IdeaTestCase.initPlatformPrefix(); - } - public void testAddMavenDependencyInEmptyFile() throws Exception { AddGradleDslDependencyAction.TEST_THREAD_LOCAL.set(ContainerUtil.list(new MavenId("testGroupId", "testArtifactId", "1.0"))); doTest("testAddMavenDependencyInEmptyFile.gradle"); diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java index 0b0436ff6ba5..745af6b3fd57 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java @@ -61,11 +61,6 @@ public abstract class HgPlatformTest extends UsefulTestCase { private IdeaProjectTestFixture myProjectFixture; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected HgPlatformTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java index 007bc9ad8bc4..1d8812284bbd 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java @@ -19,7 +19,6 @@ import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsShowConfirmationOption; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.vcs.AbstractVcsTestCase; import com.intellij.ui.GuiUtils; import com.intellij.util.ui.UIUtil; @@ -59,10 +58,6 @@ public abstract class HgTest extends AbstractVcsTestCase { protected HgTestChangeListManager myChangeListManager; private HgTestRepository myMainRepo; - protected HgTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @BeforeMethod protected void setUp(final Method testMethod) throws Exception { // setting hg executable diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java index ee767c7ae4e8..2b963caf6f82 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java @@ -68,10 +68,6 @@ public abstract class MavenTestCase extends UsefulTestCase { protected VirtualFile myProjectPom; protected List myAllPoms = new ArrayList(); - static { - IdeaTestCase.initPlatformPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java index ccbdf4c4f959..b2638611f0dc 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/utils/MavenTemplateFileProcessorTest.java @@ -40,10 +40,6 @@ public class MavenTemplateFileProcessorTest extends LightPlatformCodeInsightFixt " SpringApp\n" + ""; - public MavenTemplateFileProcessorTest() { - IdeaTestCase.initPlatformPrefix(); - } - public void testProcessor() throws Exception { PsiFile file = myFixture.configureByText("pom.xml", TEXT); String s = new MavenTemplateFileProcessor().encodeFileText(TEXT, file.getVirtualFile(), getProject()); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java index 4c1283967e25..19f152c5e397 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java @@ -94,7 +94,6 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { protected File myPluginRoot; protected SvnTestCase(@NotNull String testDataDir) { - PlatformTestCase.initPlatformLangPrefix(); myTestDataDir = testDataDir; myWcRootName = "wcroot"; } diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTestCase.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTestCase.java index 69f6ddc610af..8cd682f609d4 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTestCase.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskManagerTestCase.java @@ -26,11 +26,6 @@ import java.util.List; * @author Dmitry Avdeev */ public abstract class TaskManagerTestCase extends LightCodeInsightFixtureTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected TaskManagerTestCase() { - IdeaTestCase.initPlatformPrefix(); - } - protected TaskManager myTaskManager; @Override diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java index 25e844cc9efa..2a65feb144d2 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskUiTest.java @@ -89,9 +89,4 @@ public class TaskUiTest extends CodeInsightFixtureTestCase { action.update(event); return event.getPresentation(); } - - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public TaskUiTest() { - IdeaTestCase.initPlatformPrefix(); - } } diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java index 49c354e823c1..4072fbb6c0c2 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/jira/jql/CompletionTest.java @@ -17,7 +17,6 @@ package com.intellij.tasks.jira.jql; import com.intellij.tasks.jira.jql.codeinsight.JqlFieldType; import com.intellij.tasks.jira.jql.codeinsight.JqlStandardFunction; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; @@ -32,12 +31,6 @@ import static com.intellij.tasks.jira.jql.codeinsight.JqlStandardFunction.ALL_FU */ public class CompletionTest extends CodeInsightFixtureTestCase { - @Override - public void setUp() throws Exception { - IdeaTestCase.initPlatformPrefix(); - super.setUp(); - } - @Override protected String getBasePath() { return "/plugins/tasks/tasks-tests/testData/jira/jql/completion"; diff --git a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java index 8db30d1cf057..d2a63dc379df 100644 --- a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java +++ b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java @@ -19,12 +19,10 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.javaee.ExternalResourceManagerEx; import com.intellij.javaee.XMLCatalogConfigurable; import com.intellij.javaee.XMLCatalogManager; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.apache.xml.resolver.CatalogManager; import java.io.File; -import java.io.IOException; import java.net.URI; import java.util.List; import java.util.Vector; @@ -97,9 +95,4 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa protected boolean isCommunity() { return true; } - - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public XMLCatalogManagerTest() { - IdeaTestCase.initPlatformPrefix(); - } } diff --git a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java index 76cb6f3d0dd1..73cd68041d48 100644 --- a/xml/tests/src/com/intellij/xml/XmlFoldingTest.java +++ b/xml/tests/src/com/intellij/xml/XmlFoldingTest.java @@ -34,11 +34,6 @@ public class XmlFoldingTest extends LightPlatformCodeInsightFixtureTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public XmlFoldingTest() { - IdeaTestCase.initPlatformPrefix(); - } - private void doTest() throws Throwable { doTest(".html"); } diff --git a/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java b/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java index 21f0496c3f77..4c1cc47e4a4b 100644 --- a/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java +++ b/xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java @@ -34,11 +34,6 @@ import java.util.List; */ public class XmlSmartCompletionTest extends LightPlatformCodeInsightFixtureTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public XmlSmartCompletionTest() { - IdeaTestCase.initPlatformPrefix(); - } - public void testCompletion() throws Exception { doTest(new String[]{"testCompletion.xml", "test.xsd"}, "b"); } diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java index b0a09b9611e5..63705358fe73 100644 --- a/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java +++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java @@ -24,11 +24,6 @@ public class XmlSchemaIndexTest extends LightCodeInsightFixtureTestCase { private static final String NS = "http://java.jb.com/xml/ns/javaee"; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public XmlSchemaIndexTest() { - IdeaTestCase.initPlatformPrefix(); - } - public void testBuilder() throws IOException { VirtualFile file = myFixture.copyFileToProject("spring-beans-2.0.xsd"); diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java index dd9f13ed7f15..593d49154d23 100644 --- a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java +++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java @@ -17,7 +17,6 @@ package com.intellij.xml.index; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import com.intellij.util.containers.MultiMap; import com.intellij.util.containers.hash.HashSet; @@ -39,11 +38,6 @@ import java.util.Set; public class XmlSchemaTypeInheritanceTest extends CodeInsightFixtureTestCase { private final static String ourNs = "http://www.omg.org/spec/BPMN/20100524/MODEL"; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public XmlSchemaTypeInheritanceTest() { - IdeaTestCase.initPlatformPrefix(); - } - @Test public void testBuilder() throws Exception { VirtualFile file = myFixture.copyFileToProject("Semantic.xsd");