From 1f8283df9be92c3872f0a7d0ad426793c4afe970 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 16 Feb 2011 14:34:32 +0300 Subject: [PATCH] cleanup --- .../com/intellij/lang/PsiBuilderQuickTest.java | 5 +++-- .../org/jetbrains/idea/maven/MavenTestCase.java | 15 ++++++++------- .../maven/compiler/ResourceFilteringTest.java | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/testSrc/com/intellij/lang/PsiBuilderQuickTest.java b/platform/lang-impl/testSrc/com/intellij/lang/PsiBuilderQuickTest.java index ab25345b030f..c60a76a73da0 100644 --- a/platform/lang-impl/testSrc/com/intellij/lang/PsiBuilderQuickTest.java +++ b/platform/lang-impl/testSrc/com/intellij/lang/PsiBuilderQuickTest.java @@ -17,6 +17,7 @@ package com.intellij.lang; import com.intellij.lang.impl.PsiBuilderImpl; import com.intellij.lexer.LexerBase; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.psi.TokenType; @@ -64,7 +65,7 @@ public class PsiBuilderQuickTest { @BeforeClass public static void setUp() { - if (ApplicationManagerEx.getApplication() == null) { + if (ApplicationManager.getApplication() == null) { if (myMockApp == null) { myMockApp = createMock(ApplicationEx.class); expect(myMockApp.isInternal()).andReturn(true); @@ -466,7 +467,7 @@ public class PsiBuilderQuickTest { " PsiElement(OTHER)('}')\n"); } - private static abstract class MyLazyElementType extends ILazyParseableElementType implements ILightLazyParseableElementType { + private abstract static class MyLazyElementType extends ILazyParseableElementType implements ILightLazyParseableElementType { protected MyLazyElementType(@NonNls String debugName) { super(debugName, Language.ANY); } 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 77aca6041cc9..1b4200f1991c 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 @@ -384,7 +384,7 @@ public abstract class MavenTestCase extends UsefulTestCase { return createProfilesFile(createProjectSubDir(relativePath), xml, false); } - private VirtualFile createProfilesFile(VirtualFile dir, String xml, boolean oldStyle) throws IOException { + private static VirtualFile createProfilesFile(VirtualFile dir, String xml, boolean oldStyle) throws IOException { return createProfilesFile(dir, createValidProfiles(xml, oldStyle)); } @@ -396,7 +396,7 @@ public abstract class MavenTestCase extends UsefulTestCase { return createProfilesFile(createProjectSubDir(relativePath), content); } - private VirtualFile createProfilesFile(final VirtualFile dir, String content) throws IOException { + private static VirtualFile createProfilesFile(final VirtualFile dir, String content) throws IOException { VirtualFile f = dir.findChild("profiles.xml"); if (f == null) { f = new WriteAction() { @@ -411,6 +411,7 @@ public abstract class MavenTestCase extends UsefulTestCase { return f; } + @Language("XML") private static String createValidProfiles(String xml, boolean oldStyle) { if (oldStyle) { return "" + @@ -478,15 +479,15 @@ public abstract class MavenTestCase extends UsefulTestCase { assertEquals(expected, actual); } - protected void assertOrderedElementsAreEqual(Collection actual, Collection expected) { + protected static void assertOrderedElementsAreEqual(Collection actual, Collection expected) { assertOrderedElementsAreEqual(actual, expected.toArray()); } - protected void assertUnorderedElementsAreEqual(Collection actual, Collection expected) { + protected static void assertUnorderedElementsAreEqual(Collection actual, Collection expected) { assertUnorderedElementsAreEqual(actual, expected.toArray()); } - protected void assertUnorderedElementsAreEqual(U[] actual, T... expected) { + protected static void assertUnorderedElementsAreEqual(U[] actual, T... expected) { assertUnorderedElementsAreEqual(Arrays.asList(actual), expected); } @@ -514,7 +515,7 @@ public abstract class MavenTestCase extends UsefulTestCase { for (int i = 0; i < expected.length; i++) { T expectedElement = expected[i]; U actualElement = actualList.get(i); - assertTrue(s, expectedElement.equals(actualElement)); + assertEquals(s, expectedElement, actualElement); } } @@ -526,7 +527,7 @@ public abstract class MavenTestCase extends UsefulTestCase { protected static void assertDoNotContain(List actual, T... expected) { List actualCopy = new ArrayList(actual); actualCopy.removeAll(Arrays.asList(expected)); - assertTrue(actual.toString(), actualCopy.size() == actual.size()); + assertEquals(actual.toString(), actualCopy.size(), actual.size()); } protected boolean ignore() { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java index 8655c42934bb..8c35ad17b4b0 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java @@ -19,7 +19,7 @@ import com.intellij.compiler.CompilerConfiguration; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.fileTypes.FileTypeManager; -import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.maven.MavenImportingTestCase; @@ -858,7 +858,7 @@ public class ResourceFilteringTest extends MavenImportingTestCase { public void testDoNotFilterButCopyBigFiles() throws Exception { assertFalse(CompilerConfiguration.getInstance(myProject).isResourceFile("file.xyz")); - assertEquals(FileTypeManager.getInstance().getFileTypeByFileName("file.xyz"), StdFileTypes.UNKNOWN); + assertEquals(FileTypeManager.getInstance().getFileTypeByFileName("file.xyz"), FileTypes.UNKNOWN); createProjectSubFile("resources/file.xyz").setBinaryContent(new byte[1024 * 1024 * 20]);