diff options
Diffstat (limited to 'java/java-tests/testSrc/com/intellij/codeInsight/completion')
4 files changed, 40 insertions, 6 deletions
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy index 8a54c9594144..7391f93a1ab2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy @@ -42,6 +42,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.EditorFactory import com.intellij.openapi.editor.LogicalPosition import com.intellij.openapi.editor.actionSystem.EditorActionManager +import com.intellij.openapi.editor.ex.EditorEx import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.LoadingOrder import com.intellij.openapi.fileEditor.FileEditor @@ -1642,4 +1643,14 @@ class Foo { assert lookup assert myFixture.lookupElementStrings == ['goo'] } + + public void "test in column selection mode"() { + myFixture.configureByText "a.java", """ +class Foo {{ + <caret> +}}""" + edt { ((EditorEx)myFixture.editor).setColumnMode(true) } + type 'toStr' + assert lookup + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index 79a94aaa8148..77b4c0cc64a7 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -768,6 +768,8 @@ public class ListUtils { assertStringItems("fofoo", "fofoo"); } + public void testMethodMergingMinimalTail() { doTest() } + public void testAnnotationQualifiedName() throws Throwable { doTest(); } @@ -920,6 +922,9 @@ public class ListUtils { } public void testSmartEnterWrapsConstructorCall() throws Throwable { doTest(Lookup.COMPLETE_STATEMENT_SELECT_CHAR as String) } + public void testSmartEnterNoNewLine() { doTest(Lookup.COMPLETE_STATEMENT_SELECT_CHAR as String) } + public void testSmartEnterWithNewLine() { doTest(Lookup.COMPLETE_STATEMENT_SELECT_CHAR as String) } + public void testTabReplacesMethodNameWithLocalVariableName() throws Throwable { doTest('\t'); } public void testMethodParameterAnnotationClass() throws Throwable { doTest(); } public void testPrimitiveCastOverwrite() throws Throwable { doTest '\t' } @@ -1469,6 +1474,11 @@ class Bar { doTest() } + public void testUnimportedStaticInnerClass() { + myFixture.addClass("package foo; public class Super { public static class Inner {} }"); + doTest() + } + public void testNoJavaLangPackagesInImport() { doAntiTest() } public void testNoStaticDuplicatesFromExpectedMemberFactories() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy index b19da5ac6f67..1d258fe01367 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionOrderingTest.groovy @@ -52,12 +52,12 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase { public void testNewListAlwaysFirst() { def lookup = invokeCompletion(getTestName(false) + ".java") - assertPreferredItems 1, 'List', 'AbstractList', 'AbstractSequentialList', 'ArrayList' + assertPreferredItems 1, 'List', 'ArrayList', 'AbstractList', 'AbstractSequentialList' for (int i = 0; i < StatisticsManager.OBLIVION_THRESHOLD + 10; i++) { - imitateItemSelection(lookup, 3) //ArrayList + imitateItemSelection(lookup, 3) //AbstractSequentialList } refreshSorting(lookup) - assertPreferredItems 1, 'List', 'ArrayList', 'AbstractList', 'AbstractSequentialList' + assertPreferredItems 1, 'List', 'AbstractSequentialList', 'ArrayList', 'AbstractList' } public void testNoStatsOnUnsuccessfulAttempt() { @@ -170,11 +170,11 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase { public void testStatisticsAffectsNonPreferableExpectedItems() throws Throwable { final LookupImpl lookup = invokeCompletion(getTestName(false) + ".java"); - assertPreferredItems(1, "List", "AbstractList", "AbstractSequentialList", "ArrayList"); + assertPreferredItems(1, "List", "ArrayList", "AbstractList", "AbstractSequentialList"); incUseCount(lookup, 0); - assertPreferredItems(1, "List", "AbstractList", "AbstractSequentialList", "ArrayList"); + assertPreferredItems(1, "List", "ArrayList", "AbstractList", "AbstractSequentialList"); incUseCount(lookup, 0); - assertPreferredItems(0, "List", "AbstractList", "AbstractSequentialList", "ArrayList"); + assertPreferredItems(0, "List", "ArrayList", "AbstractList", "AbstractSequentialList"); } public void testPreferNonRecursiveMethodParams() throws Throwable { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index ed2b792fc5a9..d2e8825cc16d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -1029,6 +1029,19 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { assertStringItems("Bar", "Goo"); } + public void testAutoImportExpectedType() throws Throwable { + boolean old = CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY; + CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY = true; + try { + configureByTestName(); + performAction(); + myFixture.assertPreferredCompletionItems(1, "List", "ArrayList", "AbstractList"); + } + finally { + CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY = old; + } + } + public void testNoWrongSubstitutorFromStats() throws Throwable { doTest(); FileDocumentManager.getInstance().saveDocument(myFixture.getEditor().getDocument()); |