diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java index 50acbf69fbfc..dbb57063e752 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/BlockSelectionEditingTest.java @@ -1,18 +1,29 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight; import com.intellij.openapi.editor.FoldRegion; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.editor.impl.AbstractEditorTest; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.TestFileType; import java.io.IOException; public class BlockSelectionEditingTest extends AbstractEditorTest { - public BlockSelectionEditingTest() { - PlatformTestCase.initPlatformLangPrefix(); - } public void testBlockRemovalAndCollapsedFoldRegionsBefore() throws IOException { // Inspired by IDEA-69371 diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java index 06cd46a8d189..1bd3f4914953 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/CommentInCustomFileTypesTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight; import com.intellij.codeInsight.generation.actions.CommentByBlockCommentAction; @@ -6,14 +21,10 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NotNull; public class CommentInCustomFileTypesTest extends LightPlatformCodeInsightTestCase { - public CommentInCustomFileTypesTest() { - PlatformTestCase.initPlatformLangPrefix(); - } @NotNull @Override diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java index 724e1e1d502d..68a724feca4a 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ChangedLinesCounterTest.java @@ -17,7 +17,6 @@ package com.intellij.codeInsight.actions; import com.intellij.openapi.editor.Document; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.junit.Assert; @@ -26,10 +25,6 @@ import java.io.File; public class ChangedLinesCounterTest extends LightPlatformCodeInsightFixtureTestCase { - static { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected String getTestDataPath() { return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java index e586093aad93..b7a63747e844 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.codeInsight.actions; import com.intellij.lang.LanguageFormatting; @@ -8,7 +23,6 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.testFramework.LightPlatformTestCase; -import com.intellij.testFramework.PlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.picocontainer.MutablePicoContainer; @@ -29,7 +43,6 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase { @Override public void setUp() throws Exception { - PlatformTestCase.initPlatformLangPrefix(); super.setUp(); myWorkingDirectory = TestFileStructure.createDirectory(getProject(), getSourceRoot(), TEMP_DIR_NAME); diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java index 8868a36cacc1..c7fc9f49364f 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatOnlyVcsChangedTextTest.java @@ -28,7 +28,6 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.testFramework.LightPlatformTestCase; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.vcs.MockChangeListManager; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcsUtil.VcsUtil; @@ -73,7 +72,6 @@ public class ReformatOnlyVcsChangedTextTest extends LightPlatformTestCase { @Override public void setUp() throws Exception { - PlatformTestCase.initPlatformLangPrefix(); super.setUp(); myWorkingDirectory = TestFileStructure.createDirectory(getProject(), getSourceRoot(), TEMP_DIR_NAME); diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/folding/impl/CompositeFoldingBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/folding/impl/CompositeFoldingBuilderTest.java index a907336d68c7..53fe36b41ff1 100644 --- a/platform/platform-tests/testSrc/com/intellij/codeInsight/folding/impl/CompositeFoldingBuilderTest.java +++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/folding/impl/CompositeFoldingBuilderTest.java @@ -1,4 +1,3 @@ - /* * Copyright 2000-2015 JetBrains s.r.o. * @@ -29,12 +28,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.List; -import static com.intellij.testFramework.PlatformTestCase.initPlatformLangPrefix; - public class CompositeFoldingBuilderTest extends AbstractEditorTest { - static { - initPlatformLangPrefix(); - } @Override protected void setUp() throws Exception { diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java b/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java index 7a5fb10a1d89..c13fc9ed5eb1 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/IntegrationTestCase.java @@ -50,11 +50,6 @@ public abstract class IntegrationTestCase extends PlatformTestCase { protected VirtualFile myRoot; protected IdeaGateway myGateway; - @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"}) - public IntegrationTestCase() { - PlatformTestCase.initPlatformLangPrefix(); - } - // let it be as if someone (e.g. dumb mode indexing) has loaded the content so it's available to local history protected static void loadContent(VirtualFile f) throws IOException { f.contentsToByteArray(); diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java index 7ababa9623af..b8f76dce3f1c 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,11 +38,6 @@ public class LightFileTemplatesTest extends LightPlatformTestCase { public static final String TEST_TEMPLATE_TXT = "testTemplate.txt"; public static final String HI_THERE = "hi there"; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public LightFileTemplatesTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testSchemas() throws Exception { assertEquals(FileTemplatesScheme.DEFAULT, myTemplateManager.getCurrentScheme()); diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/SimpleTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/SimpleTemplatesTest.java index 7802540b6996..a67480a1fd25 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/SimpleTemplatesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/SimpleTemplatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.intellij.ide.fileTemplates.impl; import com.intellij.testFramework.LightPlatformTestCase; -import com.intellij.testFramework.PlatformTestCase; import java.util.Properties; @@ -25,11 +24,6 @@ import java.util.Properties; */ public class SimpleTemplatesTest extends LightPlatformTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public SimpleTemplatesTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testConditional() throws Exception { CustomFileTemplate template = new CustomFileTemplate("foo", "bar"); template.setText("#set($flag = \"$!IJ_BASE_PACKAGE\" != \"\")\n" + diff --git a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java index 40f8fbfb5623..fc4c9dce9923 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/highlighter/custom/CustomFileTypeWordSelectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ package com.intellij.ide.highlighter.custom; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; @@ -23,9 +22,6 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa * @author yole */ public class CustomFileTypeWordSelectionTest extends LightPlatformCodeInsightFixtureTestCase { - public CustomFileTypeWordSelectionTest() { - PlatformTestCase.initPlatformLangPrefix(); - } public void testCustomFileTypeBraces() { doTest(); diff --git a/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy index 78bc07b2b5d5..dba7dc1c2da8 100644 --- a/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy +++ b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,22 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.notification; - - +package com.intellij.notification import com.intellij.openapi.util.TextRange import com.intellij.testFramework.LightPlatformTestCase -import com.intellij.testFramework.PlatformTestCase /** * @author peter */ class EventLogTest extends LightPlatformTestCase { - EventLogTest() { - PlatformTestCase.initPlatformLangPrefix() - } - public void testHtmlEntities() { def entry = format("Title", "Hello world«»<>") assert entry.message == 'Title: Hello world<<>><>' diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java index b97096bd5467..b3a22d63d240 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java @@ -19,7 +19,6 @@ import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.FontPreferences; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; -import com.intellij.testFramework.PlatformTestCase; import org.jdom.Element; import org.jdom.output.Format; import org.jdom.output.XMLOutputter; @@ -35,10 +34,6 @@ import static java.util.Collections.singletonList; public class EditorColorsSchemeImplTest extends LightPlatformCodeInsightTestCase { EditorColorsSchemeImpl myScheme = new EditorColorsSchemeImpl(null); - static { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testDefaults() { checkState(myScheme.getFontPreferences(), Collections.emptyList(), diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java index b9b4a3d70687..b8d8e872fe5f 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import com.intellij.openapi.project.DumbServiceImpl; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.FileEditorManagerTestCase; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -47,11 +46,6 @@ import java.util.List; @SuppressWarnings("ConstantConditions") public class FileEditorManagerTest extends FileEditorManagerTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public FileEditorManagerTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testTabOrder() throws Exception { openFiles(STRING); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java index b128eb5d3ec2..d98805939615 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/HeavyFileEditorManagerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl; import com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import com.intellij.ui.docking.DockManager; @@ -35,11 +34,6 @@ import java.io.File; */ public abstract class HeavyFileEditorManagerTestCase extends CodeInsightFixtureTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - protected HeavyFileEditorManagerTestCase() { - PlatformTestCase.autodetectPlatformPrefix(); - } - protected FileEditorManagerImpl myManager; protected VirtualFile getFile(String path) { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java index bf284c8f756d..142a8ff46543 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NewDocumentHistoryTest.java @@ -4,7 +4,6 @@ import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiManager; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; /** @@ -13,10 +12,6 @@ import com.intellij.testFramework.PlatformTestUtil; */ public class NewDocumentHistoryTest extends HeavyFileEditorManagerTestCase { - public NewDocumentHistoryTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testBackNavigationBetweenEditors() throws Exception { PlatformTestUtil.registerExtension(FileEditorProvider.EP_FILE_EDITOR_PROVIDER, new FileEditorManagerTest.MyFileEditorProvider(), getTestRootDisposable()); VirtualFile file = getFile("/src/1.txt"); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java index 267d0f769fdf..1ad1edf7ffb7 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/NonProjectFileAccessTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.WritingAccessProvider; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.ui.EditorNotifications; @@ -49,9 +48,9 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public class NonProjectFileAccessTest extends HeavyFileEditorManagerTestCase { + @Override public void setUp() throws Exception { - PlatformTestCase.initPlatformLangPrefix(); super.setUp(); EditorNotifications notifications = new EditorNotificationsImpl(getProject()); ((ComponentManagerImpl)getProject()).registerComponentInstance(EditorNotifications.class, notifications); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java index 47c0a086d997..5262cc496614 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/KeymapTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,6 @@ public class KeymapTest extends PlatformTestCase { @Override public void setUp() throws Exception { - initPlatformLangPrefix(); super.setUp(); myParent = new KeymapImpl(); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ui/ActionsTreeTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ui/ActionsTreeTest.java index 6e9b494183c1..1180a2c3d39a 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ui/ActionsTreeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ui/ActionsTreeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import com.intellij.openapi.keymap.impl.KeymapManagerImpl; import com.intellij.openapi.keymap.impl.ShortcutRestrictions; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -68,10 +67,6 @@ public class ActionsTreeTest extends LightPlatformCodeInsightTestCase { private ActionShortcutRestrictions mySavedRestrictions; - static { - PlatformTestCase.initPlatformLangPrefix(); - } - public void setUp() throws Exception { super.setUp(); // create dummy actions diff --git a/platform/platform-tests/testSrc/com/intellij/platform/ProjectSetTest.java b/platform/platform-tests/testSrc/com/intellij/platform/ProjectSetTest.java index 09d4e10c14f8..faf397c3f0a1 100644 --- a/platform/platform-tests/testSrc/com/intellij/platform/ProjectSetTest.java +++ b/platform/platform-tests/testSrc/com/intellij/platform/ProjectSetTest.java @@ -29,7 +29,6 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.projectImport.ProjectSetProcessor; import com.intellij.testFramework.LightPlatformTestCase; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -46,11 +45,6 @@ import java.util.*; */ public class ProjectSetTest extends LightPlatformTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public ProjectSetTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - private static String getTestDataPath() { return PlatformTestUtil.getCommunityPath() + "/platform/platform-tests/testData/projectSet/"; } diff --git a/platform/platform-tests/testSrc/com/intellij/psi/autodetect/IndentAutoDetectionTest.java b/platform/platform-tests/testSrc/com/intellij/psi/autodetect/IndentAutoDetectionTest.java index 28710f6d8f35..1d97170c2cea 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/autodetect/IndentAutoDetectionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/autodetect/IndentAutoDetectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import com.intellij.openapi.fileTypes.PlainTextLanguage; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.autodetect.LineIndentInfo; import com.intellij.psi.codeStyle.autodetect.LineIndentInfoBuilder; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NotNull; import org.junit.Assert; @@ -29,10 +28,6 @@ import java.util.List; public class IndentAutoDetectionTest extends AbstractIndentAutoDetectionTest { - static { - PlatformTestCase.initPlatformLangPrefix(); - } - @NotNull @Override protected String getTestDataPath() { diff --git a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java index e62512ba0669..b7a244e2d8df 100644 --- a/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java +++ b/platform/platform-tests/testSrc/com/intellij/structureView/SmartTreeStructureTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package com.intellij.structureView; import com.intellij.ide.util.treeView.smartTree.*; import com.intellij.openapi.ui.Queryable; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NonNls; @@ -30,11 +29,6 @@ public class SmartTreeStructureTest extends LightPlatformCodeInsightFixtureTestC private final Queryable.PrintInfo myPrintInfo = new Queryable.PrintInfo(); private TestTreeModel myModel; - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public SmartTreeStructureTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - @Override protected void setUp() throws Exception { super.setUp(); diff --git a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewManagerTest.java b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewManagerTest.java index a4fd1b4c881b..51e9f5784457 100644 --- a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewManagerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageViewManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,10 +26,6 @@ import com.intellij.usages.UsageViewManager; public class UsageViewManagerTest extends PlatformTestCase { - static { - initPlatformLangPrefix(); - } - public void testScopeCreatedForFindInDirectory() { VirtualFile dir = getProject().getBaseDir(); FindModel findModel = new FindModel(); diff --git a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java index 424346127e4a..55e104e6d3c0 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ import com.intellij.openapi.fileTypes.ex.FakeFileType; import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.FileTypeIndex; -import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; @@ -31,10 +30,6 @@ import org.jetbrains.annotations.NotNull; */ public class FileTypeIndexTest extends LightPlatformCodeInsightFixtureTestCase { - public FileTypeIndexTest() { - PlatformTestCase.initPlatformLangPrefix(); - } - public void testAddFileType() throws Exception { addAndRemoveFileType(); }