From c9fdd7b31de1ecdfbf8e92ebb4efd83e357511ce Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Wed, 1 Dec 2010 16:50:03 +0300
Subject: [PATCH] fixed test in dict keys completion

---
 .../PyDictKeyNamesCompletionContributor.java          | 11 -----------
 python/testData/completion/dictKeys.after.py          |  2 ++
 python/testData/completion/dictKeys.py                |  4 ++--
 .../com/jetbrains/python/PythonCompletionTest.java    |  6 +-----
 4 files changed, 5 insertions(+), 18 deletions(-)
 create mode 100644 python/testData/completion/dictKeys.after.py

diff --git a/python/src/com/jetbrains/python/codeInsight/PyDictKeyNamesCompletionContributor.java b/python/src/com/jetbrains/python/codeInsight/PyDictKeyNamesCompletionContributor.java
index c2d52ceefe4e..83e54199e1b0 100644
--- a/python/src/com/jetbrains/python/codeInsight/PyDictKeyNamesCompletionContributor.java
+++ b/python/src/com/jetbrains/python/codeInsight/PyDictKeyNamesCompletionContributor.java
@@ -1,7 +1,6 @@
 package com.jetbrains.python.codeInsight;
 
 import com.intellij.codeInsight.completion.*;
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -25,16 +24,6 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
  * Complete known keys for dictionaries
  */
 public class PyDictKeyNamesCompletionContributor extends PySeeingOriginalCompletionContributor {
-  @Override
-  public AutoCompletionDecision handleAutoCompletionPossibility(AutoCompletionContext context) {
-    // auto-insert the obvious only case; else show other cases.
-    final LookupElement[] items = context.getItems();
-    if (items.length == 1) {
-      return AutoCompletionDecision.insertItem(items[0]);
-    }
-    return AutoCompletionDecision.SHOW_LOOKUP;
-  }
-
   private static final FilterPattern DICT_KEY = new FilterPattern(
     new InSequenceFilter(psiElement(PySubscriptionExpression.class))
   );
diff --git a/python/testData/completion/dictKeys.after.py b/python/testData/completion/dictKeys.after.py
new file mode 100644
index 000000000000..398a63b69e25
--- /dev/null
+++ b/python/testData/completion/dictKeys.after.py
@@ -0,0 +1,2 @@
+tasks = {key: "123"}
+tasks[key]
\ No newline at end of file
diff --git a/python/testData/completion/dictKeys.py b/python/testData/completion/dictKeys.py
index 759a0f805ef0..da9475c99019 100644
--- a/python/testData/completion/dictKeys.py
+++ b/python/testData/completion/dictKeys.py
@@ -1,2 +1,2 @@
-tasks = {'123': "123"}
-tasks['<caret>1]
\ No newline at end of file
+tasks = {key: "123"}
+tasks[ke<caret>]
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 3e49423341aa..5502ada922aa 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -223,11 +223,7 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
   }
 
   public void testDictKeys() {  // PY-2245
-    final String testName = "completion/" + getTestName(true) + ".py";
-    myFixture.configureByFile(testName);
-    final LookupElement[] elements = myFixture.completeBasic();
-    assertEquals(1, elements.length);
-    assertEquals("'123'", elements [0].getLookupString());
+    doTest();
   }
 
   public void testNoParensForDecorator() {  // PY-2210