diff --git a/java/java-tests/testSrc/com/intellij/openapi/vfs/JrtFileSystemTest.java b/java/java-tests/testSrc/com/intellij/openapi/vfs/JrtFileSystemTest.java index 3cd9dbcddfab..cb15694b6c63 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/vfs/JrtFileSystemTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/vfs/JrtFileSystemTest.java @@ -18,7 +18,6 @@ package com.intellij.openapi.vfs; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.impl.jrt.JrtFileSystem; -import com.intellij.testFramework.IdeaTestCase; import com.intellij.testFramework.LightPlatformTestCase; import org.junit.BeforeClass; import org.junit.Test; @@ -38,7 +37,6 @@ public class JrtFileSystemTest { assumeTrue("skipped: java=" + SystemInfo.JAVA_VERSION, JrtFileSystem.isSupported()); assumeTrue("skipped: JDK_19=" + ourJdkHome, ourJdkHome != null && JrtFileSystem.isModularJdk(ourJdkHome)); - IdeaTestCase.initPlatformPrefix(); LightPlatformTestCase.initApplication(); } diff --git a/platform/platform-tests/testSrc/com/intellij/lang/PsiBuilderQuickTest.java b/platform/platform-tests/testSrc/com/intellij/lang/PsiBuilderQuickTest.java index 718bf64ca2c5..bd9d86ad0d84 100644 --- a/platform/platform-tests/testSrc/com/intellij/lang/PsiBuilderQuickTest.java +++ b/platform/platform-tests/testSrc/com/intellij/lang/PsiBuilderQuickTest.java @@ -24,7 +24,7 @@ import com.intellij.psi.TokenType; import com.intellij.psi.impl.DebugUtil; import com.intellij.psi.impl.source.tree.ASTStructure; import com.intellij.psi.tree.*; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.ThreeState; import com.intellij.util.diff.DiffTree; @@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class PsiBuilderQuickTest extends LightPlatformLangTestCase { +public class PsiBuilderQuickTest extends LightPlatformTestCase { private static final IFileElementType ROOT = new IFileElementType("ROOT", Language.ANY); private static final IElementType LETTER = new IElementType("LETTER", Language.ANY); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ApplicationStoreTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ApplicationStoreTest.java index f5e846fd2c8e..b1ad87ad6668 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ApplicationStoreTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ApplicationStoreTest.java @@ -23,7 +23,7 @@ import com.intellij.openapi.components.impl.stores.*; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.CharsetToolkit; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.util.messages.MessageBus; import com.intellij.util.xmlb.XmlSerializerUtil; import gnu.trove.THashMap; @@ -40,7 +40,7 @@ import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -public class ApplicationStoreTest extends LightPlatformLangTestCase { +public class ApplicationStoreTest extends LightPlatformTestCase { private File testAppConfig; private MyComponentStore componentStore; @@ -86,11 +86,13 @@ public class ApplicationStoreTest extends LightPlatformLangTestCase { component.foo = "newValue"; StoreUtil.save(componentStore, null); - assertThat(streamProvider.data.get(RoamingType.PER_USER).get(StoragePathMacros.APP_CONFIG + "/proxy.settings.xml"), equalTo("\n" + - " \n" + - " \n" + - "")); + assertThat( + streamProvider.data.get(RoamingType.PER_USER).get(StoragePathMacros.APP_CONFIG + "/proxy.settings.xml"), + equalTo("\n" + + " \n" + + " \n" + + "")); } public void testLoadFromStreamProvider() throws Exception { diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/StateStorageManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/StateStorageManagerImplTest.java index 62dda2957d12..9e0beb723bb7 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/StateStorageManagerImplTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/StateStorageManagerImplTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.components.*; import com.intellij.openapi.components.impl.stores.StateStorageManagerImpl; import com.intellij.openapi.components.impl.stores.StorageData; import com.intellij.openapi.util.Disposer; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat; /** * @author mike */ -public class StateStorageManagerImplTest extends LightPlatformLangTestCase { +public class StateStorageManagerImplTest extends LightPlatformTestCase { private StateStorageManagerImpl myStateStorageManager; @Override diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/XmlElementStorageTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/XmlElementStorageTest.java index 0fafc897cdad..001361010703 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/XmlElementStorageTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/XmlElementStorageTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.components.TrackingPathMacroSubstitutor; import com.intellij.openapi.components.impl.stores.StorageData; import com.intellij.openapi.components.impl.stores.XmlElementStorage; import com.intellij.openapi.util.Disposer; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,7 +37,7 @@ import static com.intellij.openapi.util.JDOMBuilder.tag; /** * @author mike */ -public class XmlElementStorageTest extends LightPlatformLangTestCase { +public class XmlElementStorageTest extends LightPlatformTestCase { private Disposable myParentDisposable; @Override diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandlerTest.java index 54a2865ad444..1bae25a39db8 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandlerTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ModifierKeyDoubleClickHandlerTest.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,13 +22,13 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.KeyboardShortcut; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.util.Clock; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import javax.swing.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -public class ModifierKeyDoubleClickHandlerTest extends LightPlatformLangTestCase { +public class ModifierKeyDoubleClickHandlerTest extends LightPlatformTestCase { private static final String MY_SHIFT_SHIFT_ACTION = "ModifierKeyDoubleClickHandlerTest.action1"; private static final String MY_SHIFT_KEY_ACTION = "ModifierKeyDoubleClickHandlerTest.action2"; private static final String MY_SHIFT_SHIFT_KEY_ACTION = "ModifierKeyDoubleClickHandlerTest.action3"; diff --git a/platform/platform-tests/testSrc/com/intellij/search/SearchableOptionsTest.java b/platform/platform-tests/testSrc/com/intellij/search/SearchableOptionsTest.java index 61c97d6de07a..b2847f8a278f 100644 --- a/platform/platform-tests/testSrc/com/intellij/search/SearchableOptionsTest.java +++ b/platform/platform-tests/testSrc/com/intellij/search/SearchableOptionsTest.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. @@ -21,19 +21,19 @@ import com.intellij.ide.ui.search.SearchableOptionsRegistrar; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurableGroup; import com.intellij.openapi.options.ex.ProjectConfigurablesGroup; -import com.intellij.testFramework.LightPlatformLangTestCase; +import com.intellij.testFramework.LightPlatformTestCase; import javax.swing.event.DocumentEvent; import java.util.Set; /** - * User: anna + * @author anna */ -public class SearchableOptionsTest extends LightPlatformLangTestCase { - public void testFindCodeTemplates() throws Exception { - final ConfigurableHit configurables = - SearchableOptionsRegistrar.getInstance().getConfigurables(new ConfigurableGroup[]{new ProjectConfigurablesGroup(getProject())}, DocumentEvent.EventType.INSERT, null, "method", getProject()); - final Set configurableSet = configurables.getAll(); +public class SearchableOptionsTest extends LightPlatformTestCase { + public void testFindCodeTemplates() { + ConfigurableGroup[] groups = {new ProjectConfigurablesGroup(getProject())}; + ConfigurableHit configurables = SearchableOptionsRegistrar.getInstance().getConfigurables(groups, DocumentEvent.EventType.INSERT, null, "method", getProject()); + Set configurableSet = configurables.getAll(); for (Configurable configurable : configurableSet) { if (configurable.getDisplayName().equals(new AllFileTemplatesConfigurable(getProject()).getDisplayName())) { return; diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformLangTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformLangTestCase.java index e74eb9482ee3..9c85ad6108c1 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformLangTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformLangTestCase.java @@ -15,8 +15,9 @@ */ package com.intellij.testFramework; +/** @deprecated platform autodetection should work well enough, just use base class instead (to be removed in IDEA 16) */ +@SuppressWarnings("ALL") public abstract class LightPlatformLangTestCase extends LightPlatformTestCase { - @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") protected LightPlatformLangTestCase() { PlatformTestCase.autodetectPlatformPrefix(); }