Udate test framework for confidence tests. Move type directive to test files

idea/testData/completion/confidence/CompleteOnDotOutOfRanges.kt

@@ -1,3 +1,5 @@
 fun test() {
   12.in<caret>
 }
+
+// TYPE: "."

idea/testData/completion/confidence/CompleteOnDotOutOfRanges.kt.after

@@ -1,3 +1,5 @@
 fun test() {
-  12.inc(). <caret>
+  12.inc().<caret>
 }
+
+// TYPE: "."

idea/testData/completion/confidence/ImportAsConfidence.kt

@@ -1 +1,3 @@
 import kotlin.util <caret>// Comment to prevent for removing trailing spaces
+
+// TYPE: "as"

idea/testData/completion/confidence/ImportAsConfidence.kt.after

@@ -1 +1,3 @@
-import kotlin.util as // Comment to prevent for removing trailing spaces
+import kotlin.util as// Comment to prevent for removing trailing spaces
+
+// TYPE: "as"

idea/testData/completion/confidence/InBeginningOfFunctionLiteral.kt

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { <caret>}
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InBeginningOfFunctionLiteral.kt.after

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { mm }
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InBeginningOfFunctionLiteralInBrackets.kt

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { (<caret>) }
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InBeginningOfFunctionLiteralInBrackets.kt.after

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { (mm ) }
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InBlockOfFunctionLiteral.kt

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { i -> <caret>}
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InBlockOfFunctionLiteral.kt.after

@@ -2,3 +2,5 @@ fun main(args : Array<String>) {
     val mmm = 12
     val t =  { i -> mmm }
 }
+
+// TYPE: "mm "

idea/testData/completion/confidence/InModifierList.kt

@@ -3,3 +3,5 @@ package test
 import java.util.AbstractSet as Hello
 
 <caret>// Comment to prevent for removing trailing spaces
+
+// TYPE: "pub "

idea/testData/completion/confidence/InModifierList.kt.after

@@ -3,3 +3,5 @@ package test
 import java.util.AbstractSet as Hello
 
 public // Comment to prevent for removing trailing spaces
+
+// TYPE: "pub "

idea/testData/completion/confidence/NoAutoCompletionForRangeOperator.kt

@@ -2,3 +2,5 @@ fun test() {
     for (i in 12.<caret>) {
     }
 }
+
+// TYPE: "."

idea/testData/completion/confidence/NoAutoCompletionForRangeOperator.kt.after

@@ -1,4 +1,6 @@
 fun test() {
-    for (i in 12.. ) {
+    for (i in 12..) {
     }
 }
+
+// TYPE: "."

idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java

@@ -21,8 +21,10 @@ import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.completion.LightCompletionTestCase;
 import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.util.text.StringUtil;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
+import org.jetbrains.jet.testing.InTextDirectivesUtils;
 
 import java.io.File;
 
@@ -30,40 +32,51 @@ import java.io.File;
  * @author Nikolay Krasko
  */
 public class JetConfidenceTest extends LightCompletionTestCase {
+    private static final String TYPE_DIRECTIVE_PREFIX = "// TYPE:";
+
     public void testCompleteOnDotOutOfRanges() {
-        doTest(".");
+        doTest();
     }
 
     public void testImportAsConfidence() {
-        doTest("as");
+        doTest();
-    }
-
-    public void testInModifierList() {
-        doTest("pub");
     }
 
     public void testInBeginningOfFunctionLiteral() {
-        doTest("mm");
+        doTest();
     }
 
     public void testInBeginningOfFunctionLiteralInBrackets() {
-        doTest("mm");
+        doTest();
     }
 
     public void testInBlockOfFunctionLiteral() {
-        doTest("mm");
+        doTest();
+    }
+
+    public void testInModifierList() {
+        doTest();
     }
 
     public void testNoAutoCompletionForRangeOperator() {
-        doTest(".");
+        doTest();
     }
 
-    protected void doTest(String completionActivateType) {
+    protected void doTest() {
         configureByFile(getBeforeFileName());
-        type(completionActivateType + " ");
+        type(getTypeTextFromFile());
         checkResultByFile(getAfterFileName());
     }
 
+    protected static String getTypeTextFromFile() {
+        String text = getEditor().getDocument().getText();
+
+        String[] directives = InTextDirectivesUtils.findListWithPrefix(TYPE_DIRECTIVE_PREFIX, text);
+        assertEquals("One directive with \"" + TYPE_DIRECTIVE_PREFIX +"\" expected", 1, directives.length);
+
+        return StringUtil.unquoteString(directives[0]);
+    }
+
     protected String getBeforeFileName() {
         return getTestName(false) + ".kt";
     }