Refactor AbstractMultiFileJvmBasicCompletionTest to extend CompletionTestCase

Extract common code from JetFixtureCompletionBaseTestCase to CompletionTestUtil.kt
Reason for this change is that I couldn't get the check that prohibits tree loading to work with fixture test case

generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt

@@ -599,7 +599,7 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractMultiFileJvmBasicCompletionTest>()) {
-            model("completion/basic/multifile", pattern = """^([^\.]+)\.kt$""")
+            model("completion/basic/multifile", extension = null, recursive = false)
         }
 
         testClass(javaClass<AbstractJetExtractionTest>()) {

idea/testData/completion/basic/multifile/JavaInnerClasses/JavaInnerClasses.kt

@@ -2,6 +2,5 @@ fun main(args: Array<String>) {
     println(R.<caret>)
 }
 
-// JAVA_FILE: JavaInnerClasses.java
 // INVOCATION_COUNT: 1
 // EXIST: layout

idea/testData/completion/basic/multifile/NotImportedJavaClass/NotImportedJavaClass.kt

@@ -7,5 +7,4 @@ fun test() {
 
 /* KT-3779, KT-2821 */
 // INVOCATION_COUNT: 2
-// JAVA_FILE: javapackage/Bar.java
 // EXIST: Bar

idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java

@@ -16,63 +16,30 @@
 
 package org.jetbrains.jet.completion;
 
-import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.psi.PsiFile;
+import com.intellij.codeInsight.completion.CompletionTestCase;
+import com.intellij.codeInsight.lookup.LookupElement;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.InTextDirectivesUtils;
+import org.jetbrains.jet.completion.util.UtilPackage;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
 
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
+public abstract class AbstractMultiFileJvmBasicCompletionTest extends CompletionTestCase {
 
-public abstract class AbstractMultiFileJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
+    protected void doTest(@NotNull String testPath) throws Exception {
+        configureByFile(getTestName(false) + ".kt", "");
+        UtilPackage.testCompletion(getFile().getText(), TargetPlatform.JVM, new Function1<Integer, LookupElement[]>() {
+            @Override
+            public LookupElement[] invoke(Integer invocationCount) {
+                complete(invocationCount);
+                return myItems;
+            }
+        });
 
-    private static final String JAVA_FILE = "JAVA_FILE:";
-
-    @Override
-    protected void setUpFixture(@NotNull String testPath) {
-        String[] kotlinTestFiles = getKotlinFiles(testPath);
-        myFixture.configureByFiles(kotlinTestFiles);
-        PsiFile testFile = myFixture.getFile();
-        String text = testFile.getText();
-        String javaFilePath = InTextDirectivesUtils.findStringWithPrefixes(text, JAVA_FILE);
-        if (javaFilePath != null) {
-            myFixture.configureByFile(javaFilePath);
-            myFixture.configureByFiles(kotlinTestFiles);
-        }
-    }
-
-    @NotNull
-    private String[] getKotlinFiles(@NotNull String testPath) {
-        String testFileName = testPath.substring(testPath.lastIndexOf("/") + 1, testPath.length());
-        String secondaryFile = testFileName.replace(".kt", ".dependency.kt");
-        if (new File(getTestDataPath() + "/" + secondaryFile).exists()) {
-            return new String[] {testFileName, secondaryFile};
-        }
-        return new String[] {testFileName};
-    }
-
-    @Override
-    public TargetPlatform getPlatform() {
-        return TargetPlatform.JVM;
-    }
-
-    @NotNull
-    @Override
-    protected CompletionType completionType() {
-        return CompletionType.BASIC;
-    }
-
-    @NotNull
-    @Override
-    protected List<String> getAdditionalDirectives() {
-        return Collections.singletonList(JAVA_FILE);
     }
 
     @Override
     protected String getTestDataPath() {
-        return PluginTestCaseBase.getTestDataPathBase() + "/completion/basic/multifile/";
+        return PluginTestCaseBase.getTestDataPathBase() + "/completion/basic/multifile/" + getTestName(false) + "/";
     }
 }

idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.completion.util
+
+import com.intellij.codeInsight.lookup.LookupElement
+import org.jetbrains.jet.plugin.project.TargetPlatform
+import org.junit.Assert
+import org.jetbrains.jet.completion.ExpectedCompletionUtils
+
+fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (Int) -> Array<LookupElement>?) {
+    val invocationCount = ExpectedCompletionUtils.getInvocationCount(fileText) ?: 0
+    val items = complete(invocationCount) ?: array()
+
+    ExpectedCompletionUtils.assertDirectivesValid(fileText)
+
+    val expected = ExpectedCompletionUtils.itemsShouldExist(fileText, platform)
+    val unexpected = ExpectedCompletionUtils.itemsShouldAbsent(fileText, platform)
+    val itemsNumber = ExpectedCompletionUtils.getExpectedNumber(fileText, platform)
+
+    Assert.assertTrue("Should be some assertions about completion", expected.size != 0 || unexpected.size != 0 || itemsNumber != null)
+    ExpectedCompletionUtils.assertContainsRenderedItems(expected, items, ExpectedCompletionUtils.isWithOrder(fileText))
+    ExpectedCompletionUtils.assertNotContainsRenderedItems(unexpected, items)
+
+    if (itemsNumber != null) {
+        val expectedItems = ExpectedCompletionUtils.listToString(ExpectedCompletionUtils.getItemsInformation(items))
+        Assert.assertEquals("Invalid number of completion items: ${expectedItems}", itemsNumber, items.size)
+    }
+}

idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java

@@ -221,10 +221,8 @@ public class ExpectedCompletionUtils {
         return InTextDirectivesUtils.getPrefixedInt(fileText, WITH_ORDER_PREFIX) != null;
     }
 
-    public static void assertDirectivesValid(String fileText, List<String> additionalPrefixes) {
-        List<String> allowedPrefixes = new ArrayList<String>(KNOWN_PREFIXES);
-        allowedPrefixes.addAll(additionalPrefixes);
-        InTextDirectivesUtils.assertHasUnknownPrefixes(fileText, allowedPrefixes);
+    public static void assertDirectivesValid(String fileText) {
+        InTextDirectivesUtils.assertHasUnknownPrefixes(fileText, KNOWN_PREFIXES);
     }
 
     public static void assertContainsRenderedItems(CompletionProposal[] expected, LookupElement[] items, boolean checkOrder) {

idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java

@@ -21,12 +21,12 @@ import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import kotlin.Function1;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.completion.util.UtilPackage;
 import org.jetbrains.jet.plugin.project.TargetPlatform;
 
 import java.io.File;
-import java.util.Collections;
-import java.util.List;
 
 public abstract class JetFixtureCompletionBaseTestCase extends LightCodeInsightFixtureTestCase {
     private boolean autoCompleteSetting;
@@ -68,41 +68,12 @@ public abstract class JetFixtureCompletionBaseTestCase extends LightCodeInsightF
         setUpFixture(testPath);
 
         String fileText = FileUtil.loadFile(new File(testPath), true);
-
-        Integer invocationCount = ExpectedCompletionUtils.getInvocationCount(fileText);
-
-        myFixture.complete(completionType(), invocationCount == null ? 0 : invocationCount);
-
-        ExpectedCompletionUtils.assertDirectivesValid(fileText, getAdditionalDirectives());
-
-        ExpectedCompletionUtils.CompletionProposal[] expected = ExpectedCompletionUtils.itemsShouldExist(fileText, getPlatform());
-        ExpectedCompletionUtils.CompletionProposal[] unexpected = ExpectedCompletionUtils.itemsShouldAbsent(fileText, getPlatform());
-        Integer itemsNumber = ExpectedCompletionUtils.getExpectedNumber(fileText, getPlatform());
-
-        assertTrue("Should be some assertions about completion",
-                   expected.length != 0 || unexpected.length != 0 || itemsNumber != null);
-
-        LookupElement[] items = myFixture.getLookupElements();
-
-        if (items == null) {
-            items = new LookupElement[0];
-        }
-
-        ExpectedCompletionUtils.assertContainsRenderedItems(expected, items, ExpectedCompletionUtils.isWithOrder(fileText));
-        ExpectedCompletionUtils.assertNotContainsRenderedItems(unexpected, items);
-
-        if (itemsNumber != null) {
-            assertEquals(
-                    String.format(
-                            "Invalid number of completion items: %s",
-                            ExpectedCompletionUtils.listToString(ExpectedCompletionUtils.getItemsInformation(items))),
-                    itemsNumber.intValue(), items.length);
-        }
-    }
-
-    @NotNull
-    protected List<String> getAdditionalDirectives() {
-        return Collections.emptyList();
+        UtilPackage.testCompletion(fileText, getPlatform(), new Function1<Integer, LookupElement[]>() {
+            @Override
+            public LookupElement[] invoke(Integer invocationCount) {
+                return myFixture.complete(completionType(), invocationCount);
+            }
+        });
     }
 
     protected void setUpFixture(@NotNull String testPath) {

idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java

@@ -31,75 +31,69 @@ import org.jetbrains.jet.completion.AbstractMultiFileJvmBasicCompletionTest;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/multifile")
-@InnerTestClasses({})
 public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest {
     public void testAllFilesPresentInMultifile() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/basic/multifile"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false);
     }
     
-    @TestMetadata("CompleteImportedFunction.kt")
+    @TestMetadata("CompleteImportedFunction")
     public void testCompleteImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/CompleteImportedFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/CompleteImportedFunction");
     }
     
-    @TestMetadata("CompletionOnImportedFunction.kt")
+    @TestMetadata("CompletionOnImportedFunction")
     public void testCompletionOnImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/CompletionOnImportedFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/CompletionOnImportedFunction");
     }
     
-    @TestMetadata("DoNotCompleteWithConstraints.kt")
+    @TestMetadata("DoNotCompleteWithConstraints")
     public void testDoNotCompleteWithConstraints() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints.kt");
+        doTest("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints");
     }
     
-    @TestMetadata("ExtensionFunction.kt")
+    @TestMetadata("ExtensionFunction")
     public void testExtensionFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/ExtensionFunction");
     }
     
-    @TestMetadata("ExtensionFunctionOnImportedFunction.kt")
+    @TestMetadata("ExtensionFunctionOnImportedFunction")
     public void testExtensionFunctionOnImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction");
     }
     
-    @TestMetadata("ExtensionOnNullable.kt")
+    @TestMetadata("ExtensionOnNullable")
     public void testExtensionOnNullable() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionOnNullable.kt");
+        doTest("idea/testData/completion/basic/multifile/ExtensionOnNullable");
     }
     
-    @TestMetadata("InImportedFunctionLiteralParameter.kt")
+    @TestMetadata("InImportedFunctionLiteralParameter")
     public void testInImportedFunctionLiteralParameter() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter.kt");
+        doTest("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter");
     }
     
-    @TestMetadata("JavaInnerClasses.kt")
+    @TestMetadata("JavaInnerClasses")
     public void testJavaInnerClasses() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/JavaInnerClasses.kt");
+        doTest("idea/testData/completion/basic/multifile/JavaInnerClasses");
     }
     
-    @TestMetadata("NotImportedExtensionFunction.kt")
+    @TestMetadata("NotImportedExtensionFunction")
     public void testNotImportedExtensionFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedExtensionFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/NotImportedExtensionFunction");
     }
     
-    @TestMetadata("NotImportedJavaClass.kt")
+    @TestMetadata("NotImportedJavaClass")
     public void testNotImportedJavaClass() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedJavaClass.kt");
+        doTest("idea/testData/completion/basic/multifile/NotImportedJavaClass");
     }
     
-    @TestMetadata("NotImportedObject.kt")
+    @TestMetadata("NotImportedObject")
     public void testNotImportedObject() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedObject.kt");
+        doTest("idea/testData/completion/basic/multifile/NotImportedObject");
     }
     
-    @TestMetadata("TopLevelFunction.kt")
+    @TestMetadata("TopLevelFunction")
     public void testTopLevelFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/TopLevelFunction.kt");
+        doTest("idea/testData/completion/basic/multifile/TopLevelFunction");
     }
     
-    public static Test suite() {
-        TestSuite suite = new TestSuite("MultiFileJvmBasicCompletionTestGenerated");
-        suite.addTestSuite(MultiFileJvmBasicCompletionTestGenerated.class);
-        return suite;
-    }
 }