azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: merge firTestWithJvmBackend into testsWithJvmBackend

Browse Source
This commit is contained in:
Alexander Udalov
2023-06-26 15:20:06 +02:00
committed by Space Team
parent 9935519656
commit 8fc6c03e16
8 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
-32
View File
@@ -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");
}
}
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+6
View File
@@ -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 {
compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.diag.txt
Vendored
-5
View File
@@ -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.
compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.diag.txt
Vendored
+5
View File
@@ -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.
compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.kt → compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.kt
Vendored
+1
View File
@@ -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
compiler/testData/diagnostics/firTestWithJvmBackend/exceptionFromInterpreter.txt → compiler/testData/diagnostics/testsWithJvmBackend/exceptionFromInterpreter.txt
Vendored
+1
View File
@@ -1,4 +1,5 @@
package
public val disivionByZeroWarn: kotlin.Int
public const val divideByZero: kotlin.Int
public const val trimMarginException: kotlin.String
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
Generated
+6
View File
@@ -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 {
compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
-4
View File
@@ -317,10 +317,6 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
model("debug/localVariables")
}
testClass<AbstractFirPsiDiagnosticsTestWithJvmIrBackend> {
model("diagnostics/firTestWithJvmBackend")
}
testClass<AbstractFirPsiDiagnosticsTestWithJvmIrBackend>(suiteTestClassName = "FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated") {
model("diagnostics/testsWithJvmBackend", excludedPattern = excludedCustomTestdataPattern)
}