From c35e0262593d4154e1f618d05b4e3aa80f5646cd Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Wed, 27 Dec 2023 09:34:08 +0200 Subject: [PATCH] [K/N][tests] Moved several tests to proper location --- .../eagerInitialization/global1.kt} | 0 .../eagerInitialization/global2.kt} | 0 .../eagerInitialization/threadLocal1.kt} | 0 .../eagerInitialization/threadLocal2.kt} | 0 .../globalInitedAfterAccessingFile.kt | 0 .../globalInitedBeforeThreadLocal.kt | 0 ...alNotInitedAfterAccessingClassInternals.kt | 0 .../{correctOrder3.kt => files/simple.kt} | 0 .../initializers/{ => files}/workers1.kt | 0 .../initializers/{ => files}/workers2.kt | 0 .../FirNativeCodegenLocalTestGenerated.java | 140 +++++++++++------- .../NativeCodegenLocalTestGenerated.java | 136 ++++++++++------- 12 files changed, 162 insertions(+), 114 deletions(-) rename native/native.tests/testData/codegen/initializers/{eagerInitializationGlobal1.kt => files/eagerInitialization/global1.kt} (100%) rename native/native.tests/testData/codegen/initializers/{eagerInitializationGlobal2.kt => files/eagerInitialization/global2.kt} (100%) rename native/native.tests/testData/codegen/initializers/{eagerInitializationThreadLocal1.kt => files/eagerInitialization/threadLocal1.kt} (100%) rename native/native.tests/testData/codegen/initializers/{eagerInitializationThreadLocal2.kt => files/eagerInitialization/threadLocal2.kt} (100%) rename native/native.tests/testData/codegen/initializers/{ => files}/globalInitedAfterAccessingFile.kt (100%) rename native/native.tests/testData/codegen/initializers/{ => files}/globalInitedBeforeThreadLocal.kt (100%) rename native/native.tests/testData/codegen/initializers/{ => files}/globalNotInitedAfterAccessingClassInternals.kt (100%) rename native/native.tests/testData/codegen/initializers/{correctOrder3.kt => files/simple.kt} (100%) rename native/native.tests/testData/codegen/initializers/{ => files}/workers1.kt (100%) rename native/native.tests/testData/codegen/initializers/{ => files}/workers2.kt (100%) diff --git a/native/native.tests/testData/codegen/initializers/eagerInitializationGlobal1.kt b/native/native.tests/testData/codegen/initializers/files/eagerInitialization/global1.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/eagerInitializationGlobal1.kt rename to native/native.tests/testData/codegen/initializers/files/eagerInitialization/global1.kt diff --git a/native/native.tests/testData/codegen/initializers/eagerInitializationGlobal2.kt b/native/native.tests/testData/codegen/initializers/files/eagerInitialization/global2.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/eagerInitializationGlobal2.kt rename to native/native.tests/testData/codegen/initializers/files/eagerInitialization/global2.kt diff --git a/native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal1.kt b/native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal1.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal1.kt rename to native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal1.kt diff --git a/native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal2.kt b/native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal2.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal2.kt rename to native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal2.kt diff --git a/native/native.tests/testData/codegen/initializers/globalInitedAfterAccessingFile.kt b/native/native.tests/testData/codegen/initializers/files/globalInitedAfterAccessingFile.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/globalInitedAfterAccessingFile.kt rename to native/native.tests/testData/codegen/initializers/files/globalInitedAfterAccessingFile.kt diff --git a/native/native.tests/testData/codegen/initializers/globalInitedBeforeThreadLocal.kt b/native/native.tests/testData/codegen/initializers/files/globalInitedBeforeThreadLocal.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/globalInitedBeforeThreadLocal.kt rename to native/native.tests/testData/codegen/initializers/files/globalInitedBeforeThreadLocal.kt diff --git a/native/native.tests/testData/codegen/initializers/globalNotInitedAfterAccessingClassInternals.kt b/native/native.tests/testData/codegen/initializers/files/globalNotInitedAfterAccessingClassInternals.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/globalNotInitedAfterAccessingClassInternals.kt rename to native/native.tests/testData/codegen/initializers/files/globalNotInitedAfterAccessingClassInternals.kt diff --git a/native/native.tests/testData/codegen/initializers/correctOrder3.kt b/native/native.tests/testData/codegen/initializers/files/simple.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/correctOrder3.kt rename to native/native.tests/testData/codegen/initializers/files/simple.kt diff --git a/native/native.tests/testData/codegen/initializers/workers1.kt b/native/native.tests/testData/codegen/initializers/files/workers1.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/workers1.kt rename to native/native.tests/testData/codegen/initializers/files/workers1.kt diff --git a/native/native.tests/testData/codegen/initializers/workers2.kt b/native/native.tests/testData/codegen/initializers/files/workers2.kt similarity index 100% rename from native/native.tests/testData/codegen/initializers/workers2.kt rename to native/native.tests/testData/codegen/initializers/files/workers2.kt diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java index e4a9e62bf3c..95b80ce5056 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java @@ -1953,54 +1953,6 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox runTest("native/native.tests/testData/codegen/initializers/correctOrder2.kt"); } - @Test - @TestMetadata("correctOrder3.kt") - public void testCorrectOrder3() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/correctOrder3.kt"); - } - - @Test - @TestMetadata("eagerInitializationGlobal1.kt") - public void testEagerInitializationGlobal1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationGlobal1.kt"); - } - - @Test - @TestMetadata("eagerInitializationGlobal2.kt") - public void testEagerInitializationGlobal2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationGlobal2.kt"); - } - - @Test - @TestMetadata("eagerInitializationThreadLocal1.kt") - public void testEagerInitializationThreadLocal1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal1.kt"); - } - - @Test - @TestMetadata("eagerInitializationThreadLocal2.kt") - public void testEagerInitializationThreadLocal2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal2.kt"); - } - - @Test - @TestMetadata("globalInitedAfterAccessingFile.kt") - public void testGlobalInitedAfterAccessingFile() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalInitedAfterAccessingFile.kt"); - } - - @Test - @TestMetadata("globalInitedBeforeThreadLocal.kt") - public void testGlobalInitedBeforeThreadLocal() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalInitedBeforeThreadLocal.kt"); - } - - @Test - @TestMetadata("globalNotInitedAfterAccessingClassInternals.kt") - public void testGlobalNotInitedAfterAccessingClassInternals() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalNotInitedAfterAccessingClassInternals.kt"); - } - @Test @TestMetadata("object.kt") public void testObject() throws Exception { @@ -2109,16 +2061,90 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox runTest("native/native.tests/testData/codegen/initializers/while3.kt"); } - @Test - @TestMetadata("workers1.kt") - public void testWorkers1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/workers1.kt"); - } + @Nested + @TestMetadata("native/native.tests/testData/codegen/initializers/files") + @TestDataPath("$PROJECT_ROOT") + @Tag("frontend-fir") + @FirPipeline() + @UseExtTestCaseGroupProvider() + public class Files { + @Test + public void testAllFilesPresentInFiles() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/initializers/files"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } - @Test - @TestMetadata("workers2.kt") - public void testWorkers2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/workers2.kt"); + @Test + @TestMetadata("globalInitedAfterAccessingFile.kt") + public void testGlobalInitedAfterAccessingFile() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalInitedAfterAccessingFile.kt"); + } + + @Test + @TestMetadata("globalInitedBeforeThreadLocal.kt") + public void testGlobalInitedBeforeThreadLocal() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalInitedBeforeThreadLocal.kt"); + } + + @Test + @TestMetadata("globalNotInitedAfterAccessingClassInternals.kt") + public void testGlobalNotInitedAfterAccessingClassInternals() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalNotInitedAfterAccessingClassInternals.kt"); + } + + @Test + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/simple.kt"); + } + + @Test + @TestMetadata("workers1.kt") + public void testWorkers1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/workers1.kt"); + } + + @Test + @TestMetadata("workers2.kt") + public void testWorkers2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/workers2.kt"); + } + + @Nested + @TestMetadata("native/native.tests/testData/codegen/initializers/files/eagerInitialization") + @TestDataPath("$PROJECT_ROOT") + @Tag("frontend-fir") + @FirPipeline() + @UseExtTestCaseGroupProvider() + public class EagerInitialization { + @Test + public void testAllFilesPresentInEagerInitialization() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/initializers/files/eagerInitialization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } + + @Test + @TestMetadata("global1.kt") + public void testGlobal1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/global1.kt"); + } + + @Test + @TestMetadata("global2.kt") + public void testGlobal2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/global2.kt"); + } + + @Test + @TestMetadata("threadLocal1.kt") + public void testThreadLocal1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal1.kt"); + } + + @Test + @TestMetadata("threadLocal2.kt") + public void testThreadLocal2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal2.kt"); + } + } } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java index 9a88c5a722f..cb4bcb9953d 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java @@ -1907,54 +1907,6 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes runTest("native/native.tests/testData/codegen/initializers/correctOrder2.kt"); } - @Test - @TestMetadata("correctOrder3.kt") - public void testCorrectOrder3() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/correctOrder3.kt"); - } - - @Test - @TestMetadata("eagerInitializationGlobal1.kt") - public void testEagerInitializationGlobal1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationGlobal1.kt"); - } - - @Test - @TestMetadata("eagerInitializationGlobal2.kt") - public void testEagerInitializationGlobal2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationGlobal2.kt"); - } - - @Test - @TestMetadata("eagerInitializationThreadLocal1.kt") - public void testEagerInitializationThreadLocal1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal1.kt"); - } - - @Test - @TestMetadata("eagerInitializationThreadLocal2.kt") - public void testEagerInitializationThreadLocal2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/eagerInitializationThreadLocal2.kt"); - } - - @Test - @TestMetadata("globalInitedAfterAccessingFile.kt") - public void testGlobalInitedAfterAccessingFile() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalInitedAfterAccessingFile.kt"); - } - - @Test - @TestMetadata("globalInitedBeforeThreadLocal.kt") - public void testGlobalInitedBeforeThreadLocal() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalInitedBeforeThreadLocal.kt"); - } - - @Test - @TestMetadata("globalNotInitedAfterAccessingClassInternals.kt") - public void testGlobalNotInitedAfterAccessingClassInternals() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/globalNotInitedAfterAccessingClassInternals.kt"); - } - @Test @TestMetadata("object.kt") public void testObject() throws Exception { @@ -2063,16 +2015,86 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes runTest("native/native.tests/testData/codegen/initializers/while3.kt"); } - @Test - @TestMetadata("workers1.kt") - public void testWorkers1() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/workers1.kt"); - } + @Nested + @TestMetadata("native/native.tests/testData/codegen/initializers/files") + @TestDataPath("$PROJECT_ROOT") + @UseExtTestCaseGroupProvider() + public class Files { + @Test + public void testAllFilesPresentInFiles() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/initializers/files"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } - @Test - @TestMetadata("workers2.kt") - public void testWorkers2() throws Exception { - runTest("native/native.tests/testData/codegen/initializers/workers2.kt"); + @Test + @TestMetadata("globalInitedAfterAccessingFile.kt") + public void testGlobalInitedAfterAccessingFile() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalInitedAfterAccessingFile.kt"); + } + + @Test + @TestMetadata("globalInitedBeforeThreadLocal.kt") + public void testGlobalInitedBeforeThreadLocal() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalInitedBeforeThreadLocal.kt"); + } + + @Test + @TestMetadata("globalNotInitedAfterAccessingClassInternals.kt") + public void testGlobalNotInitedAfterAccessingClassInternals() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/globalNotInitedAfterAccessingClassInternals.kt"); + } + + @Test + @TestMetadata("simple.kt") + public void testSimple() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/simple.kt"); + } + + @Test + @TestMetadata("workers1.kt") + public void testWorkers1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/workers1.kt"); + } + + @Test + @TestMetadata("workers2.kt") + public void testWorkers2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/workers2.kt"); + } + + @Nested + @TestMetadata("native/native.tests/testData/codegen/initializers/files/eagerInitialization") + @TestDataPath("$PROJECT_ROOT") + @UseExtTestCaseGroupProvider() + public class EagerInitialization { + @Test + public void testAllFilesPresentInEagerInitialization() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen/initializers/files/eagerInitialization"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); + } + + @Test + @TestMetadata("global1.kt") + public void testGlobal1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/global1.kt"); + } + + @Test + @TestMetadata("global2.kt") + public void testGlobal2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/global2.kt"); + } + + @Test + @TestMetadata("threadLocal1.kt") + public void testThreadLocal1() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal1.kt"); + } + + @Test + @TestMetadata("threadLocal2.kt") + public void testThreadLocal2() throws Exception { + runTest("native/native.tests/testData/codegen/initializers/files/eagerInitialization/threadLocal2.kt"); + } + } } }