From af2f70ae67be8279d15cc55ce8b20d4d487142f3 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 28 Jun 2012 20:29:27 +0200 Subject: [PATCH] move heavy test to heavy test case --- .../QualifyNameOnSecondCompletion-result.java | 4 ---- .../QualifyNameOnSecondCompletion-source.java | 4 ---- .../completion/ClassNameCompletionTest.java | 19 ------------------- .../completion/HeavyNormalCompletionTest.java | 11 +++++++++++ 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-result.java delete mode 100644 java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-source.java diff --git a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-result.java b/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-result.java deleted file mode 100644 index e8eb3c9d4cbb..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-result.java +++ /dev/null @@ -1,4 +0,0 @@ -class Main { - - foo.bar.AxBxCxDxEx -} diff --git a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-source.java b/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-source.java deleted file mode 100644 index 090fcff202a4..000000000000 --- a/java/java-tests/testData/codeInsight/completion/className/nameCompletion/java/QualifyNameOnSecondCompletion-source.java +++ /dev/null @@ -1,4 +0,0 @@ -class Main { - - ABCDE -} 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 3b52a10ed130..3e49f1cee309 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java @@ -20,10 +20,6 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.LookupManagerImpl; -import com.intellij.openapi.command.WriteCommandAction; -import com.intellij.openapi.module.JavaModuleType; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; import com.intellij.testFramework.PsiTestUtil; @@ -223,21 +219,6 @@ public class ClassNameCompletionTest extends CompletionTestCase { public void testInCommentWithPackagePrefix() throws Exception { doJavaTest(); } - public void testQualifyNameOnSecondCompletion() throws Exception { - new WriteCommandAction.Simple(getProject()) { - @Override - protected void run() throws Exception { - final JavaModuleType type = new JavaModuleType(); - final Module module = ModuleManager.getInstance(getProject()).newModule("second.iml", type.getId()); - createClass(module, "package foo.bar; class AxBxCxDxEx {}"); - } - }.execute().throwException(); - - configureByFileNoCompletion(BASE_PATH + "/nameCompletion/java/" + getTestName(false) + "-source.java"); - new CodeCompletionHandlerBase(CompletionType.CLASS_NAME).invokeCompletion(myProject, myEditor, 2, false); - checkResultByFile(BASE_PATH + "/nameCompletion/java/" + getTestName(false) + "-result.java"); - } - private void doJavaTest() throws Exception { final String path = BASE_PATH + "/nameCompletion/java"; configureByFileNoCompletion(path + "/" + getTestName(false) + "-source.java"); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java index 874db23b2e38..7b6bd4112941 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java @@ -9,6 +9,7 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupManager; import com.intellij.codeInsight.lookup.impl.LookupImpl; import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; @@ -16,6 +17,7 @@ import com.intellij.openapi.roots.SourceFolder; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaPsiFacade; +import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; /** @@ -99,4 +101,13 @@ public class HeavyNormalCompletionTest extends JavaCodeInsightFixtureTestCase { assertNull(myFixture.completeBasic()); } + public void testQualifyInaccessibleClassName() throws Exception { + PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "second", myFixture.getTempDirFixture().findOrCreateDir("second")); + myFixture.addFileToProject("second/foo/bar/AxBxCxDxEx.java", "package foo.bar; class AxBxCxDxEx {}"); + + myFixture.configureByText("a.java", "class Main { ABCDE }"); + myFixture.complete(CompletionType.BASIC, 3); + myFixture.checkResult("class Main { foo.bar.AxBxCxDxEx }"); + } + }