[Native] Rename :native:tests-blackbox.native to :native:native.tests

This commit is contained in:
Dmitriy Dolovov
2021-11-11 14:24:14 +03:00
parent 54fbadb9c7
commit 54b09810f0
55 changed files with 51307 additions and 34 deletions
@@ -18,176 +18,176 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
public class NativeBlackBoxTestGenerated extends AbstractNativeBlackBoxTest {
@Nested
@TestMetadata("native/tests-blackbox/testData/samples")
@TestMetadata("native/native.tests/testData/samples")
@TestDataPath("$PROJECT_ROOT")
public class Samples {
@Test
public void testAllFilesPresentInSamples() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/tests-blackbox/testData/samples"), Pattern.compile("^(.+)\\.kt$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/samples"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("regular_custom_args.kt")
public void testRegular_custom_args() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_custom_args.kt");
runTest("native/native.tests/testData/samples/regular_custom_args.kt");
}
@Test
@TestMetadata("regular_multifile.kt")
public void testRegular_multifile() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multifile.kt");
runTest("native/native.tests/testData/samples/regular_multifile.kt");
}
@Test
@TestMetadata("regular_multifile_with_explicit_packages.kt")
public void testRegular_multifile_with_explicit_packages() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multifile_with_explicit_packages.kt");
runTest("native/native.tests/testData/samples/regular_multifile_with_explicit_packages.kt");
}
@Test
@TestMetadata("regular_multimodule.kt")
public void testRegular_multimodule() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule.kt");
runTest("native/native.tests/testData/samples/regular_multimodule.kt");
}
@Test
@TestMetadata("regular_multimodule_implicit_first_module.kt")
public void testRegular_multimodule_implicit_first_module() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule_implicit_first_module.kt");
runTest("native/native.tests/testData/samples/regular_multimodule_implicit_first_module.kt");
}
@Test
@TestMetadata("regular_multimodule_implicit_first_module_with_header_comment.kt")
public void testRegular_multimodule_implicit_first_module_with_header_comment() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule_implicit_first_module_with_header_comment.kt");
runTest("native/native.tests/testData/samples/regular_multimodule_implicit_first_module_with_header_comment.kt");
}
@Test
@TestMetadata("regular_multimodule_implicit_first_module_with_header_statement.kt")
public void testRegular_multimodule_implicit_first_module_with_header_statement() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule_implicit_first_module_with_header_statement.kt");
runTest("native/native.tests/testData/samples/regular_multimodule_implicit_first_module_with_header_statement.kt");
}
@Test
@TestMetadata("regular_multimodule_with_header_comment.kt")
public void testRegular_multimodule_with_header_comment() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule_with_header_comment.kt");
runTest("native/native.tests/testData/samples/regular_multimodule_with_header_comment.kt");
}
@Test
@TestMetadata("regular_multimodule_with_header_statement.kt")
public void testRegular_multimodule_with_header_statement() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_multimodule_with_header_statement.kt");
runTest("native/native.tests/testData/samples/regular_multimodule_with_header_statement.kt");
}
@Test
@TestMetadata("regular_simple.kt")
public void testRegular_simple() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_simple.kt");
runTest("native/native.tests/testData/samples/regular_simple.kt");
}
@Test
@TestMetadata("regular_simple_explicit_kind.kt")
public void testRegular_simple_explicit_kind() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_simple_explicit_kind.kt");
runTest("native/native.tests/testData/samples/regular_simple_explicit_kind.kt");
}
@Test
@TestMetadata("regular_simple_with_output.kt")
public void testRegular_simple_with_output() throws Exception {
runTest("native/tests-blackbox/testData/samples/regular_simple_with_output.kt");
runTest("native/native.tests/testData/samples/regular_simple_with_output.kt");
}
@Test
@TestMetadata("standalone_multifile.kt")
public void testStandalone_multifile() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_multifile.kt");
runTest("native/native.tests/testData/samples/standalone_multifile.kt");
}
@Test
@TestMetadata("standalone_notr_multifile_entry_point.kt")
public void testStandalone_notr_multifile_entry_point() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_multifile_entry_point.kt");
runTest("native/native.tests/testData/samples/standalone_notr_multifile_entry_point.kt");
}
@Test
@TestMetadata("standalone_notr_simple.kt")
public void testStandalone_notr_simple() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple.kt");
}
@Test
@TestMetadata("standalone_notr_simple2.kt")
public void testStandalone_notr_simple2() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple2.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple2.kt");
}
@Test
@TestMetadata("standalone_notr_simple_entry_point.kt")
public void testStandalone_notr_simple_entry_point() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple_entry_point.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple_entry_point.kt");
}
@Test
@TestMetadata("standalone_notr_simple_entry_point2.kt")
public void testStandalone_notr_simple_entry_point2() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple_entry_point2.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple_entry_point2.kt");
}
@Test
@TestMetadata("standalone_notr_simple_with_input_and_output.kt")
public void testStandalone_notr_simple_with_input_and_output() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple_with_input_and_output.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple_with_input_and_output.kt");
}
@Test
@TestMetadata("standalone_notr_simple_with_output.kt")
public void testStandalone_notr_simple_with_output() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_notr_simple_with_output.kt");
runTest("native/native.tests/testData/samples/standalone_notr_simple_with_output.kt");
}
@Test
@TestMetadata("standalone_simple.kt")
public void testStandalone_simple() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_simple.kt");
runTest("native/native.tests/testData/samples/standalone_simple.kt");
}
@Test
@TestMetadata("standalone_simple_with_output.kt")
public void testStandalone_simple_with_output() throws Exception {
runTest("native/tests-blackbox/testData/samples/standalone_simple_with_output.kt");
runTest("native/native.tests/testData/samples/standalone_simple_with_output.kt");
}
@Nested
@TestMetadata("native/tests-blackbox/testData/samples/inner")
@TestMetadata("native/native.tests/testData/samples/inner")
@TestDataPath("$PROJECT_ROOT")
public class Inner {
@Test
public void testAllFilesPresentInInner() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/tests-blackbox/testData/samples/inner"), Pattern.compile("^(.+)\\.kt$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/samples/inner"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("regular_simple.kt")
public void testRegular_simple() throws Exception {
runTest("native/tests-blackbox/testData/samples/inner/regular_simple.kt");
runTest("native/native.tests/testData/samples/inner/regular_simple.kt");
}
}
}
@Nested
@TestMetadata("native/tests-blackbox/testData/samples2")
@TestMetadata("native/native.tests/testData/samples2")
@TestDataPath("$PROJECT_ROOT")
public class Samples2 {
@Test
public void testAllFilesPresentInSamples2() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/tests-blackbox/testData/samples2"), Pattern.compile("^(.+)\\.kt$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/samples2"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("regular_simple.kt")
public void testRegular_simple() throws Exception {
runTest("native/tests-blackbox/testData/samples2/regular_simple.kt");
runTest("native/native.tests/testData/samples2/regular_simple.kt");
}
}
}
@@ -14,7 +14,7 @@ fun main() {
System.setProperty("java.awt.headless", "true")
generateTestGroupSuiteWithJUnit5 {
testGroup("native/tests-blackbox/ext-tests-gen", "compiler/testData") {
testGroup("native/native.tests/ext-tests-gen", "compiler/testData") {
testClass<AbstractNativeBlackBoxTest>(
suiteTestClassName = "NativeExtBlackBoxTestGenerated",
annotations = listOf(
@@ -12,7 +12,7 @@ fun main() {
System.setProperty("java.awt.headless", "true")
generateTestGroupSuiteWithJUnit5 {
testGroup("native/tests-blackbox/tests-gen", "native/tests-blackbox/testData") {
testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
testClass<AbstractNativeBlackBoxTest> {
model("samples")
model("samples2")
+2 -2
View File
@@ -172,7 +172,7 @@ include ":benchmarks",
":native:kotlin-klib-commonizer",
":native:kotlin-klib-commonizer-api",
":native:kotlin-klib-commonizer-embeddable",
":native:tests-blackbox.native",
":native:native.tests",
":core:compiler.common",
":core:compiler.common.jvm",
":compiler:backend.common.jvm",
@@ -590,7 +590,7 @@ project(':kotlin-util-klib').projectDir = "$rootDir/compiler/util-klib" as File
project(':kotlin-util-klib-metadata').projectDir = "$rootDir/compiler/util-klib-metadata" as File
project(':native:kotlin-native-utils').projectDir = "$rootDir/native/utils" as File
project(':native:frontend.native').projectDir = "$rootDir/native/frontend" as File
project(':native:tests-blackbox.native').projectDir = "$rootDir/native/tests-blackbox" as File
project(':native:native.tests').projectDir = "$rootDir/native/native.tests" as File
project(':native:kotlin-klib-commonizer').projectDir = "$rootDir/native/commonizer" as File
project(":native:kotlin-klib-commonizer-api").projectDir = "$rootDir/native/commonizer-api" as File
project(':native:kotlin-klib-commonizer-embeddable').projectDir = "$rootDir/native/commonizer-embeddable" as File