Merge light-analysis tests into black box codegen tests

#KT-15382 Fixed

compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java

@@ -19,14 +19,19 @@ package org.jetbrains.kotlin.codegen;
 import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Processor;
+import kotlin.Unit;
 import kotlin.io.FilesKt;
+import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
 import org.jetbrains.kotlin.psi.KtDeclaration;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
 import org.jetbrains.kotlin.psi.KtProperty;
+import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension;
+import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.TestJdkKind;
@@ -38,6 +43,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
+    // Set to 'false' to speed up black box tests locally
+    private static final boolean SKIP_LIGHT_ANALYSIS_MODE_TESTS = false;
+
     private boolean addRuntime = false;
     private boolean addReflect = false;
 
@@ -62,7 +70,44 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
                 addRuntime ? ConfigurationKind.NO_KOTLIN_REFLECT :
                 ConfigurationKind.JDK_ONLY;
 
-        compileAndRun(files, javaFilesDir, jdkKind, javacOptions);
+        try {
+            compileAndRun(files, javaFilesDir, jdkKind, javacOptions);
+        }
+        catch (Throwable boxError) {
+            // Even if black box fails, run light analysis mode test to generate the .txt file
+            try {
+                doLightAnalysisModeTest(wholeFile, files, javaFilesDir);
+            }
+            catch (Throwable lightAnalysisError) {
+                throw ExceptionUtilsKt.rethrow(boxError);
+            }
+        }
+
+        doLightAnalysisModeTest(wholeFile, files, javaFilesDir);
+    }
+
+    private void doLightAnalysisModeTest(@NotNull File wholeFile, @NotNull List<TestFile> files, @Nullable File javaFilesDir) {
+        if (SKIP_LIGHT_ANALYSIS_MODE_TESTS) return;
+
+        File boxTestsDir = new File("compiler/testData/codegen/box");
+        String relativePath = FilesKt.toRelativeString(wholeFile, boxTestsDir);
+        // Do nothing if this test is not under codegen/box
+        if (relativePath.startsWith("..")) return;
+
+        String outDir = new File("compiler/testData/codegen/light-analysis", relativePath).getParent();
+        File txtFile = new File(outDir, FilesKt.getNameWithoutExtension(wholeFile) + ".txt");
+        AbstractBytecodeListingTest.doTest(
+                getTestRootDisposable(), files, javaFilesDir, txtFile, ClassBuilderFactories.TEST_KAPT3,
+                new Function1<KotlinCoreEnvironment, Unit>() {
+                    @Override
+                    public Unit invoke(KotlinCoreEnvironment environment) {
+                        AnalysisHandlerExtension.Companion.registerExtension(
+                                environment.getProject(), new PartialAnalysisHandlerExtension()
+                        );
+                        return Unit.INSTANCE;
+                    }
+                }
+        );
     }
 
     @SuppressWarnings("WeakerAccess")

compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeCodegenTest.kt

@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2016 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.codegen
-
-import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
-import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension
-import java.io.File
-
-abstract class AbstractLightAnalysisModeCodegenTest : AbstractBytecodeListingTest() {
-    override fun doMultiFileTest(wholeFile: File, files: List<TestFile>, javaFilesDir: File?) {
-        val boxTestsDir = File("compiler/testData/codegen/box")
-        val outDir = File("compiler/testData/codegen/light-analysis", wholeFile.toRelativeString(boxTestsDir)).parent
-        val txtFile = File(outDir, wholeFile.nameWithoutExtension + ".txt")
-
-        doTest(testRootDisposable, files, javaFilesDir, txtFile, ClassBuilderFactories.TEST_KAPT3) { environment ->
-            AnalysisHandlerExtension.registerExtension(environment.project, PartialAnalysisHandlerExtension())
-        }
-    }
-}

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

@@ -110,6 +110,7 @@ import org.jetbrains.kotlin.idea.navigation.AbstractKotlinGotoTest
 import org.jetbrains.kotlin.idea.parameterInfo.AbstractParameterInfoTest
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest
+import org.jetbrains.kotlin.idea.refactoring.AbstractNameSuggestionProviderTest
 import org.jetbrains.kotlin.idea.refactoring.inline.AbstractInlineTest
 import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractExtractionTest
 import org.jetbrains.kotlin.idea.refactoring.move.AbstractMoveTest
@@ -159,13 +160,12 @@ import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests
 import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest
 import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
+import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverScriptTest
+import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverTest
 import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest
 import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.types.AbstractTypeBindingTest
-import org.jetbrains.kotlin.idea.refactoring.AbstractNameSuggestionProviderTest
-import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverScriptTest
-import org.jetbrains.kotlin.samWithReceiver.AbstractSamWithReceiverTest
 import java.io.File
 import java.lang.IllegalArgumentException
 import java.util.*
@@ -237,10 +237,6 @@ fun main(args: Array<String>) {
             model("codegen/box", targetBackend = TargetBackend.JVM)
         }
 
-        testClass<AbstractLightAnalysisModeCodegenTest> {
-            model("codegen/box", targetBackend = TargetBackend.JVM)
-        }
-
         testClass<AbstractIrBlackBoxCodegenTest>("IrOnlyBoxCodegenTestGenerated") {
             model("ir/box", targetBackend = TargetBackend.JVM)
         }