From 8fc6c03e16b2f6b6253ec989d8677afc04458c84 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 26 Jun 2023 15:20:06 +0200 Subject: [PATCH] Tests: merge firTestWithJvmBackend into testsWithJvmBackend --- ...gnosticsTestWithJvmIrBackendGenerated.java | 32 ------------------- ...gnosticsTestWithJvmIrBackendGenerated.java | 6 ++++ .../exceptionFromInterpreter.diag.txt | 5 --- .../exceptionFromInterpreter.diag.txt | 5 +++ .../exceptionFromInterpreter.kt | 1 + .../exceptionFromInterpreter.txt | 1 + ...gnosticsTestWithJvmIrBackendGenerated.java | 6 ++++ .../generators/GenerateJUnit5CompilerTests.kt | 4 --- 8 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java delete mode 100644 compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt create mode 100644 compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.diag.txt rename compiler/testData/diagnostics/{firTestWithJvmBackend => testsWithJvmBackend}/exceptionFromInterpreter.kt (96%) rename compiler/testData/diagnostics/{firTestWithJvmBackend => testsWithJvmBackend}/exceptionFromInterpreter.txt (71%) diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java deleted file mode 100644 index 4e065f4714b..00000000000 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.test.runners; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/diagnostics/firTestWithJvmBackend") -@TestDataPath("$PROJECT_ROOT") -public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirPsiDiagnosticsTestWithJvmIrBackend { - @Test - public void testAllFilesPresentInFirTestWithJvmBackend() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/firTestWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), null, true); - } - - @Test - @TestMetadata("exceptionFromInterpreter.kt") - public void testExceptionFromInterpreter() throws Exception { - runTest("compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt"); - } -} diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java index de3ad894dcb..fa780ca3f55 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java @@ -24,6 +24,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true); } + @Test + @TestMetadata("exceptionFromInterpreter.kt") + public void testExceptionFromInterpreter() throws Exception { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt"); + } + @Test @TestMetadata("indirectInlineCycle.kt") public void testIndirectInlineCycle() throws Exception { diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt b/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt deleted file mode 100644 index 7e3fd27cb87..00000000000 --- a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt +++ /dev/null @@ -1,5 +0,0 @@ -/exceptionFromInterpreter.kt:6:26: error: Cannot evaluate constant expression: / by zero - -/exceptionFromInterpreter.kt:7:26: warning: Constant expression will throw an exception at runtime: / by zero - -/exceptionFromInterpreter.kt:8:39: error: Cannot evaluate constant expression: marginPrefix must be non-blank string. diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.diag.txt new file mode 100644 index 00000000000..64867ffc62c --- /dev/null +++ b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.diag.txt @@ -0,0 +1,5 @@ +/exceptionFromInterpreter.kt:7:26: error: Cannot evaluate constant expression: / by zero + +/exceptionFromInterpreter.kt:8:26: warning: Constant expression will throw an exception at runtime: / by zero + +/exceptionFromInterpreter.kt:9:39: error: Cannot evaluate constant expression: marginPrefix must be non-blank string. diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt similarity index 96% rename from compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt index cea6947287b..26f1f2656d5 100644 --- a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !RENDER_ALL_DIAGNOSTICS_FULL_TEXT // TARGET_BACKEND: JVM_IR // !DIAGNOSTICS: -CONST_VAL_WITH_NON_CONST_INITIALIZER, -DIVISION_BY_ZERO diff --git a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.txt similarity index 71% rename from compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt rename to compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.txt index 9a2c1acf569..e5b0d3625ee 100644 --- a/compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.txt @@ -1,4 +1,5 @@ package +public val disivionByZeroWarn: kotlin.Int public const val divideByZero: kotlin.Int public const val trimMarginException: kotlin.String diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java index 84c15562b79..0afd4374193 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java @@ -25,6 +25,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true); } + @Test + @TestMetadata("exceptionFromInterpreter.kt") + public void testExceptionFromInterpreter() throws Exception { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt"); + } + @Test @TestMetadata("indirectInlineCycle.kt") public void testIndirectInlineCycle() throws Exception { diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt index 3afacad1126..125a0c927eb 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt @@ -317,10 +317,6 @@ fun generateJUnit5CompilerTests(args: Array) { model("debug/localVariables") } - testClass { - model("diagnostics/firTestWithJvmBackend") - } - testClass(suiteTestClassName = "FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated") { model("diagnostics/testsWithJvmBackend", excludedPattern = excludedCustomTestdataPattern) }