From 5eb09ef3fa95568a399ed99edb9a51aecf4a4697 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 1 Feb 2012 20:55:11 +0100 Subject: [PATCH] completion tests should reflect real-life item order --- .../PreselectMostRelevantInTheMiddle.java | 17 ----------------- .../completion/JavadocCompletionTest.java | 2 +- .../NormalCompletionOrderingTest.groovy | 10 ---------- .../completion/SmartTypeCompletionTest.java | 2 +- .../codeInsight/lookup/impl/LookupImpl.java | 2 +- .../GrCompletionWithLibraryTest.groovy | 10 +++++----- 6 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 java/java-tests/testData/codeInsight/completion/normalSorting/PreselectMostRelevantInTheMiddle.java diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/PreselectMostRelevantInTheMiddle.java b/java/java-tests/testData/codeInsight/completion/normalSorting/PreselectMostRelevantInTheMiddle.java deleted file mode 100644 index e7bd758c7104..000000000000 --- a/java/java-tests/testData/codeInsight/completion/normalSorting/PreselectMostRelevantInTheMiddle.java +++ /dev/null @@ -1,17 +0,0 @@ -class Foo { - int ELEMENT_A = 1; - int ELEMENT_B = 1; - int ELEMENT_C = 1; - int ELEMENT_D = 1; - int ELEMENT_E = 1; - int ELEMENT_F = 1; - int ELEMENT_G = 1; - int ELEMENT_H = 1; - int ELEMENT_I = 1; - - - { - El - } - -} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.java index 7aed97b25e6c..b7fb373b9024 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavadocCompletionTest.java @@ -74,7 +74,7 @@ public class JavadocCompletionTest extends LightFixtureCompletionTestCase { public void testSee0() throws Exception { configureByFile("See0.java"); - assertStringItems("foo", "clone", "equals", "finalize", "getClass", "hashCode", "notify", "notifyAll", "Object", "registerNatives", "toString", "wait", "wait", "wait"); + assertStringItems("foo", "clone", "equals", "getClass", "hashCode", "notify", "notifyAll", "Object", "toString", "wait", "wait", "wait", "finalize", "registerNatives"); } public void testSee1() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy index de77849ddd9b..43e49fc42e02 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy @@ -233,16 +233,6 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase { checkPreferredItems(0, "FooOCSomething", "FooObjectCollector"); } - public void testPreselectMostRelevantInTheMiddle() { - myFixture.addClass("package foo; public class Elaaaaaaaaaaaaaaaaaaaa {}"); - invokeCompletion(getTestName(false) + ".java"); - myFixture.completeBasic(); - LookupImpl lookup = getLookup(); - assertPreferredItems(lookup.getList().getSelectedIndex()); - assertEquals("Elaaaaaaaaaaaaaaaaaaaa", lookup.getItems().get(0).getLookupString()); - assertEquals("ELEMENT_A", lookup.getCurrentItem().getLookupString()); - } - public void testPreferSamePackageOverImported() { myFixture.addClass("package bar; public class Bar1 {}"); myFixture.addClass("package bar; public class Bar2 {}"); 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 f9b0ffd9eab6..97e7156fc63d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -474,7 +474,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { public void testVoidExpectedType() throws Throwable { configureByTestName(); - assertStringItems("notify", "notifyAll", "wait", "wait", "wait", "equals", "getClass", "hashCode", "toString"); + assertStringItems("notify", "notifyAll", "wait", "wait", "wait", "getClass", "equals", "hashCode", "toString"); type('e'); assertEquals("equals", assertOneElement(getLookup().getItems()).getLookupString()); select(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 08e6b502c4f2..1ee382a684d9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -606,7 +606,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable } public static boolean limitRelevance() { - return ApplicationManager.getApplication().isUnitTestMode() || Registry.is("limited.relevance.sorting.in.completion"); + return Registry.is("limited.relevance.sorting.in.completion"); } public boolean isFrozen(@NotNull LookupElement element) { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy index 9d2b20d90aaa..fbdb4e312da7 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy @@ -152,20 +152,20 @@ fromThis4 fromThis5 overridden thisProp -class -equals fromSuper fromSuper2 +metaPropertyValues +properties +superProp +class +equals getProperty hashCode invokeMethod metaClass -metaPropertyValues notify notifyAll -properties setProperty -superProp toString wait wait -- 2.32.0