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

[Test] Migrate tests for java 9 to regular test infrastructure

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-07-14 13:27:10 +03:00
committed by teamcityserver
parent ca214bef30
commit 4f73ebbcbd
28 changed files with 303 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+82
View File
@@ -41523,6 +41523,88 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/testsWithJava9")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava9 {
@Test
public void testAllFilesPresentInTestsWithJava9() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
}
@Test
@TestMetadata("concatDynamic.kt")
public void testConcatDynamic() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt");
}
@Test
@TestMetadata("concatDynamic200.kt")
public void testConcatDynamic200() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt");
}
@Test
@TestMetadata("concatDynamic200Long.kt")
public void testConcatDynamic200Long() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt");
}
@Test
@TestMetadata("concatDynamic201.kt")
public void testConcatDynamic201() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt");
}
@Test
@TestMetadata("concatDynamicIndy200.kt")
public void testConcatDynamicIndy200() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt");
}
@Test
@TestMetadata("concatDynamicIndy200Long.kt")
public void testConcatDynamicIndy200Long() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt");
}
@Test
@TestMetadata("concatDynamicIndy201.kt")
public void testConcatDynamicIndy201() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt");
}
@Test
@TestMetadata("concatDynamicInlineClasses.kt")
public void testConcatDynamicInlineClasses() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt");
}
@Test
@TestMetadata("concatDynamicSpecialSymbols.kt")
public void testConcatDynamicSpecialSymbols() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt");
}
@Test
@TestMetadata("concatDynamicWithInline.kt")
public void testConcatDynamicWithInline() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt");
}
@Test
@TestMetadata("kt36984.kt")
public void testKt36984() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/kt36984.kt");
}
@Test
@TestMetadata("varHandle.kt")
public void testVarHandle() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/varHandle.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/throws")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+82
View File
@@ -41679,6 +41679,88 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/testsWithJava9")
@TestDataPath("$PROJECT_ROOT")
public class TestsWithJava9 {
@Test
public void testAllFilesPresentInTestsWithJava9() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
}
@Test
@TestMetadata("concatDynamic.kt")
public void testConcatDynamic() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic.kt");
}
@Test
@TestMetadata("concatDynamic200.kt")
public void testConcatDynamic200() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200.kt");
}
@Test
@TestMetadata("concatDynamic200Long.kt")
public void testConcatDynamic200Long() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic200Long.kt");
}
@Test
@TestMetadata("concatDynamic201.kt")
public void testConcatDynamic201() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamic201.kt");
}
@Test
@TestMetadata("concatDynamicIndy200.kt")
public void testConcatDynamicIndy200() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200.kt");
}
@Test
@TestMetadata("concatDynamicIndy200Long.kt")
public void testConcatDynamicIndy200Long() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy200Long.kt");
}
@Test
@TestMetadata("concatDynamicIndy201.kt")
public void testConcatDynamicIndy201() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicIndy201.kt");
}
@Test
@TestMetadata("concatDynamicInlineClasses.kt")
public void testConcatDynamicInlineClasses() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicInlineClasses.kt");
}
@Test
@TestMetadata("concatDynamicSpecialSymbols.kt")
public void testConcatDynamicSpecialSymbols() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicSpecialSymbols.kt");
}
@Test
@TestMetadata("concatDynamicWithInline.kt")
public void testConcatDynamicWithInline() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/concatDynamicWithInline.kt");
}
@Test
@TestMetadata("kt36984.kt")
public void testKt36984() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/kt36984.kt");
}
@Test
@TestMetadata("varHandle.kt")
public void testVarHandle() throws Exception {
runTest("compiler/testData/codegen/box/testsWithJava9/varHandle.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/throws")
@TestDataPath("$PROJECT_ROOT")
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt
+10 -1
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.test.runners.codegen
import org.jetbrains.kotlin.test.Constructor
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
import org.jetbrains.kotlin.test.backend.handlers.BytecodeListingHandler
import org.jetbrains.kotlin.test.backend.handlers.BytecodeTextHandler
@@ -14,10 +15,11 @@ import org.jetbrains.kotlin.test.bind
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JDK_KIND
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
import org.jetbrains.kotlin.test.frontend.classic.handlers.ClassicDiagnosticsHandler
import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler
import org.jetbrains.kotlin.test.model.*
import org.jetbrains.kotlin.test.runners.AbstractDiagnosticTest.Companion.DISABLED_BY_DEFAULT_UNUSED_DIAGNOSTICS
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
abstract class AbstractJvmBlackBoxCodegenTestBase<R : ResultingArtifact.FrontendOutput<R>>(
@@ -50,6 +52,13 @@ abstract class AbstractJvmBlackBoxCodegenTestBase<R : ResultingArtifact.Frontend
}
}
forTestsMatching("compiler/testData/codegen/box/testsWithJava9/*") {
defaultDirectives {
JDK_KIND with TestJdkKind.FULL_JDK_9
+WITH_STDLIB
}
}
enableMetaInfoHandler()
}
}