Refactor tests and activate them for working with JS

generators/org/jetbrains/jet/generators/tests/GenerateTests.java

@@ -27,6 +27,8 @@ import org.jetbrains.jet.codegen.AbstractTopLevelMembersInvocationTest;
 import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCodegenTest;
 import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest;
 import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
+import org.jetbrains.jet.completion.AbstractJavaCompletionTest;
+import org.jetbrains.jet.completion.AbstractJetJSCompletionTest;
 import org.jetbrains.jet.jvm.compiler.*;
 import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest;
 import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest;
@@ -223,6 +225,22 @@ public class GenerateTests {
                 new SimpleTestClassModel(new File("idea/testData/quickfix"), true, Pattern.compile("^before(\\w+)\\.kt$"), "doTest")
         );
 
+        generateTest(
+                "idea/tests/",
+                "JetBasicJSCompletionTest",
+                AbstractJetJSCompletionTest.class,
+                testModel("idea/testData/completion/basic", false, "doTest"),
+                testModel("idea/testData/completion/basic/js", false, "doTest")
+        );
+
+        generateTest(
+                "idea/tests/",
+                "JetBasicJavaCompletionTest",
+                AbstractJavaCompletionTest.class,
+                testModel("idea/testData/completion/basic", false, "doTest"),
+                testModel("idea/testData/completion/basic/java", false, "doTest")
+        );
+
         generateTest(
                 "idea/tests/",
                 "QuickFixMultiFileTestGenerated",
@@ -286,6 +304,10 @@ public class GenerateTests {
         return testModel(rootPath, true, "kt", methodName);
     }
 
+    private static SimpleTestClassModel testModel(@NotNull String rootPath, boolean recursive, @NotNull String methodName) {
+        return testModel(rootPath, recursive, "kt", methodName);
+    }
+
     private static SimpleTestClassModel testModelWithDirectories(@NotNull String rootPath, @NotNull String methodName) {
         return new SimpleTestClassModel(new File(rootPath), false,  Pattern.compile("^(.+)$"), methodName);
     }