diff --git a/native/native.tests/testData/klibContents/annotations.kt b/native/native.tests/testData/klib/dump-metadata/annotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/annotations.kt rename to native/native.tests/testData/klib/dump-metadata/annotations.kt diff --git a/native/native.tests/testData/klibContents/annotations.txt b/native/native.tests/testData/klib/dump-metadata/annotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/annotations.txt rename to native/native.tests/testData/klib/dump-metadata/annotations.txt diff --git a/native/native.tests/testData/klibContents/annotations_source_retention.kt b/native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt similarity index 100% rename from native/native.tests/testData/klibContents/annotations_source_retention.kt rename to native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt diff --git a/native/native.tests/testData/klibContents/annotations_source_retention.txt b/native/native.tests/testData/klib/dump-metadata/annotations_source_retention.txt similarity index 100% rename from native/native.tests/testData/klibContents/annotations_source_retention.txt rename to native/native.tests/testData/klib/dump-metadata/annotations_source_retention.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/simple.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/simple.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/simple.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/simple.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.txt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt diff --git a/native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.txt b/native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.txt similarity index 100% rename from native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.txt rename to native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.txt diff --git a/native/native.tests/testData/klibContents/data_class.kt b/native/native.tests/testData/klib/dump-metadata/data_class.kt similarity index 100% rename from native/native.tests/testData/klibContents/data_class.kt rename to native/native.tests/testData/klib/dump-metadata/data_class.kt diff --git a/native/native.tests/testData/klibContents/data_class.txt b/native/native.tests/testData/klib/dump-metadata/data_class.txt similarity index 100% rename from native/native.tests/testData/klibContents/data_class.txt rename to native/native.tests/testData/klib/dump-metadata/data_class.txt diff --git a/native/native.tests/testData/klibContents/klib/fieldAnnotations.kt b/native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/klib/fieldAnnotations.kt rename to native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt diff --git a/native/native.tests/testData/klibContents/klib/fieldAnnotations.txt b/native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/klib/fieldAnnotations.txt rename to native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.txt diff --git a/native/native.tests/testData/klibContents/klib/receiverAnnotations.kt b/native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/klib/receiverAnnotations.kt rename to native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt diff --git a/native/native.tests/testData/klibContents/klib/receiverAnnotations.txt b/native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/klib/receiverAnnotations.txt rename to native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.txt diff --git a/native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt b/native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt similarity index 100% rename from native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt rename to native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt diff --git a/native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.txt b/native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.txt similarity index 100% rename from native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.txt rename to native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.txt diff --git a/native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt b/native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt rename to native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt diff --git a/native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.txt b/native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.txt rename to native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.txt diff --git a/native/native.tests/testData/klibContents/property_accessors.kt b/native/native.tests/testData/klib/dump-metadata/property_accessors.kt similarity index 100% rename from native/native.tests/testData/klibContents/property_accessors.kt rename to native/native.tests/testData/klib/dump-metadata/property_accessors.kt diff --git a/native/native.tests/testData/klibContents/property_accessors.txt b/native/native.tests/testData/klib/dump-metadata/property_accessors.txt similarity index 100% rename from native/native.tests/testData/klibContents/property_accessors.txt rename to native/native.tests/testData/klib/dump-metadata/property_accessors.txt diff --git a/native/native.tests/testData/klibContents/type_annotations.kt b/native/native.tests/testData/klib/dump-metadata/type_annotations.kt similarity index 100% rename from native/native.tests/testData/klibContents/type_annotations.kt rename to native/native.tests/testData/klib/dump-metadata/type_annotations.kt diff --git a/native/native.tests/testData/klibContents/type_annotations.txt b/native/native.tests/testData/klib/dump-metadata/type_annotations.txt similarity index 100% rename from native/native.tests/testData/klibContents/type_annotations.txt rename to native/native.tests/testData/klib/dump-metadata/type_annotations.txt diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibContentsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java similarity index 58% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibContentsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java index d0b2ec46724..5486291eea2 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibContentsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java @@ -18,199 +18,199 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("native/native.tests/testData/klibContents") +@TestMetadata("native/native.tests/testData/klib/dump-metadata") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() -public class FirNativeKlibContentsTestGenerated extends AbstractNativeKlibContentsTest { +public class FirNativeKlibDumpMetadataTestGenerated extends AbstractNativeKlibDumpMetadataTest { @Test - public void testAllFilesPresentInKlibContents() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true); + public void testAllFilesPresentInDump_metadata() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotations.kt") public void testAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/annotations.kt"); } @Test @TestMetadata("annotations_source_retention.kt") public void testAnnotations_source_retention() throws Exception { - runTest("native/native.tests/testData/klibContents/annotations_source_retention.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt"); } @Test @TestMetadata("data_class.kt") public void testData_class() throws Exception { - runTest("native/native.tests/testData/klibContents/data_class.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/data_class.kt"); } @Test @TestMetadata("kt55464_serializeTypeAnnotation.kt") public void testKt55464_serializeTypeAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt"); } @Test @TestMetadata("kt56018_value_parameters_annotations.kt") public void testKt56018_value_parameters_annotations() throws Exception { - runTest("native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt"); } @Test @TestMetadata("property_accessors.kt") public void testProperty_accessors() throws Exception { - runTest("native/native.tests/testData/klibContents/property_accessors.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/property_accessors.kt"); } @Test @TestMetadata("type_annotations.kt") public void testType_annotations() throws Exception { - runTest("native/native.tests/testData/klibContents/type_annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/type_annotations.kt"); } @Nested - @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() public class BuiltinsSerializer { @Test public void testAllFilesPresentInBuiltinsSerializer() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotatedEnumEntry.kt") public void testAnnotatedEnumEntry() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt"); } @Test @TestMetadata("annotationTargets.kt") public void testAnnotationTargets() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt"); } @Test @TestMetadata("binaryRetainedAnnotation.kt") public void testBinaryRetainedAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt"); } @Test @TestMetadata("compileTimeConstants.kt") public void testCompileTimeConstants() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt"); } @Test @TestMetadata("nestedClassesAndObjects.kt") public void testNestedClassesAndObjects() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt"); } @Test @TestMetadata("propertyAccessorAnnotations.kt") public void testPropertyAccessorAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/simple.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt"); } @Test @TestMetadata("sourceRetainedAnnotation.kt") public void testSourceRetainedAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt"); } @Test @TestMetadata("stringConcatenation.kt") public void testStringConcatenation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt"); } @Test @TestMetadata("typeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt"); } @Nested - @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() public class AnnotationArguments { @Test public void testAllFilesPresentInAnnotationArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt"); } @Test @TestMetadata("enum.kt") public void testEnum() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt"); } @Test @TestMetadata("primitiveArrays.kt") public void testPrimitiveArrays() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt"); } @Test @TestMetadata("primitives.kt") public void testPrimitives() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt"); } @Test @TestMetadata("string.kt") public void testString() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt"); } @Test @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt"); } } } @Nested - @TestMetadata("native/native.tests/testData/klibContents/klib") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/klib") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() public class Klib { @Test public void testAllFilesPresentInKlib() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("fieldAnnotations.kt") public void testFieldAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/klib/fieldAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt"); } @Test @TestMetadata("receiverAnnotations.kt") public void testReceiverAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/klib/receiverAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt"); } } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibContentsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java similarity index 56% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibContentsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java index 9e0916647ee..1ddd7753851 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibContentsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java @@ -16,191 +16,191 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("native/native.tests/testData/klibContents") +@TestMetadata("native/native.tests/testData/klib/dump-metadata") @TestDataPath("$PROJECT_ROOT") -public class NativeKlibContentsTestGenerated extends AbstractNativeKlibContentsTest { +public class NativeKlibDumpMetadataTestGenerated extends AbstractNativeKlibDumpMetadataTest { @Test - public void testAllFilesPresentInKlibContents() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true); + public void testAllFilesPresentInDump_metadata() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotations.kt") public void testAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/annotations.kt"); } @Test @TestMetadata("annotations_source_retention.kt") public void testAnnotations_source_retention() throws Exception { - runTest("native/native.tests/testData/klibContents/annotations_source_retention.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt"); } @Test @TestMetadata("data_class.kt") public void testData_class() throws Exception { - runTest("native/native.tests/testData/klibContents/data_class.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/data_class.kt"); } @Test @TestMetadata("kt55464_serializeTypeAnnotation.kt") public void testKt55464_serializeTypeAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt"); } @Test @TestMetadata("kt56018_value_parameters_annotations.kt") public void testKt56018_value_parameters_annotations() throws Exception { - runTest("native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt"); } @Test @TestMetadata("property_accessors.kt") public void testProperty_accessors() throws Exception { - runTest("native/native.tests/testData/klibContents/property_accessors.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/property_accessors.kt"); } @Test @TestMetadata("type_annotations.kt") public void testType_annotations() throws Exception { - runTest("native/native.tests/testData/klibContents/type_annotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/type_annotations.kt"); } @Nested - @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer") @TestDataPath("$PROJECT_ROOT") public class BuiltinsSerializer { @Test public void testAllFilesPresentInBuiltinsSerializer() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotatedEnumEntry.kt") public void testAnnotatedEnumEntry() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt"); } @Test @TestMetadata("annotationTargets.kt") public void testAnnotationTargets() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt"); } @Test @TestMetadata("binaryRetainedAnnotation.kt") public void testBinaryRetainedAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt"); } @Test @TestMetadata("compileTimeConstants.kt") public void testCompileTimeConstants() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt"); } @Test @TestMetadata("nestedClassesAndObjects.kt") public void testNestedClassesAndObjects() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt"); } @Test @TestMetadata("propertyAccessorAnnotations.kt") public void testPropertyAccessorAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/simple.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt"); } @Test @TestMetadata("sourceRetainedAnnotation.kt") public void testSourceRetainedAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt"); } @Test @TestMetadata("stringConcatenation.kt") public void testStringConcatenation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt"); } @Test @TestMetadata("typeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt"); } @Nested - @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments") @TestDataPath("$PROJECT_ROOT") public class AnnotationArguments { @Test public void testAllFilesPresentInAnnotationArguments() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt"); } @Test @TestMetadata("enum.kt") public void testEnum() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt"); } @Test @TestMetadata("primitiveArrays.kt") public void testPrimitiveArrays() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt"); } @Test @TestMetadata("primitives.kt") public void testPrimitives() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt"); } @Test @TestMetadata("string.kt") public void testString() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt"); } @Test @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt"); } } } @Nested - @TestMetadata("native/native.tests/testData/klibContents/klib") + @TestMetadata("native/native.tests/testData/klib/dump-metadata/klib") @TestDataPath("$PROJECT_ROOT") public class Klib { @Test public void testAllFilesPresentInKlib() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("fieldAnnotations.kt") public void testFieldAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/klib/fieldAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt"); } @Test @TestMetadata("receiverAnnotations.kt") public void testReceiverAnnotations() throws Exception { - runTest("native/native.tests/testData/klibContents/klib/receiverAnnotations.kt"); + runTest("native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt"); } } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index 5c6e66a3ed5..a46b3051f62 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -193,22 +193,22 @@ fun main() { } } - // Klib contents tests + // Dump KLIB metadata tests testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { - testClass( - suiteTestClassName = "NativeKlibContentsTestGenerated" + testClass( + suiteTestClassName = "NativeKlibDumpMetadataTestGenerated" ) { - model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true) + model("klib/dump-metadata", pattern = "^([^_](.+)).kt$", recursive = true) } } testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { - testClass( - suiteTestClassName = "FirNativeKlibContentsTestGenerated", + testClass( + suiteTestClassName = "FirNativeKlibDumpMetadataTestGenerated", annotations = listOf( *frontendFir() ) ) { - model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true) + model("klib/dump-metadata", pattern = "^([^_](.+)).kt$", recursive = true) } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt similarity index 97% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt index 86ae9ce60c1..957b43eba7e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt @@ -21,7 +21,7 @@ import java.io.File @Tag("klib") @UsePartialLinkage(UsePartialLinkage.Mode.DISABLED) -abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() { +abstract class AbstractNativeKlibDumpMetadataTest : AbstractNativeSimpleTest() { protected fun runTest(@TestDataFile testPath: String) { val testPathFull = getAbsoluteFile(testPath)