From 27b22105b4951ff9b8316f1bf03ba72b79256ca6 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 25 Jul 2012 19:23:47 +0400
Subject: [PATCH] Force insertion of the first completion for handler test
 (Leda only)

---
 .../handlers/CompletionHandlerTest.java          | 16 +++++++++++++---
 .../weighers/CompletionWeigherTest.java          |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java
index bcf740f8fc6..8d08c5db676 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java
@@ -89,14 +89,17 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
             configureByFileNoComplete(getBeforeFileName());
             setType(type);
 
-            complete(time);
-
             if (lookupString != null || tailText != null) {
+                complete(time);
+
                 LookupElement item = getExistentLookupElement(lookupString, tailText);
                 if (item != null) {
-                    selectItem(item, '\t');
+                    selectItem(item, '\n');
                 }
             }
+            else {
+                forceCompleteFirst(time);
+            }
 
             checkResultByFile(getAfterFileName());
         }
@@ -164,4 +167,11 @@ public class CompletionHandlerTest extends LightCompletionTestCase {
     protected Sdk getProjectJDK() {
         return PluginTestCaseBase.jdkFromIdeaHome();
     }
+
+    protected void forceCompleteFirst(int time) {
+        complete(time);
+        if (myItems != null && myItems.length > 1) {
+            selectItem(myItems[0]);
+        }
+    }
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTest.java b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTest.java
index 40af4b89335..c6ef289dcb5 100644
--- a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTest.java
@@ -31,7 +31,7 @@ public class CompletionWeigherTest extends CompletionAutoPopupTestCase {
     }
 
     public void testTemplatesAndKeywordsFirst() {
-        doTest("va", "val ... = ...", "var ... = ...", "vararg", "private", "values", "variables");
+        doTest("va", "val ... = ...", "var ... = ...", "vararg", "values", "variables");
     }
 
     public void doTest(String type, @NonNls String... expected) {