From da34f91d3f74523080d61d0e8ac848d5130a6efa Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 9 Oct 2012 18:19:01 +0200
Subject: [PATCH] middle matching in GrCompletionWithLibraryTest

---
 .../GrCompletionWithLibraryTest.groovy           | 16 ++++------------
 .../completion/GroovyCompletionTestBase.groovy   | 12 ++++++++++--
 2 files changed, 14 insertions(+), 14 deletions(-)

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 11434b05046c..9a3c6606c4b3 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
@@ -26,8 +26,6 @@ import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.plugins.groovy.util.TestUtils
-import com.intellij.codeInsight.completion.impl.CamelHumpMatcher
-
 /**
  * @author Maxim.Medvedev
  */
@@ -42,12 +40,6 @@ class GrCompletionWithLibraryTest extends GroovyCompletionTestBase {
     }
   };
 
-  @Override
-  protected void setUp() {
-    super.setUp()
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
-  }
-
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
@@ -60,9 +52,9 @@ class GrCompletionWithLibraryTest extends GroovyCompletionTestBase {
   }
 
   public void testCategoryMethod() {doBasicTest()}
-  public void testCategoryProperty() {doBasicTest()}
+  public void testCategoryProperty() {doBasicTest('\n')}
   public void testMultipleCategories() {doBasicTest()}
-  public void testCategoryForArray() {doBasicTest()}
+  public void testCategoryForArray() {doBasicTest('\n')}
 
   public void testArrayLikeAccessForList() throws Throwable {doBasicTest(); }
   public void testArrayLikeAccessForMap() throws Throwable {doBasicTest();}
@@ -91,7 +83,7 @@ class GrCompletionWithLibraryTest extends GroovyCompletionTestBase {
   }
 
   public void testIteratorNext() {
-    doVariantableTest "next", "notify", "notifyAll"
+    doHasVariantsTest('next', 'notify')
   }
 
   public void testGstringExtendsString() {
@@ -99,7 +91,7 @@ class GrCompletionWithLibraryTest extends GroovyCompletionTestBase {
   }
 
   public void testCompletionInEachClosure() {
-    myFixture.testCompletionVariants getTestName(false)+".groovy", "intValue", "intdiv", "intdiv"
+    doHasVariantsTest('intValue', 'intdiv')
   }
 
   public void testEllipsisTypeCompletion() {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
index a24fed6adbce..3da5c3713b40 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.groovy
@@ -40,8 +40,8 @@ abstract public class GroovyCompletionTestBase extends LightCodeInsightFixtureTe
     myFixture.checkResultByFile(getTestName(false) + "_after.groovy", true);
   }
 
-  protected void doBasicTest() {
-    myFixture.testCompletion(getTestName(false) + ".groovy", getTestName(false) + "_after.groovy");
+  protected void doBasicTest(String type = "") {
+    myFixture.testCompletionTyping(getTestName(false) + ".groovy", type, getTestName(false) + "_after.groovy");
   }
 
   protected void doBasicTest(String before, String after) {
@@ -58,6 +58,14 @@ abstract public class GroovyCompletionTestBase extends LightCodeInsightFixtureTe
     assertOrderedEquals(myFixture.lookupElementStrings, variants);
   }
 
+  public void doHasVariantsTest(String... variants) {
+    myFixture.configureByFile(getTestName(false) + ".groovy");
+    myFixture.complete(CompletionType.BASIC);
+    if (!myFixture.lookupElementStrings.containsAll(variants)) {
+      assertOrderedEquals(myFixture.lookupElementStrings, variants)
+    }
+  }
+
   public void doSmartCompletion(String... variants) {
     myFixture.configureByFile(getTestName(false) + ".groovy");
     myFixture.complete(CompletionType.SMART);