From 3ff726cc3149819e93888913d281b0484e3bd0e9 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 28 Jun 2012 20:36:54 +0200 Subject: [PATCH] in-code test environment --- .../afterNewThrowable/source/OurException.java | 3 --- .../source/OurNotException.java | 6 ------ .../importAfterNew/source/pack/AAClass.java | 4 ---- .../source/pack/WithInnerAClass.java | 5 ----- .../nameCompletion/java/source/empty.txt | 0 .../completion/ClassNameCompletionTest.java | 16 ++++++++++++++++ 6 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurException.java delete mode 100644 java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurNotException.java delete mode 100644 java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/AAClass.java delete mode 100644 java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/WithInnerAClass.java delete mode 100644 java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/source/empty.txt diff --git a/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurException.java b/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurException.java deleted file mode 100644 index 902a65a66931..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurException.java +++ /dev/null @@ -1,3 +0,0 @@ -public class OurException extends Throwable{ - -} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurNotException.java b/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurNotException.java deleted file mode 100644 index cd77e0781fba..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/afterNewThrowable/source/OurNotException.java +++ /dev/null @@ -1,6 +0,0 @@ -public class OurNotException { - public static class InnerException extends Throwable{ - } - public static class InnerNonException{ - } -} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/AAClass.java b/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/AAClass.java deleted file mode 100644 index 052f73bfea69..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/AAClass.java +++ /dev/null @@ -1,4 +0,0 @@ -package pack; - -public class AAClass { -} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/WithInnerAClass.java b/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/WithInnerAClass.java deleted file mode 100644 index 1fc72b94e82f..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/importAfterNew/source/pack/WithInnerAClass.java +++ /dev/null @@ -1,5 +0,0 @@ -package pack; - -public class WithInnerAClass{ - public static class Inner{} -} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/source/empty.txt b/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/source/empty.txt deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java index 3e49f1cee309..c4f10522af87 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java @@ -26,6 +26,7 @@ import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.TestDataPath; import java.io.File; +import java.io.IOException; @TestDataPath("$CONTENT_ROOT/testData") public class ClassNameCompletionTest extends CompletionTestCase { @@ -54,6 +55,11 @@ public class ClassNameCompletionTest extends CompletionTestCase { } public void testImportAfterNew() throws Exception { + createClass("package pack; public class AAClass {}"); + createClass("package pack; public class WithInnerAClass{\n" + + " public static class Inner{}\n" + + "}"); + String path = BASE_PATH + "/importAfterNew"; configureByFile(path + "/before1.java"); @@ -65,13 +71,23 @@ public class ClassNameCompletionTest extends CompletionTestCase { } public void testAfterNewThrowable1() throws Exception { + addClassesForAfterNewThrowable(); String path = BASE_PATH + "/afterNewThrowable"; configureByFile(path + "/before1.java"); checkResultByFile(path + "/after1.java"); } + private void addClassesForAfterNewThrowable() throws IOException { + createClass("public class OurException extends Throwable{}"); + createClass("public class OurNotException {\n" + + " public static class InnerException extends Throwable{}\n" + + " public static class InnerNonException{}\n" + + "}"); + } + public void testAfterNewThrowable2() throws Exception { + addClassesForAfterNewThrowable(); String path = BASE_PATH + "/afterNewThrowable"; configureByFile(path + "/before2.java");