Generate tests for ide light classes from the same test data as for compiler light classes

compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java

@@ -16,10 +16,9 @@
 
 package org.jetbrains.kotlin.asJava;
 
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiClass;
-import com.intellij.psi.impl.compiled.ClsElementImpl;
 import com.intellij.psi.search.GlobalSearchScope;
+import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithWithJava;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
@@ -27,18 +26,15 @@ import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestJdkKind;
+import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
-    private static final Pattern SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE);
-
     @Override
     @NotNull
     protected CompilerConfiguration createCompilerConfiguration(File javaFilesDir) {
@@ -66,28 +62,17 @@ public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTest
 
     @Override
     protected void doMultiFileTest(File file, Map<String, ModuleAndDependencies> modules, List<Void> files) throws IOException {
-        String text = FileUtil.loadFile(file, true);
-        Matcher matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text);
-        assertTrue("No FqName specified. First line of the form '// f.q.Name' expected", matcher.find());
-        String fqName = matcher.group(1);
-
-        JavaElementFinder finder = createFinder(getEnvironment());
-
-        PsiClass psiClass = finder.findClass(fqName, GlobalSearchScope.allScope(getEnvironment().getProject()));
-        if (!(psiClass instanceof KotlinLightClass)) {
-            throw new IllegalStateException("Not a light class: " + psiClass + " (" + fqName + ")");
-        }
-
-        PsiClass delegate = ((KotlinLightClass) psiClass).getDelegate();
-        if (!(delegate instanceof ClsElementImpl)) {
-            throw new IllegalStateException("Not a CLS element: " + delegate);
-        }
-
-        StringBuilder buffer = new StringBuilder();
-        ((ClsElementImpl) delegate).appendMirrorText(0, buffer);
-        String actual = buffer.toString();
-
-        JetTestUtils.assertEqualsToFile(JetTestUtils.replaceExtension(file, "java"), actual);
+        LightClassTestCommon.INSTANCE.testLightClass(file, new Function1<String, PsiClass>() {
+            @Override
+            public PsiClass invoke(String s) {
+                try {
+                    return createFinder(getEnvironment()).findClass(s, GlobalSearchScope.allScope(getEnvironment().getProject()));
+                }
+                catch (IOException e) {
+                    throw ExceptionUtilsKt.rethrow(e);
+                }
+            }
+        });
     }
 
     @Override

compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2015 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.kotlin.asJava
+
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.psi.PsiClass
+import com.intellij.psi.impl.compiled.ClsElementImpl
+import junit.framework.TestCase
+import org.jetbrains.kotlin.test.JetTestUtils
+import java.io.File
+import java.util.regex.Pattern
+
+object LightClassTestCommon {
+    private val SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE)
+
+    @JvmOverloads
+    fun testLightClass(
+            testDataFile: File,
+            findLightClass: (String) -> PsiClass?,
+            normalizeText: (String) -> String = { it }
+    ) {
+        val text = FileUtil.loadFile(testDataFile, true)
+        val matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text)
+        TestCase.assertTrue("No FqName specified. First line of the form '// f.q.Name' expected", matcher.find())
+        val fqName = matcher.group(1)
+
+        val lightClass = findLightClass(fqName)
+
+        TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KotlinLightClass)
+
+        val delegate = (lightClass as KotlinLightClass).getDelegate()
+        TestCase.assertTrue("Not a CLS element: $delegate", delegate is ClsElementImpl)
+
+        val buffer = StringBuilder()
+        (delegate as ClsElementImpl).appendMirrorText(0, buffer)
+        val actual = normalizeText(buffer.toString())
+        JetTestUtils.assertEqualsToFile(JetTestUtils.replaceExtension(testDataFile, "java"), actual)
+    }
+}