From 690d18e54184045c4d8457effa1eeac88ebafa52 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 13 Sep 2023 20:41:59 +0200 Subject: [PATCH] [K/N, Test] Move test code "org.jetbrains.kotlin.konan" -> "org.jetbrains.kotlin.konan.test.*" --- kotlin-native/HACKING.md | 2 +- .../CInteropExperimentalTestGenerated.java | 2 +- .../CInteropFModulesTestGenerated.java | 2 +- ...InteropIncludeCategoriesTestGenerated.java | 2 +- .../CInteropKT39120TestGenerated.java | 2 +- .../CInteropNoFModulesTestGenerated.java | 2 +- .../FirInfrastructureTestGenerated.java | 6 ++-- ...FirNativeCInteropLibraryAbiReaderTest.java | 4 +-- .../FirNativeCodegenBoxTestGenerated.java | 6 ++-- .../FirNativeCodegenBoxTestNoPLGenerated.java | 10 +++--- ...tiveHeaderKlibComparisonTestGenerated.java | 4 +-- ...iveHeaderKlibCompilationTestGenerated.java | 4 +-- .../FirNativeKlibDumpIrTestGenerated.java | 4 +-- ...irNativeKlibDumpMetadataTestGenerated.java | 4 +-- .../FirNativeKlibEvolutionTestGenerated.java | 4 +-- .../FirNativeLibraryAbiReaderTest.java | 4 +-- .../FirNativePartialLinkageTestGenerated.java | 4 +-- .../blackbox}/FirObjCExportTestGenerated.java | 4 +-- .../InfrastructureTestGenerated.java | 4 +-- .../blackbox}/LldbTestGenerated.java | 10 +++--- .../NativeCInteropLibraryAbiReaderTest.java | 2 +- .../NativeCodegenBoxTestGenerated.java | 8 ++--- .../NativeCodegenBoxTestNoPLGenerated.java | 8 ++--- ...tiveHeaderKlibComparisonTestGenerated.java | 2 +- ...iveHeaderKlibCompilationTestGenerated.java | 2 +- .../NativeKlibDumpIrTestGenerated.java | 2 +- .../NativeKlibDumpMetadataTestGenerated.java | 2 +- .../NativeKlibEvolutionTestGenerated.java | 2 +- .../blackbox}/NativeLibraryAbiReaderTest.java | 2 +- .../NativePartialLinkageTestGenerated.java | 2 +- .../blackbox}/ObjCExportTestGenerated.java | 2 +- .../DiagnosticsNativeTestGenerated.java | 2 +- ...rontendNativeDiagnosticsTestGenerated.java | 4 +-- ...rontendNativeDiagnosticsTestGenerated.java | 4 +-- .../ClassicNativeIrTextTestGenerated.java | 2 +- .../generators/tests/GenerateNativeTests.kt | 21 ++++++------ .../support/group/TestCaseGroupProvider.kt | 14 -------- .../group/UseExtTestCaseGroupProvider.kt | 18 ----------- .../group/UseStandardTestCaseGroupProvider.kt | 18 ----------- .../ClassicFrontend2NativeIrConverter.kt | 4 +-- .../blackbox}/AbstractNativeBlackBoxTest.kt | 26 +++++++-------- .../AbstractNativeCInteropBaseTest.kt | 6 ++-- .../AbstractNativeCInteropKT39120Test.kt | 23 +++++++------ .../blackbox}/AbstractNativeCInteropTest.kt | 16 ++++------ .../blackbox}/AbstractNativeCodegenBoxTest.kt | 18 +++++------ .../blackbox}/AbstractNativeHeaderKlibTest.kt | 18 +++++------ .../blackbox}/AbstractNativeKlibDumpIrTest.kt | 29 +++++++---------- .../AbstractNativeKlibDumpMetadataTest.kt | 22 +++++++------ .../AbstractNativeKlibEvolutionTest.kt | 32 ++++++++----------- .../AbstractNativeLibraryAbiReaderTest.kt | 25 ++++++++------- .../AbstractNativeLinkerOutputTest.kt | 15 +++++---- .../blackbox}/AbstractNativeObjCExportTest.kt | 22 +++++++------ .../AbstractNativePartialLinkageTest.kt | 26 +++++++-------- .../blackbox}/AbstractNativeSimpleTest.kt | 16 +++++----- .../blackbox}/CachesAutoBuildTest.kt | 21 ++++++------ .../blackbox}/CompilerOutputTest.kt | 17 +++++----- .../blackbox}/IncrementalCompilationTest.kt | 22 ++++++------- .../InfrastructureCompressedNamesTest.kt | 12 +++---- .../InfrastructureDumpedTestListingTest.kt | 26 +++++++-------- .../InfrastructureGTestListingTest.kt | 11 ++++--- .../InfrastructureGlobsExpansionTest.kt | 8 ++--- .../InfrastructureNamedEntitiesTest.kt | 8 ++--- .../InfrastructureOutputFilterTest.kt | 13 ++++---- .../blackbox}/KT59030WorkaroundTest.kt | 20 ++++++------ .../blackbox}/KotlinTestLibraryTest.kt | 16 +++++----- .../blackbox}/LinkerOutputTestKT55578.kt | 12 +++---- .../blackbox}/NativeSimpleTestUtils.kt | 24 +++++++------- .../blackbox}/StdlibTest.kt | 22 ++++++------- .../support/ConfigurationProperties.kt | 4 +-- .../blackbox}/support/LoggedData.kt | 16 +++++----- .../blackbox}/support/NamedEntities.kt | 4 +-- .../blackbox}/support/NativeTestSupport.kt | 29 +++++++---------- .../blackbox}/support/TestCase.kt | 14 ++++---- .../blackbox}/support/TestDirectives.kt | 28 ++++++++-------- .../compilation/CompilationToolCall.kt | 6 ++-- .../NativeTestGroupingMessageCollector.kt | 4 +-- .../support/compilation/TestCompilation.kt | 30 ++++++++--------- .../compilation/TestCompilationArtifact.kt | 4 +-- .../compilation/TestCompilationDependency.kt | 11 ++++--- .../compilation/TestCompilationFactory.kt | 28 ++++++++-------- .../compilation/TestCompilationResult.kt | 6 ++-- .../group/ConditionallyDisabledTests.kt | 6 ++-- .../support/group/ExtTestCaseGroupProvider.kt | 14 ++++---- .../blackbox}/support/group/FirPipeline.kt | 4 +-- .../group/PredefinedTestCaseGroupProvider.kt | 22 ++++++------- .../support/group/PredefinedTestCases.kt | 8 ++--- .../group/StandardTestCaseGroupProvider.kt | 18 +++++------ .../support/group/TestCaseGroupProvider.kt | 14 ++++++++ .../group/UseExtTestCaseGroupProvider.kt | 18 +++++++++++ .../support/group/UsePartialLinkage.kt | 2 +- .../group/UseStandardTestCaseGroupProvider.kt | 18 +++++++++++ .../runner/AbstractLocalProcessRunner.kt | 14 ++++---- .../support/runner/AbstractRunner.kt | 6 ++-- .../support/runner/BaseTestRunProvider.kt | 12 +++---- .../support/runner/LocalTestNameExtractor.kt | 12 +++---- .../support/runner/LocalTestRunner.kt | 13 ++++---- .../support/runner/NoopTestRunner.kt | 4 +-- .../blackbox}/support/runner/RunResult.kt | 6 ++-- .../blackbox}/support/runner/Runner.kt | 4 +-- .../support/runner/RunnerWithExecutor.kt | 9 +++--- .../support/runner/SimpleTestRunProvider.kt | 8 ++--- .../blackbox}/support/runner/TestRun.kt | 14 ++++---- .../blackbox}/support/runner/TestRunChecks.kt | 6 ++-- .../support/runner/TestRunProvider.kt | 30 ++++++++--------- .../blackbox}/support/runner/TestRunners.kt | 18 ++++------- .../support/settings/SettingsContainers.kt | 4 +-- .../support/settings/SimpleTestRunSettings.kt | 6 ++-- .../support/settings/TestClassSettings.kt | 8 ++--- .../support/settings/TestConfiguration.java | 11 ++++--- .../support/settings/TestProcessSettings.kt | 14 ++++---- .../support/settings/TestRunSettings.kt | 8 ++--- .../blackbox}/support/util/Annotations.kt | 4 +-- .../blackbox}/support/util/ArgsBuilder.kt | 4 +-- .../blackbox}/support/util/Collections.kt | 4 +-- .../blackbox}/support/util/CompressedNames.kt | 6 ++-- .../blackbox}/support/util/Dependencies.kt | 4 +-- .../blackbox}/support/util/Disposables.kt | 4 +-- .../util/ExternalSourcesTransformation.kt | 6 ++-- .../blackbox}/support/util/Files.kt | 4 +-- .../blackbox}/support/util/Globs.kt | 4 +-- .../blackbox}/support/util/LLDBSessionSpec.kt | 6 ++-- .../blackbox}/support/util/MemoryTracker.kt | 4 +-- .../blackbox}/support/util/Names.kt | 4 +-- .../blackbox}/support/util/PackageNames.kt | 6 ++-- .../blackbox}/support/util/PsiNames.kt | 4 +-- .../support/util/PsiTransformation.kt | 4 +-- .../blackbox}/support/util/SafeEnvironment.kt | 4 +-- .../blackbox}/support/util/SourceDiscovery.kt | 6 ++-- .../support/util/TestCompilationArtifacts.kt | 6 ++-- .../blackbox}/support/util/TestListing.kt | 6 ++-- .../blackbox}/support/util/TestLogger.kt | 4 +-- .../blackbox}/support/util/TestOutput.kt | 8 ++--- .../blackbox}/support/util/ThreadSafe.kt | 8 ++--- .../blackbox}/support/util/TreeNode.kt | 6 ++-- .../AbstractDiagnosticsNativeTest.kt | 2 +- .../irtext/AbstractClassicNativeIrTextTest.kt | 4 +-- .../irtext/AbstractNativeIrTextTestBase.kt | 2 +- .../AtomicfuNativeTestGenerated.java | 4 +-- 138 files changed, 684 insertions(+), 690 deletions(-) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CInteropExperimentalTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CInteropFModulesTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CInteropIncludeCategoriesTestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CInteropKT39120TestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CInteropNoFModulesTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirInfrastructureTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeCInteropLibraryAbiReaderTest.java (91%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeCodegenBoxTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeCodegenBoxTestNoPLGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeHeaderKlibComparisonTestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeHeaderKlibCompilationTestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeKlibDumpIrTestGenerated.java (94%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeKlibDumpMetadataTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeKlibEvolutionTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativeLibraryAbiReaderTest.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirNativePartialLinkageTestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/FirObjCExportTestGenerated.java (91%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/LldbTestGenerated.java (91%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeCInteropLibraryAbiReaderTest.java (96%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeCodegenBoxTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeCodegenBoxTestNoPLGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeHeaderKlibComparisonTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeHeaderKlibCompilationTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeKlibDumpIrTestGenerated.java (97%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeKlibDumpMetadataTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeKlibEvolutionTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeLibraryAbiReaderTest.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativePartialLinkageTestGenerated.java (99%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/ObjCExportTestGenerated.java (96%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{ => test}/diagnostics/DiagnosticsNativeTestGenerated.java (98%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{ => test}/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java (96%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{ => test}/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java (96%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/{ => test}/irtext/ClassicNativeIrTextTestGenerated.java (99%) delete mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/TestCaseGroupProvider.kt delete mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseExtTestCaseGroupProvider.kt delete mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseStandardTestCaseGroupProvider.kt rename native/native.tests/tests/org/jetbrains/kotlin/konan/{ => test}/ClassicFrontend2NativeIrConverter.kt (98%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeBlackBoxTest.kt (79%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeCInteropBaseTest.kt (61%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeCInteropKT39120Test.kt (82%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeCInteropTest.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeCodegenBoxTest.kt (65%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeHeaderKlibTest.kt (85%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeKlibDumpIrTest.kt (68%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeKlibDumpMetadataTest.kt (72%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeKlibEvolutionTest.kt (89%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeLibraryAbiReaderTest.kt (85%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeLinkerOutputTest.kt (73%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeObjCExportTest.kt (76%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativePartialLinkageTest.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AbstractNativeSimpleTest.kt (62%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CachesAutoBuildTest.kt (84%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/CompilerOutputTest.kt (85%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/IncrementalCompilationTest.kt (97%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureCompressedNamesTest.kt (90%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureDumpedTestListingTest.kt (78%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureGTestListingTest.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureGlobsExpansionTest.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureNamedEntitiesTest.kt (88%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/InfrastructureOutputFilterTest.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/KT59030WorkaroundTest.kt (90%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/KotlinTestLibraryTest.kt (67%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/LinkerOutputTestKT55578.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/NativeSimpleTestUtils.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/StdlibTest.kt (77%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/ConfigurationProperties.kt (97%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/LoggedData.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/NamedEntities.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/NativeTestSupport.kt (95%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/TestCase.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/TestDirectives.kt (92%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/CompilationToolCall.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/NativeTestGroupingMessageCollector.kt (97%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/TestCompilation.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/TestCompilationArtifact.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/TestCompilationDependency.kt (75%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/TestCompilationFactory.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/compilation/TestCompilationResult.kt (90%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/ConditionallyDisabledTests.kt (69%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/ExtTestCaseGroupProvider.kt (98%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/FirPipeline.kt (62%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/PredefinedTestCaseGroupProvider.kt (86%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/PredefinedTestCases.kt (73%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/StandardTestCaseGroupProvider.kt (95%) create mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/TestCaseGroupProvider.kt create mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseExtTestCaseGroupProvider.kt rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/group/UsePartialLinkage.kt (85%) create mode 100644 native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseStandardTestCaseGroupProvider.kt rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/AbstractLocalProcessRunner.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/AbstractRunner.kt (88%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/BaseTestRunProvider.kt (84%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/LocalTestNameExtractor.kt (80%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/LocalTestRunner.kt (87%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/NoopTestRunner.kt (66%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/RunResult.kt (74%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/Runner.kt (60%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/RunnerWithExecutor.kt (89%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/SimpleTestRunProvider.kt (71%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/TestRun.kt (88%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/TestRunChecks.kt (88%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/TestRunProvider.kt (86%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/runner/TestRunners.kt (82%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/SettingsContainers.kt (95%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/SimpleTestRunSettings.kt (72%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/TestClassSettings.kt (87%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/TestConfiguration.java (55%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/TestProcessSettings.kt (95%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/settings/TestRunSettings.kt (70%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Annotations.kt (87%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/ArgsBuilder.kt (89%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Collections.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/CompressedNames.kt (91%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Dependencies.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Disposables.kt (85%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/ExternalSourcesTransformation.kt (82%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Files.kt (92%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Globs.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/LLDBSessionSpec.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/MemoryTracker.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/Names.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/PackageNames.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/PsiNames.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/PsiTransformation.kt (94%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/SafeEnvironment.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/SourceDiscovery.kt (87%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/TestCompilationArtifacts.kt (84%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/TestListing.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/TestLogger.kt (90%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/TestOutput.kt (96%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/ThreadSafe.kt (80%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/support/util/TreeNode.kt (93%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{ => test}/diagnostics/AbstractDiagnosticsNativeTest.kt (99%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{ => test}/irtext/AbstractClassicNativeIrTextTest.kt (90%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/{ => test}/irtext/AbstractNativeIrTextTestBase.kt (97%) rename plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/{blackboxtest => test/blackbox}/AtomicfuNativeTestGenerated.java (98%) diff --git a/kotlin-native/HACKING.md b/kotlin-native/HACKING.md index bfb226f78a5..c1a47e19d3d 100644 --- a/kotlin-native/HACKING.md +++ b/kotlin-native/HACKING.md @@ -73,7 +73,7 @@ To run blackbox compiler tests use: * **--tests** allows one to choose test suite(s) or test case(s) to run. - ./gradlew :native:native.tests:codegenBoxTest --tests "org.jetbrains.kotlin.konan.blackboxtest.NativeCodegenBoxTestGenerated\$Box\$*" + ./gradlew :native:native.tests:codegenBoxTest --tests "org.jetbrains.kotlin.konan.test.blackbox.NativeCodegenBoxTestGenerated\$Box\$*" * There are also Gradle project properties that can be used to control various aspects of blackbox tests. Example: diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropExperimentalTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropExperimentalTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropExperimentalTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropExperimentalTestGenerated.java index b005f361a67..d895a0fc05d 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropExperimentalTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropExperimentalTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropFModulesTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropFModulesTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropFModulesTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropFModulesTestGenerated.java index baf4325d98f..71aa6a056c8 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropFModulesTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropFModulesTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropIncludeCategoriesTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropIncludeCategoriesTestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropIncludeCategoriesTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropIncludeCategoriesTestGenerated.java index 77a66d265ea..5b0508fc774 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropIncludeCategoriesTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropIncludeCategoriesTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropKT39120TestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropKT39120TestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropKT39120TestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropKT39120TestGenerated.java index 035e07374e7..9c9f1893004 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropKT39120TestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropKT39120TestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropNoFModulesTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropNoFModulesTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropNoFModulesTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropNoFModulesTestGenerated.java index 94170a385d6..6e1666780a1 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/CInteropNoFModulesTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/CInteropNoFModulesTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirInfrastructureTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirInfrastructureTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirInfrastructureTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirInfrastructureTestGenerated.java index 1a7b2b7dccb..b6e84f1ae8b 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirInfrastructureTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirInfrastructureTestGenerated.java @@ -3,13 +3,13 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseStandardTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseStandardTestCaseGroupProvider; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCInteropLibraryAbiReaderTest.java similarity index 91% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCInteropLibraryAbiReaderTest.java index 45840982c0f..3c1a94101cc 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCInteropLibraryAbiReaderTest.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java index d1ccaf8a87d..32f6104a083 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java @@ -3,13 +3,13 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseExtTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseExtTestCaseGroupProvider; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.utils.TransformersFunctions; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java index 6625ab8e1b4..a6e68733f47 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java @@ -3,15 +3,15 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseExtTestCaseGroupProvider; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage.Mode; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseExtTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage.Mode; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.utils.TransformersFunctions; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibComparisonTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibComparisonTestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibComparisonTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibComparisonTestGenerated.java index cc3878c5e54..abefc786606 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibComparisonTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibComparisonTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibCompilationTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibCompilationTestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibCompilationTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibCompilationTestGenerated.java index 5c567fa98e0..76f6af669da 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeHeaderKlibCompilationTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeHeaderKlibCompilationTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpIrTestGenerated.java similarity index 94% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpIrTestGenerated.java index 95d1691fd09..f99dff3b015 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpIrTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpMetadataTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpMetadataTestGenerated.java index 5486291eea2..587e743ab67 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibDumpMetadataTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibEvolutionTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibEvolutionTestGenerated.java index 7a232833cae..1c00290d730 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibEvolutionTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeKlibEvolutionTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeLibraryAbiReaderTest.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeLibraryAbiReaderTest.java index 6e6913984c1..5ce46cd8db5 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeLibraryAbiReaderTest.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativePartialLinkageTestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativePartialLinkageTestGenerated.java index 94ef483fcae..619500a140b 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativePartialLinkageTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativePartialLinkageTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirObjCExportTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirObjCExportTestGenerated.java similarity index 91% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirObjCExportTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirObjCExportTestGenerated.java index b3166490162..488e77fb48f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirObjCExportTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirObjCExportTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureTestGenerated.java index 884332cd15f..59f7770fd3f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseStandardTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseStandardTestCaseGroupProvider; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/LldbTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/LldbTestGenerated.java similarity index 91% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/LldbTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/LldbTestGenerated.java index 497dd936cbb..34800a9c9cf 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/LldbTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/LldbTestGenerated.java @@ -3,15 +3,15 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseStandardTestCaseGroupProvider; -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedProperty; -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty; -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseStandardTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedProperty; +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty; +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCInteropLibraryAbiReaderTest.java similarity index 96% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCInteropLibraryAbiReaderTest.java index dcaa6ae3004..d2ba8416bbe 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCInteropLibraryAbiReaderTest.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java index cf94950b91a..1bf91b773c5 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java @@ -3,13 +3,13 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseExtTestCaseGroupProvider; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTestsIfProperty; -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseExtTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.DisabledTestsIfProperty; +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.utils.TransformersFunctions; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java index c5d429326c1..a4a4980cb0a 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java @@ -3,13 +3,13 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseExtTestCaseGroupProvider; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage.Mode; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseExtTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage.Mode; import org.junit.jupiter.api.Tag; import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.utils.TransformersFunctions; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibComparisonTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibComparisonTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibComparisonTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibComparisonTestGenerated.java index 4c97fe792f4..362c98eba8e 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibComparisonTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibComparisonTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibCompilationTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibCompilationTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibCompilationTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibCompilationTestGenerated.java index 489083b0ee9..cbc695376ab 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeHeaderKlibCompilationTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeHeaderKlibCompilationTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpIrTestGenerated.java similarity index 97% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpIrTestGenerated.java index 1e9d0df259c..bb762c64632 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpIrTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpMetadataTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpMetadataTestGenerated.java index 1ddd7753851..53bfed4d969 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibDumpMetadataTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibEvolutionTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibEvolutionTestGenerated.java index 0df6223deec..f816b8e7943 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibEvolutionTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeKlibEvolutionTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeLibraryAbiReaderTest.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeLibraryAbiReaderTest.java index 6a50cc8736e..9da4866535f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeLibraryAbiReaderTest.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativePartialLinkageTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativePartialLinkageTestGenerated.java index ef76bc96c49..16046f12fc8 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativePartialLinkageTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativePartialLinkageTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/ObjCExportTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/ObjCExportTestGenerated.java similarity index 96% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/ObjCExportTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/ObjCExportTestGenerated.java index f077d7c5477..0aae6c7117f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/ObjCExportTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/ObjCExportTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/DiagnosticsNativeTestGenerated.java similarity index 98% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/DiagnosticsNativeTestGenerated.java index 9f92a30af5e..fd7f4426917 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/DiagnosticsNativeTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/DiagnosticsNativeTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.diagnostics; +package org.jetbrains.kotlin.konan.test.diagnostics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java similarity index 96% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java index df20883cd28..643bd744df4 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirLightTreeOldFrontendNativeDiagnosticsTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.diagnostics; +package org.jetbrains.kotlin.konan.test.diagnostics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java similarity index 96% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java index 41360728323..1d995156783 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/diagnostics/FirPsiOldFrontendNativeDiagnosticsTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.diagnostics; +package org.jetbrains.kotlin.konan.test.diagnostics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/irtext/ClassicNativeIrTextTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java similarity index 99% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/irtext/ClassicNativeIrTextTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java index f07a5bf0c2f..0f4ce2edaf5 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/irtext/ClassicNativeIrTextTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java @@ -3,7 +3,7 @@ * 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.konan.irtext; +package org.jetbrains.kotlin.konan.test.irtext; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; 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 93857d1b615..fdd42162d7f 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 @@ -9,18 +9,15 @@ import org.jetbrains.kotlin.generators.TestGroup import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 import org.jetbrains.kotlin.generators.model.AnnotationModel import org.jetbrains.kotlin.generators.model.annotation -import org.jetbrains.kotlin.konan.blackboxtest.* -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.group.* -import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTestsIfProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.diagnostics.AbstractDiagnosticsNativeTest -import org.jetbrains.kotlin.konan.diagnostics.AbstractFirLightTreeNativeDiagnosticsTest -import org.jetbrains.kotlin.konan.diagnostics.AbstractFirPsiNativeDiagnosticsTest -import org.jetbrains.kotlin.konan.irtext.AbstractClassicNativeIrTextTest +import org.jetbrains.kotlin.konan.test.blackbox.* +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.group.* +import org.jetbrains.kotlin.konan.test.diagnostics.AbstractDiagnosticsNativeTest +import org.jetbrains.kotlin.konan.test.diagnostics.AbstractFirLightTreeNativeDiagnosticsTest +import org.jetbrains.kotlin.konan.test.diagnostics.AbstractFirPsiNativeDiagnosticsTest +import org.jetbrains.kotlin.konan.test.irtext.AbstractClassicNativeIrTextTest import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN import org.junit.jupiter.api.Tag diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/TestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/TestCaseGroupProvider.kt deleted file mode 100644 index a721fd3dd59..00000000000 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/TestCaseGroupProvider.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2021 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.konan.blackboxtest.support.group - -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseGroup -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseGroupId -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Settings - -internal interface TestCaseGroupProvider { - fun getTestCaseGroup(testCaseGroupId: TestCaseGroupId, settings: Settings): TestCaseGroup? -} \ No newline at end of file diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseExtTestCaseGroupProvider.kt deleted file mode 100644 index 20271de513d..00000000000 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseExtTestCaseGroupProvider.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2010-2021 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.konan.blackboxtest.support.group - -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.DisabledTestDataFiles -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.GeneratedSources -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestRoots -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestConfiguration - -@Target(AnnotationTarget.CLASS) -@TestConfiguration( - providerClass = ExtTestCaseGroupProvider::class, - requiredSettings = [TestRoots::class, GeneratedSources::class, DisabledTestDataFiles::class] -) -annotation class UseExtTestCaseGroupProvider diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseStandardTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseStandardTestCaseGroupProvider.kt deleted file mode 100644 index 8615fc34bb5..00000000000 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UseStandardTestCaseGroupProvider.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2010-2021 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.konan.blackboxtest.support.group - -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.DisabledTestDataFiles -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.GeneratedSources -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestRoots -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestConfiguration - -@Target(AnnotationTarget.CLASS) -@TestConfiguration( - providerClass = StandardTestCaseGroupProvider::class, - requiredSettings = [TestRoots::class, GeneratedSources::class, DisabledTestDataFiles::class] -) -annotation class UseStandardTestCaseGroupProvider diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/ClassicFrontend2NativeIrConverter.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt similarity index 98% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/ClassicFrontend2NativeIrConverter.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt index 010901491e6..97b3917c5ff 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/ClassicFrontend2NativeIrConverter.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/ClassicFrontend2NativeIrConverter.kt @@ -3,7 +3,7 @@ * 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.konan +package org.jetbrains.kotlin.konan.test import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContextImpl @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.ir.linkage.IrDeserializer import org.jetbrains.kotlin.ir.linkage.partial.partialLinkageConfig import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.* -import org.jetbrains.kotlin.konan.blackboxtest.support.CastCompatibleKotlinNativeClassLoader +import org.jetbrains.kotlin.konan.test.blackbox.support.CastCompatibleKotlinNativeClassLoader import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeBlackBoxTest.kt similarity index 79% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeBlackBoxTest.kt index a347c25fd1f..887c8b1eeac 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeBlackBoxTest.kt @@ -1,22 +1,22 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeBlackBoxTestSupport -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseId -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRun -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunners.createProperTestRunner -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestRunSettings -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TreeNode -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile -import org.jetbrains.kotlin.konan.blackboxtest.support.util.joinPackageNames -import org.jetbrains.kotlin.konan.blackboxtest.support.util.prependPackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeBlackBoxTestSupport +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRun +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunners.createProperTestRunner +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestRunSettings +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TreeNode +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.joinPackageNames +import org.jetbrains.kotlin.konan.test.blackbox.support.util.prependPackageName import org.junit.jupiter.api.DynamicNode import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.extension.ExtendWith diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropBaseTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropBaseTest.kt similarity index 61% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropBaseTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropBaseTest.kt index dad1162224e..99ce000f344 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropBaseTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropBaseTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeClassLoader abstract class AbstractNativeCInteropBaseTest : AbstractNativeSimpleTest() { internal val kotlinNativeClassLoader: KotlinNativeClassLoader get() = testRunSettings.get() diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropKT39120Test.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropKT39120Test.kt similarity index 82% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropKT39120Test.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropKT39120Test.kt index 3a1d37a95d9..82b92fdf51d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropKT39120Test.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropKT39120Test.kt @@ -1,22 +1,25 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.openapi.util.text.StringUtilRt import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* -import org.junit.jupiter.api.Tag -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.DEFAULT_FILE_NAME +import org.jetbrains.kotlin.konan.test.blackbox.support.util.DEFAULT_MODULE_NAME +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getContents import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals import org.junit.jupiter.api.Assumptions +import org.junit.jupiter.api.Tag import kotlin.test.assertIs @Tag("cinterop") diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropTest.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropTest.kt index 7acd067d747..ec9f52013da 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCInteropTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCInteropTest.kt @@ -1,21 +1,19 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.openapi.util.text.StringUtilRt import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.KonanTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getContents import org.jetbrains.kotlin.konan.util.CInteropHints import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCodegenBoxTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCodegenBoxTest.kt similarity index 65% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCodegenBoxTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCodegenBoxTest.kt index b79f1ec9dad..e2f84852d34 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeCodegenBoxTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeCodegenBoxTest.kt @@ -1,18 +1,18 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTestsIfProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.ExternalSourceTransformersProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ExternalSourceTransformer -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ExternalSourceTransformers -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ThreadSafeCache -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.group.DisabledTestsIfProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.ExternalSourceTransformersProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ExternalSourceTransformer +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ExternalSourceTransformers +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ThreadSafeCache +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile import org.junit.jupiter.api.Tag import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeHeaderKlibTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeHeaderKlibTest.kt similarity index 85% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeHeaderKlibTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeHeaderKlibTest.kt index 3890e4af249..dd987391b63 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeHeaderKlibTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeHeaderKlibTest.kt @@ -1,18 +1,18 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile import org.junit.jupiter.api.Tag import java.io.File import kotlin.test.assertContentEquals diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt similarity index 68% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt index 6e8a9eb5318..a69361a4b6a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpIrTest.kt @@ -3,26 +3,19 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseId -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCompilerArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.TestFile -import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule -import org.jetbrains.kotlin.konan.blackboxtest.support.TestRunnerType -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeClassLoader -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.PipelineType -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getIr +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeClassLoader +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.PipelineType +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getIr import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile import org.junit.jupiter.api.Tag import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpMetadataTest.kt similarity index 72% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpMetadataTest.kt index 957b43eba7e..59893a3ccd4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibDumpMetadataTest.kt @@ -1,20 +1,22 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.openapi.util.text.StringUtilRt import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeClassLoader +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getContents import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile import org.junit.jupiter.api.Tag import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibEvolutionTest.kt similarity index 89% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibEvolutionTest.kt index c74b93edd56..f6d5e5cb55b 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeKlibEvolutionTest.kt @@ -1,28 +1,24 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile import org.jetbrains.kotlin.compatibility.binary.AbstractKlibBinaryCompatibilityTest -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestFile -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIB -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIBStaticCache -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Binaries -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.PipelineType -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestFile +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIBStaticCache +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.test.Directives import org.jetbrains.kotlin.utils.DFS import org.junit.jupiter.api.Assumptions diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLibraryAbiReaderTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLibraryAbiReaderTest.kt similarity index 85% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLibraryAbiReaderTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLibraryAbiReaderTest.kt index 37640338464..6a0da35471c 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLibraryAbiReaderTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLibraryAbiReaderTest.kt @@ -3,18 +3,18 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.Location -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCompilerArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.MODULE -import org.jetbrains.kotlin.konan.blackboxtest.support.parseModule -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.ExistingDependency -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.Location +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.MODULE +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExistingDependency +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.parseModule +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile import org.jetbrains.kotlin.library.abi.* import org.jetbrains.kotlin.library.abi.directives.LibraryAbiDumpDirectives import org.jetbrains.kotlin.library.abi.directives.LibraryAbiDumpDirectives.EXCLUDED_CLASSES @@ -28,7 +28,8 @@ import org.jetbrains.kotlin.test.services.impl.RegisteredDirectivesParser.Parsed import org.jetbrains.kotlin.test.utils.withExtension import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty import org.jetbrains.kotlin.utils.fileUtils.withReplacedExtensionOrNull -import org.junit.jupiter.api.Assertions.* +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assumptions.assumeTrue import org.junit.jupiter.api.Tag import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLinkerOutputTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLinkerOutputTest.kt similarity index 73% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLinkerOutputTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLinkerOutputTest.kt index f4206899ed9..2ee7f2b9b10 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeLinkerOutputTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeLinkerOutputTest.kt @@ -3,13 +3,16 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationDependency +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts @EnforcedProperty(ClassLevelProperty.COMPILER_OUTPUT_INTERCEPTOR, "NONE") abstract class AbstractNativeLinkerOutputTest : AbstractNativeCInteropBaseTest() { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeObjCExportTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeObjCExportTest.kt similarity index 76% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeObjCExportTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeObjCExportTest.kt index c1bd3cc1f6c..471ea07c62b 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeObjCExportTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeObjCExportTest.kt @@ -1,19 +1,21 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.DEFAULT_MODULE_NAME -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.ObjCFramework +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationFactory +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.DEFAULT_MODULE_NAME +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile import org.jetbrains.kotlin.test.services.JUnit5Assertions import org.junit.jupiter.api.Assumptions import org.junit.jupiter.api.Tag diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativePartialLinkageTest.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativePartialLinkageTest.kt index acf97dbebe1..6b764c1ba58 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativePartialLinkageTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativePartialLinkageTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataFile import org.jetbrains.kotlin.codegen.ProjectInfo @@ -12,17 +12,17 @@ import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.Dependencies import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.Dependency import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.MAIN_MODULE_NAME import org.jetbrains.kotlin.klib.PartialLinkageTestUtils.ModuleBuildDirs -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationDependencyType.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationDependencyType.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.junit.jupiter.api.Tag import org.opentest4j.TestAbortedException import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeSimpleTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSimpleTest.kt similarity index 62% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeSimpleTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSimpleTest.kt index d8b3e455a97..a7fa14d2148 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeSimpleTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/AbstractNativeSimpleTest.kt @@ -1,16 +1,16 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeSimpleTestSupport -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.SimpleTestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunners.createProperTestRunner -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.SimpleTestRunSettings +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeSimpleTestSupport +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.SimpleTestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunners.createProperTestRunner +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.SimpleTestRunSettings import org.junit.jupiter.api.extension.ExtendWith import kotlin.test.fail diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CachesAutoBuildTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CachesAutoBuildTest.kt similarity index 84% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CachesAutoBuildTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CachesAutoBuildTest.kt index 2051ebdc9d1..67ef85881e7 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CachesAutoBuildTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CachesAutoBuildTest.kt @@ -1,20 +1,19 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataPath -import org.jetbrains.kotlin.konan.blackboxtest.CachesAutoBuildTest.Companion.TEST_SUITE_PATH -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCompilerArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIB -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.OptimizationMode -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.UsedPartialLinkageConfig +import org.jetbrains.kotlin.konan.test.blackbox.CachesAutoBuildTest.Companion.TEST_SUITE_PATH +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.OptimizationMode +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.UsedPartialLinkageConfig import org.jetbrains.kotlin.test.TestMetadata import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertFalse import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CompilerOutputTest.kt similarity index 85% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CompilerOutputTest.kt index f2442861e6d..b1ad9d963d9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/CompilerOutputTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/CompilerOutputTest.kt @@ -3,18 +3,20 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataPath import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.LibraryCompilation -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.PipelineType +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.LibraryCompilation +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.jupiter.api.Test import java.io.File @@ -23,7 +25,6 @@ import java.io.File @EnforcedProperty(ClassLevelProperty.COMPILER_OUTPUT_INTERCEPTOR, "NONE") @EnforcedProperty(ClassLevelProperty.PIPELINE_TYPE, "DEFAULT") class CompilerOutputTest : AbstractNativeSimpleTest() { - @Test fun testReleaseCompilerAgainstPreReleaseLibrary() = muteForK2(isK2 = true) { // TODO: unmute after fix of KT-61773 // We intentionally use JS testdata, because the compilers should behave the same way in such a test. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/IncrementalCompilationTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/IncrementalCompilationTest.kt similarity index 97% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/IncrementalCompilationTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/IncrementalCompilationTest.kt index b638f7df1fe..5a84593d93b 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/IncrementalCompilationTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/IncrementalCompilationTest.kt @@ -1,23 +1,23 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataPath -import org.jetbrains.kotlin.konan.blackboxtest.CachesAutoBuildTest.Companion.TEST_SUITE_PATH -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.OptimizationMode +import org.jetbrains.kotlin.konan.test.blackbox.CachesAutoBuildTest.Companion.TEST_SUITE_PATH +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.OptimizationMode import org.jetbrains.kotlin.test.TestMetadata -import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue -import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertFalse import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals +import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertFalse import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertNotEquals +import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.junit.jupiter.api.Assumptions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Tag diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureCompressedNamesTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureCompressedNamesTest.kt similarity index 90% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureCompressedNamesTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureCompressedNamesTest.kt index 1dca9c8752e..657cf598f40 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureCompressedNamesTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureCompressedNamesTest.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.compressedName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.compressedPackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.compressedSimpleName import org.jetbrains.kotlin.konan.target.Architecture import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.KonanTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.compressedName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.compressedPackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.compressedSimpleName import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Tag diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureDumpedTestListingTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt similarity index 78% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureDumpedTestListingTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt index d27c5763203..e6538d6a1f9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureDumpedTestListingTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureDumpedTestListingTest.kt @@ -1,24 +1,24 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.openapi.util.text.StringUtil.convertLineSeparators import com.intellij.testFramework.TestDataFile import com.intellij.testFramework.TestDataPath -import org.jetbrains.kotlin.konan.blackboxtest.InfrastructureDumpedTestListingTest.Companion.TEST_SUITE_PATH -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.Executable -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIB -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Success -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunners -import org.jetbrains.kotlin.konan.blackboxtest.support.util.DumpedTestListing +import org.jetbrains.kotlin.konan.test.blackbox.InfrastructureDumpedTestListingTest.Companion.TEST_SUITE_PATH +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Success +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunners +import org.jetbrains.kotlin.konan.test.blackbox.support.util.DumpedTestListing import org.jetbrains.kotlin.test.TestMetadata import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGTestListingTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGTestListingTest.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGTestListingTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGTestListingTest.kt index c709188f150..ac69d363761 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGTestListingTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGTestListingTest.kt @@ -1,13 +1,14 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.GTestListing -import org.junit.jupiter.api.Assertions.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.GTestListing +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.fail import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGlobsExpansionTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGlobsExpansionTest.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGlobsExpansionTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGlobsExpansionTest.kt index 7817e5b1886..8ddf0f59036 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureGlobsExpansionTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureGlobsExpansionTest.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.util.expandGlob -import org.jetbrains.kotlin.konan.blackboxtest.support.util.sanitizedName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.expandGlob +import org.jetbrains.kotlin.konan.test.blackbox.support.util.sanitizedName import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.BeforeEach diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureNamedEntitiesTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureNamedEntitiesTest.kt similarity index 88% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureNamedEntitiesTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureNamedEntitiesTest.kt index b57c6685dec..6995843f511 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureNamedEntitiesTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureNamedEntitiesTest.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureOutputFilterTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureOutputFilterTest.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureOutputFilterTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureOutputFilterTest.kt index 152ee1e3a80..ee7bdf98e0f 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/InfrastructureOutputFilterTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/InfrastructureOutputFilterTest.kt @@ -1,14 +1,15 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TCTestOutputFilter -import org.junit.jupiter.api.Assertions.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TCTestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KT59030WorkaroundTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KT59030WorkaroundTest.kt similarity index 90% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KT59030WorkaroundTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KT59030WorkaroundTest.kt index a26f1aebee9..d07e0cb1e03 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KT59030WorkaroundTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KT59030WorkaroundTest.kt @@ -3,7 +3,7 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import kotlinx.metadata.KmAnnotation import kotlinx.metadata.KmAnnotationArgument @@ -14,17 +14,17 @@ import kotlinx.metadata.klib.annotations import org.jetbrains.kotlin.backend.common.serialization.* import org.jetbrains.kotlin.backend.common.serialization.proto.* import org.jetbrains.kotlin.backend.common.serialization.proto.IrDeclaration.DeclaratorCase.* -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedHostTarget -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCompilerArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode.WithStaticCache import org.jetbrains.kotlin.konan.file.unzipTo import org.jetbrains.kotlin.konan.file.zipDirAs +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedHostTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.TestKind +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode.WithStaticCache import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutForWriter import org.jetbrains.kotlin.library.impl.MetadataWriterImpl diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KotlinTestLibraryTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KotlinTestLibraryTest.kt similarity index 67% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KotlinTestLibraryTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KotlinTestLibraryTest.kt index 40bc572b629..90366bc710c 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/KotlinTestLibraryTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/KotlinTestLibraryTest.kt @@ -1,18 +1,18 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseId -import org.jetbrains.kotlin.konan.blackboxtest.support.TestRunnerType -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline -import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedTestCases -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedTestCase as TC +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId +import org.jetbrains.kotlin.konan.test.blackbox.support.TestRunnerType +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline +import org.jetbrains.kotlin.konan.test.blackbox.support.group.PredefinedTestCases +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage import org.junit.jupiter.api.Tag import org.junit.jupiter.api.TestFactory +import org.jetbrains.kotlin.konan.test.blackbox.support.group.PredefinedTestCase as TC @Tag("kotlin-test") @PredefinedTestCases( diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LinkerOutputTestKT55578.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/LinkerOutputTestKT55578.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LinkerOutputTestKT55578.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/LinkerOutputTestKT55578.kt index 09abaf6d286..0a6ce915db3 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/LinkerOutputTestKT55578.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/LinkerOutputTestKT55578.kt @@ -3,14 +3,14 @@ * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.testFramework.TestDataPath -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIB -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess import org.junit.jupiter.api.Test import java.io.File import kotlin.test.assertContains diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeSimpleTestUtils.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/NativeSimpleTestUtils.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeSimpleTestUtils.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/NativeSimpleTestUtils.kt index a5acf3d82eb..adbde2aacf4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/NativeSimpleTestUtils.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/NativeSimpleTestUtils.kt @@ -1,21 +1,21 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Binaries -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.PipelineType -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.konan.blackboxtest.support.util.LAUNCHER_MODULE_NAME +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestExecutable +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Binaries +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.PipelineType +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.LAUNCHER_MODULE_NAME import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.jupiter.api.Assumptions import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/StdlibTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/StdlibTest.kt similarity index 77% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/StdlibTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/StdlibTest.kt index 0a287562140..d4340c2cb69 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/StdlibTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/StdlibTest.kt @@ -1,23 +1,23 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ @file:Suppress("unused") -package org.jetbrains.kotlin.konan.blackboxtest +package org.jetbrains.kotlin.konan.test.blackbox -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.EnforcedProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseId -import org.jetbrains.kotlin.konan.blackboxtest.support.TestRunnerType -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline -import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedPaths.KOTLIN_NATIVE_DISTRIBUTION -import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedTestCase as TC -import org.jetbrains.kotlin.konan.blackboxtest.support.group.PredefinedTestCases -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.EnforcedProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId +import org.jetbrains.kotlin.konan.test.blackbox.support.TestRunnerType +import org.jetbrains.kotlin.konan.test.blackbox.support.group.FirPipeline +import org.jetbrains.kotlin.konan.test.blackbox.support.group.PredefinedPaths.KOTLIN_NATIVE_DISTRIBUTION +import org.jetbrains.kotlin.konan.test.blackbox.support.group.PredefinedTestCases +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UsePartialLinkage import org.junit.jupiter.api.Tag import org.junit.jupiter.api.TestFactory +import org.jetbrains.kotlin.konan.test.blackbox.support.group.PredefinedTestCase as TC @Tag("stdlib") @PredefinedTestCases( diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/ConfigurationProperties.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/ConfigurationProperties.kt similarity index 97% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/ConfigurationProperties.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/ConfigurationProperties.kt index d105ab73764..65bf91759c0 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/ConfigurationProperties.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/ConfigurationProperties.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/LoggedData.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/LoggedData.kt index 067bb310661..3585b070e47 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/LoggedData.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.RunResult -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunParameter -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.get -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeHome -import org.jetbrains.kotlin.konan.blackboxtest.support.util.SafeEnvVars -import org.jetbrains.kotlin.konan.blackboxtest.support.util.SafeProperties +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.RunResult +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunParameter +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.get +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeHome +import org.jetbrains.kotlin.konan.test.blackbox.support.util.SafeEnvVars +import org.jetbrains.kotlin.konan.test.blackbox.support.util.SafeProperties import java.io.File import kotlin.time.Duration import kotlin.time.DurationUnit diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NamedEntities.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NamedEntities.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NamedEntities.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NamedEntities.kt index b77c80ad5e8..75e905984d9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NamedEntities.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NamedEntities.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support /** * Represents a package name. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NativeTestSupport.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt similarity index 95% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NativeTestSupport.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt index 65b34beec18..75d99fb9684 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/NativeTestSupport.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/NativeTestSupport.kt @@ -1,30 +1,25 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageConfig import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageLogLevel import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageMode -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeTestSupport.createSimpleTestRunSettings -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeTestSupport.createTestRunSettings -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeTestSupport.getOrCreateSimpleTestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.NativeTestSupport.getOrCreateTestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.group.* -import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTests -import org.jetbrains.kotlin.konan.blackboxtest.support.group.DisabledTestsIfProperty -import org.jetbrains.kotlin.konan.blackboxtest.support.group.FirPipeline -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UsePartialLinkage -import org.jetbrains.kotlin.konan.blackboxtest.support.group.TestCaseGroupProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.SimpleTestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.CacheMode -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* import org.jetbrains.kotlin.konan.target.Distribution import org.jetbrains.kotlin.konan.target.HostManager +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeTestSupport.createSimpleTestRunSettings +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeTestSupport.createTestRunSettings +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeTestSupport.getOrCreateSimpleTestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.NativeTestSupport.getOrCreateTestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.group.* +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.SimpleTestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.CacheMode +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.test.TestMetadata import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEquals import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestCase.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestCase.kt index a2abe1cd6e4..4941a85f6b8 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestCase.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ @file:Suppress("KDocUnresolvedReference") -package org.jetbrains.kotlin.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allDependencies -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allDependsOn -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allDependencies +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allDependsOn +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestDirectives.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestDirectives.kt similarity index 92% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestDirectives.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestDirectives.kt index 8253794016a..829e76da804 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestDirectives.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/TestDirectives.kt @@ -1,22 +1,22 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support +package org.jetbrains.kotlin.konan.test.blackbox.support -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.ENTRY_POINT -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.EXIT_CODE -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.FREE_COMPILER_ARGS -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.INPUT_DATA_FILE -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.KIND -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.OUTPUT_DATA_FILE -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.EXPECTED_TIMEOUT_FAILURE -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.LLDB_TRACE -import org.jetbrains.kotlin.konan.blackboxtest.support.TestDirectives.TEST_RUNNER -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.OutputDataFile -import org.jetbrains.kotlin.konan.blackboxtest.support.util.LLDBSessionSpec +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.ENTRY_POINT +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.EXIT_CODE +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.EXPECTED_TIMEOUT_FAILURE +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.FREE_COMPILER_ARGS +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.INPUT_DATA_FILE +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.KIND +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.LLDB_TRACE +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.OUTPUT_DATA_FILE +import org.jetbrains.kotlin.konan.test.blackbox.support.TestDirectives.TEST_RUNNER +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.OutputDataFile +import org.jetbrains.kotlin.konan.test.blackbox.support.util.LLDBSessionSpec import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer import org.jetbrains.kotlin.test.directives.model.StringDirective diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/CompilationToolCall.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/CompilationToolCall.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/CompilationToolCall.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/CompilationToolCall.kt index 4d7e0b1452a..c255000d878 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/CompilationToolCall.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/CompilationToolCall.kt @@ -1,16 +1,16 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.messages.* import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.compilerRunner.processCompilerOutput import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/NativeTestGroupingMessageCollector.kt similarity index 97% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/NativeTestGroupingMessageCollector.kt index 623543a1b5b..65f912f1c98 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/NativeTestGroupingMessageCollector.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/NativeTestGroupingMessageCollector.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import com.intellij.openapi.util.text.StringUtil.substringAfter import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt index be259142566..907ff8a3206 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt @@ -1,25 +1,25 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allDependsOn -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.ExecutableCompilation.Companion.applyPartialLinkageArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.ExecutableCompilation.Companion.applyTestRunnerSpecificArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.ExecutableCompilation.Companion.assertTestDumpFileNotEmptyIfExists -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationDependencyType.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ArgsBuilder -import org.jetbrains.kotlin.konan.blackboxtest.support.util.buildArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.util.flatMapToSet -import org.jetbrains.kotlin.konan.blackboxtest.support.util.mapToSet import org.jetbrains.kotlin.konan.properties.resolvablePropertyList +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allDependsOn +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation.Companion.applyPartialLinkageArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation.Companion.applyTestRunnerSpecificArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.ExecutableCompilation.Companion.assertTestDumpFileNotEmptyIfExists +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationDependencyType.* +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ArgsBuilder +import org.jetbrains.kotlin.konan.test.blackbox.support.util.buildArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.util.flatMapToSet +import org.jetbrains.kotlin.konan.test.blackbox.support.util.mapToSet import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationArtifact.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationArtifact.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationArtifact.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationArtifact.kt index d20658d0aae..98bf64d9a7d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationArtifact.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationArtifact.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationDependency.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationDependency.kt similarity index 75% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationDependency.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationDependency.kt index 11192cee110..51f7960bcfa 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationDependency.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationDependency.kt @@ -1,13 +1,14 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIB -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.KLIBStaticCache -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIB +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.KLIBStaticCache +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationDependencyType.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess /** * The type of dependency for a particular [TestCompilation]. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationFactory.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationFactory.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationFactory.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationFactory.kt index 1e1a8c3f268..35a193402e9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationFactory.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationFactory.kt @@ -1,23 +1,23 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import org.jetbrains.kotlin.container.topologicalSort -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCompilerArgs -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allDependencies -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allDependsOn -import org.jetbrains.kotlin.konan.blackboxtest.support.TestModule.Companion.allFriends -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationDependencyType.* -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCompilerArgs +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allDependencies +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allDependsOn +import org.jetbrains.kotlin.konan.test.blackbox.support.TestModule.Companion.allFriends +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationDependencyType.* +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.utils.addIfNotNull import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationResult.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationResult.kt similarity index 90% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationResult.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationResult.kt index f983a125f41..0e86c6fef97 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilationResult.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilationResult.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.compilation +package org.jetbrains.kotlin.konan.test.blackbox.support.compilation -import org.jetbrains.kotlin.konan.blackboxtest.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail internal sealed interface TestCompilationResult { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ConditionallyDisabledTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ConditionallyDisabledTests.kt similarity index 69% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ConditionallyDisabledTests.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ConditionallyDisabledTests.kt index 523e93f3982..a3ef19bc0a3 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ConditionallyDisabledTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ConditionallyDisabledTests.kt @@ -1,10 +1,10 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group -import org.jetbrains.kotlin.konan.blackboxtest.support.ClassLevelProperty +import org.jetbrains.kotlin.konan.test.blackbox.support.ClassLevelProperty @Target(AnnotationTarget.CLASS) internal annotation class DisabledTests( diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ExtTestCaseGroupProvider.kt similarity index 98% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ExtTestCaseGroupProvider.kt index fc3c5c2d73f..740d4a039b8 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ExtTestCaseGroupProvider.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group import com.intellij.core.CoreApplicationEnvironment import com.intellij.mock.MockProject @@ -19,11 +19,11 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/FirPipeline.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/FirPipeline.kt similarity index 62% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/FirPipeline.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/FirPipeline.kt index 33786d08bf1..817a31b3177 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/FirPipeline.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/FirPipeline.kt @@ -1,8 +1,8 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group @Target(AnnotationTarget.CLASS) internal annotation class FirPipeline diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCaseGroupProvider.kt similarity index 86% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCaseGroupProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCaseGroupProvider.kt index 8a196d5a14c..7c9a770c7b0 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCaseGroupProvider.kt @@ -1,19 +1,19 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeHome -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Settings -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ThreadSafeCache -import org.jetbrains.kotlin.konan.blackboxtest.support.util.expandGlobTo -import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeHome +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Settings +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Timeouts +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ThreadSafeCache +import org.jetbrains.kotlin.konan.test.blackbox.support.util.expandGlobTo +import org.jetbrains.kotlin.konan.test.blackbox.support.util.getAbsoluteFile import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCases.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCases.kt similarity index 73% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCases.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCases.kt index 83d270f4638..f6d8ff21749 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/PredefinedTestCases.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/PredefinedTestCases.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group -import org.jetbrains.kotlin.konan.blackboxtest.support.TestRunnerType -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.TestConfiguration +import org.jetbrains.kotlin.konan.test.blackbox.support.TestRunnerType +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestConfiguration @Target(AnnotationTarget.CLASS) @TestConfiguration(providerClass = PredefinedTestCaseGroupProvider::class) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/StandardTestCaseGroupProvider.kt similarity index 95% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/StandardTestCaseGroupProvider.kt index 889e57ad3eb..6dd50b36872 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/StandardTestCaseGroupProvider.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.NoTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.* -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.* +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.NoTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.* +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunChecks +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.konan.test.blackbox.support.util.* import org.jetbrains.kotlin.test.directives.model.Directive import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.services.JUnit5Assertions diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/TestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/TestCaseGroupProvider.kt new file mode 100644 index 00000000000..fd32068e0f6 --- /dev/null +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/TestCaseGroupProvider.kt @@ -0,0 +1,14 @@ +/* + * 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.konan.test.blackbox.support.group + +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseGroup +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseGroupId +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Settings + +internal interface TestCaseGroupProvider { + fun getTestCaseGroup(testCaseGroupId: TestCaseGroupId, settings: Settings): TestCaseGroup? +} \ No newline at end of file diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseExtTestCaseGroupProvider.kt new file mode 100644 index 00000000000..1ec81a1c69f --- /dev/null +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseExtTestCaseGroupProvider.kt @@ -0,0 +1,18 @@ +/* + * 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.konan.test.blackbox.support.group + +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.DisabledTestDataFiles +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.GeneratedSources +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestConfiguration +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestRoots + +@Target(AnnotationTarget.CLASS) +@TestConfiguration( + providerClass = ExtTestCaseGroupProvider::class, + requiredSettings = [TestRoots::class, GeneratedSources::class, DisabledTestDataFiles::class] +) +annotation class UseExtTestCaseGroupProvider diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UsePartialLinkage.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UsePartialLinkage.kt similarity index 85% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UsePartialLinkage.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UsePartialLinkage.kt index fa4c3155b97..a6d21921fac 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/UsePartialLinkage.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UsePartialLinkage.kt @@ -3,7 +3,7 @@ * 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.konan.blackboxtest.support.group +package org.jetbrains.kotlin.konan.test.blackbox.support.group @Target(AnnotationTarget.CLASS) internal annotation class UsePartialLinkage(val mode: Mode) { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseStandardTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseStandardTestCaseGroupProvider.kt new file mode 100644 index 00000000000..8bfab727fed --- /dev/null +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/UseStandardTestCaseGroupProvider.kt @@ -0,0 +1,18 @@ +/* + * 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.konan.test.blackbox.support.group + +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.DisabledTestDataFiles +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.GeneratedSources +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestConfiguration +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.TestRoots + +@Target(AnnotationTarget.CLASS) +@TestConfiguration( + providerClass = StandardTestCaseGroupProvider::class, + requiredSettings = [TestRoots::class, GeneratedSources::class, DisabledTestDataFiles::class] +) +annotation class UseStandardTestCaseGroupProvider diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractLocalProcessRunner.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractLocalProcessRunner.kt index fc14bcc8d61..fc8e96c0799 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractLocalProcessRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractLocalProcessRunner.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner import com.intellij.openapi.util.text.StringUtilRt.convertLineSeparators import kotlinx.coroutines.* -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.AbstractRunner.AbstractRun -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.ExecutionTimeout -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.ExitCode -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.UnfilteredProcessOutput.Companion.launchReader -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.AbstractRunner.AbstractRun +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExecutionTimeout +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.ExitCode +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.UnfilteredProcessOutput.Companion.launchReader +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter import org.junit.jupiter.api.Assertions.fail import java.io.ByteArrayOutputStream import java.io.IOException diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractRunner.kt similarity index 88% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractRunner.kt index 2b703508991..5c86c608290 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/AbstractRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/AbstractRunner.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.opentest4j.TestAbortedException diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/BaseTestRunProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/BaseTestRunProvider.kt similarity index 84% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/BaseTestRunProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/BaseTestRunProvider.kt index 79c868c4e9a..51286c3603e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/BaseTestRunProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/BaseTestRunProvider.kt @@ -1,14 +1,14 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.NoTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.NoTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.TestKind +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.utils.addIfNotNull diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestNameExtractor.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestNameExtractor.kt similarity index 80% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestNameExtractor.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestNameExtractor.kt index ab7b063bfaf..3d9ddff1208 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestNameExtractor.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestNameExtractor.kt @@ -1,14 +1,14 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.LoggedData -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName -import org.jetbrains.kotlin.konan.blackboxtest.support.util.GTestListing -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.GTestListing +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail internal class LocalTestNameExtractor( diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt similarity index 87% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt index c0f3f25ca01..6394800998d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/LocalTestRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/LocalTestRunner.kt @@ -1,14 +1,15 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TCTestOutputFilter -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestReport +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TCTestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestReport import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import org.junit.jupiter.api.Assumptions.assumeFalse diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/NoopTestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/NoopTestRunner.kt similarity index 66% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/NoopTestRunner.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/NoopTestRunner.kt index 2ea37adbfc0..787583c9af3 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/NoopTestRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/NoopTestRunner.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner internal object NoopTestRunner : Runner { override fun run() { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunResult.kt similarity index 74% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunResult.kt index e5a5f08fe2f..e446921eb47 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunResult.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunResult.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter import kotlin.time.Duration internal data class RunResult( diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/Runner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/Runner.kt similarity index 60% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/Runner.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/Runner.kt index 8d5799d6939..96027c95af9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/Runner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/Runner.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner internal interface Runner { fun run(): R diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunnerWithExecutor.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunnerWithExecutor.kt similarity index 89% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunnerWithExecutor.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunnerWithExecutor.kt index 7ee2f9f542d..a9f0c4ae1eb 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/RunnerWithExecutor.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/RunnerWithExecutor.kt @@ -3,13 +3,14 @@ * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner +import org.jetbrains.kotlin.konan.test.blackbox.support.LoggedData +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.AbstractRunner.AbstractRun +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TCTestOutputFilter +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TestOutputFilter import org.jetbrains.kotlin.native.executors.ExecuteRequest import org.jetbrains.kotlin.native.executors.Executor -import org.jetbrains.kotlin.konan.blackboxtest.support.LoggedData -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TCTestOutputFilter -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TestOutputFilter import org.jetbrains.kotlin.test.services.JUnit5Assertions import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.io.ByteArrayInputStream diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/SimpleTestRunProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/SimpleTestRunProvider.kt similarity index 71% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/SimpleTestRunProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/SimpleTestRunProvider.kt index c744c711abe..57baead5a90 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/SimpleTestRunProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/SimpleTestRunProvider.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase -import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase +import org.jetbrains.kotlin.konan.test.blackbox.support.TestKind import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue /** diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRun.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRun.kt similarity index 88% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRun.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRun.kt index 69c8f87fe49..51155e243a4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRun.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRun.kt @@ -1,15 +1,15 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.Executable -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Success -import org.jetbrains.kotlin.konan.blackboxtest.support.util.DumpedTestListing -import org.jetbrains.kotlin.konan.blackboxtest.support.util.startsWith +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Success +import org.jetbrains.kotlin.konan.test.blackbox.support.util.DumpedTestListing +import org.jetbrains.kotlin.konan.test.blackbox.support.util.startsWith import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertFalse import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunChecks.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunChecks.kt similarity index 88% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunChecks.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunChecks.kt index 7411ea018b4..478bfa78af4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunChecks.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunChecks.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunCheck.* +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.TestRunCheck.* import org.jetbrains.kotlin.utils.yieldIfNotNull import java.io.File import kotlin.time.Duration diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunProvider.kt similarity index 86% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunProvider.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunProvider.kt index b23295429d4..b27fc2ede5e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunProvider.kt @@ -1,25 +1,25 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer -import org.jetbrains.kotlin.konan.blackboxtest.support.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.NoTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCase.WithTestRunnerExtras -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilation -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact.Executable -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationFactory -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationResult.Companion.assertSuccess -import org.jetbrains.kotlin.konan.blackboxtest.support.group.TestCaseGroupProvider -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Settings -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ThreadSafeCache -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TreeNode -import org.jetbrains.kotlin.konan.blackboxtest.support.util.buildTree -import org.jetbrains.kotlin.konan.blackboxtest.support.util.startsWith +import org.jetbrains.kotlin.konan.test.blackbox.support.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.NoTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.WithTestRunnerExtras +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilation +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact.Executable +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationFactory +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationResult.Companion.assertSuccess +import org.jetbrains.kotlin.konan.test.blackbox.support.group.TestCaseGroupProvider +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.Settings +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ThreadSafeCache +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TreeNode +import org.jetbrains.kotlin.konan.test.blackbox.support.util.buildTree +import org.jetbrains.kotlin.konan.test.blackbox.support.util.startsWith import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import org.junit.jupiter.api.Assumptions.assumeTrue diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunners.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunners.kt similarity index 82% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunners.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunners.kt index 55301d5ca1f..59b12e8b0d4 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/runner/TestRunners.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/runner/TestRunners.kt @@ -1,21 +1,17 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.runner +package org.jetbrains.kotlin.konan.test.blackbox.support.runner -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.ForcedNoopTestRunner -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeHome -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Settings -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.Timeouts -import org.jetbrains.kotlin.native.executors.Executor -import org.jetbrains.kotlin.native.executors.EmulatorExecutor -import org.jetbrains.kotlin.native.executors.XcodeSimulatorExecutor import org.jetbrains.kotlin.konan.target.* +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.* +import org.jetbrains.kotlin.native.executors.EmulatorExecutor +import org.jetbrains.kotlin.native.executors.Executor import org.jetbrains.kotlin.native.executors.RosettaExecutor +import org.jetbrains.kotlin.native.executors.XcodeSimulatorExecutor import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import java.util.concurrent.ConcurrentHashMap diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SettingsContainers.kt similarity index 95% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SettingsContainers.kt index e1a760ff133..f42c68e6c5c 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SettingsContainers.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings +package org.jetbrains.kotlin.konan.test.blackbox.support.settings import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SimpleTestRunSettings.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SimpleTestRunSettings.kt similarity index 72% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SimpleTestRunSettings.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SimpleTestRunSettings.kt index 6b8e8789809..2fd19e815a8 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SimpleTestRunSettings.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/SimpleTestRunSettings.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings +package org.jetbrains.kotlin.konan.test.blackbox.support.settings -import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeSimpleTest +import org.jetbrains.kotlin.konan.test.blackbox.AbstractNativeSimpleTest /** * All instances of test classes. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestClassSettings.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestClassSettings.kt similarity index 87% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestClassSettings.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestClassSettings.kt index 4030f9eb090..a4fa86d54ec 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestClassSettings.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestClassSettings.kt @@ -1,13 +1,13 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings +package org.jetbrains.kotlin.konan.test.blackbox.support.settings import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageConfig -import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeBlackBoxTest -import org.jetbrains.kotlin.konan.blackboxtest.support.TestCaseId +import org.jetbrains.kotlin.konan.test.blackbox.AbstractNativeBlackBoxTest +import org.jetbrains.kotlin.konan.test.blackbox.support.TestCaseId import java.io.File /** diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestConfiguration.java b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestConfiguration.java similarity index 55% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestConfiguration.java rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestConfiguration.java index e859d54773c..3e233311fbf 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestConfiguration.java +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestConfiguration.java @@ -1,13 +1,16 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings; +package org.jetbrains.kotlin.konan.test.blackbox.support.settings; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.TestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.TestCaseGroupProvider; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Has to use Java annotation here instead of Kotlin annotation because of KT-49920. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestProcessSettings.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt similarity index 95% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestProcessSettings.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt index fa5792b1abd..ace5d7ec75f 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestProcessSettings.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestProcessSettings.kt @@ -1,19 +1,19 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings +package org.jetbrains.kotlin.konan.test.blackbox.support.settings import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.konan.blackboxtest.support.MutedOption -import org.jetbrains.kotlin.konan.blackboxtest.support.TestKind -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.LocalTestRunner -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.NoopTestRunner -import org.jetbrains.kotlin.konan.blackboxtest.support.runner.Runner import org.jetbrains.kotlin.konan.properties.resolvablePropertyList import org.jetbrains.kotlin.konan.target.Distribution import org.jetbrains.kotlin.konan.target.KonanTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.MutedOption +import org.jetbrains.kotlin.konan.test.blackbox.support.TestKind +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.LocalTestRunner +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.NoopTestRunner +import org.jetbrains.kotlin.konan.test.blackbox.support.runner.Runner import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import java.io.File import java.io.IOException diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestRunSettings.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestRunSettings.kt similarity index 70% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestRunSettings.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestRunSettings.kt index 9271a570c21..7ed73f37e9d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/TestRunSettings.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/settings/TestRunSettings.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.settings +package org.jetbrains.kotlin.konan.test.blackbox.support.settings -import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeBlackBoxTest -import org.jetbrains.kotlin.konan.blackboxtest.support.util.ExternalSourceTransformers +import org.jetbrains.kotlin.konan.test.blackbox.AbstractNativeBlackBoxTest +import org.jetbrains.kotlin.konan.test.blackbox.support.util.ExternalSourceTransformers import java.io.File /** diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Annotations.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Annotations.kt similarity index 87% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Annotations.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Annotations.kt index b0f220ac679..12950ab4284 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Annotations.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Annotations.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util /** * Since Kotlin annotations are not inherited (see KT-22265), we need a utility to collect all of them. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ArgsBuilder.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ArgsBuilder.kt similarity index 89% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ArgsBuilder.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ArgsBuilder.kt index e2aadc78ecb..d456d4f521a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ArgsBuilder.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ArgsBuilder.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util internal class ArgsBuilder { private val args = mutableListOf() diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Collections.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Collections.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Collections.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Collections.kt index e6ec59f4d95..877551ff765 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Collections.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Collections.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import java.util.* diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/CompressedNames.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/CompressedNames.kt similarity index 91% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/CompressedNames.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/CompressedNames.kt index 825ae897b62..1724f68ff18 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/CompressedNames.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/CompressedNames.kt @@ -1,15 +1,15 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.apache.commons.lang.StringUtils.splitByCharacterTypeCamelCase -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName import org.jetbrains.kotlin.konan.target.Architecture import org.jetbrains.kotlin.konan.target.Family import org.jetbrains.kotlin.konan.target.KonanTarget +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName internal val KonanTarget.compressedName: String get() = buildString { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Dependencies.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Dependencies.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Dependencies.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Dependencies.kt index 238f7b5c409..c41f3862a31 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Dependencies.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Dependencies.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.storage.StorageManager diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Disposables.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Disposables.kt similarity index 85% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Disposables.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Disposables.kt index 6136eb19d9d..47ce3b931e8 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Disposables.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Disposables.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ExternalSourcesTransformation.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ExternalSourcesTransformation.kt similarity index 82% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ExternalSourcesTransformation.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ExternalSourcesTransformation.kt index ea6d4f769e3..e9059baa270 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ExternalSourcesTransformation.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ExternalSourcesTransformation.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.AbstractNativeCodegenBoxTest +import org.jetbrains.kotlin.konan.test.blackbox.AbstractNativeCodegenBoxTest /** * This relates only to external codegen tests (see [AbstractNativeCodegenBoxTest]) that may have their own source transformers. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Files.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Files.kt similarity index 92% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Files.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Files.kt index 5d5340cd67c..1bb0c9aca4e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Files.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Files.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.util.KtTestUtil.getHomeDirectory diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Globs.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Globs.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Globs.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Globs.kt index 3d1e2f1b9d7..f727ddda474 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Globs.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Globs.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.junit.jupiter.api.Assertions.assertTrue import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LLDBSessionSpec.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/LLDBSessionSpec.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LLDBSessionSpec.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/LLDBSessionSpec.kt index ad163d33122..7d0a6a9c512 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/LLDBSessionSpec.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/LLDBSessionSpec.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeTargets +import org.jetbrains.kotlin.konan.test.blackbox.support.settings.KotlinNativeTargets import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/MemoryTracker.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/MemoryTracker.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/MemoryTracker.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/MemoryTracker.kt index f02592683bf..f093b153b67 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/MemoryTracker.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/MemoryTracker.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import java.time.LocalDateTime import java.util.concurrent.atomic.AtomicReference diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Names.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Names.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Names.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Names.kt index b8446f3d34e..c9b2ce6884b 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/Names.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Names.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util internal val Class<*>.sanitizedName: String get() = sanitize(name) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PackageNames.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PackageNames.kt index 37aa180e5da..b9092f05a85 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PackageNames.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName import org.jetbrains.kotlin.renderer.KeywordStringsGenerated.KEYWORDS import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import java.io.File diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiNames.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiNames.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiNames.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiNames.kt index 71d13a21d55..7b1747359ab 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiNames.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiNames.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiTransformation.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiTransformation.kt similarity index 94% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiTransformation.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiTransformation.kt index 40b59dc53ed..b2053afbc13 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PsiTransformation.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/PsiTransformation.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SafeEnvironment.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SafeEnvironment.kt index 8fa89acfde0..1ef4fdf332f 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SafeEnvironment.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import com.intellij.openapi.util.text.StringUtil.containsLineBreak import com.intellij.openapi.util.text.StringUtil.escapeLineBreak diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SourceDiscovery.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SourceDiscovery.kt similarity index 87% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SourceDiscovery.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SourceDiscovery.kt index 29eff80cba1..2587ff8c28e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SourceDiscovery.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/SourceDiscovery.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName internal typealias SourceText = CharSequence internal typealias SourceLine = String diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestCompilationArtifacts.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt similarity index 84% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestCompilationArtifacts.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt index aad3503df70..0ddc9ccafd3 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestCompilationArtifacts.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestCompilationArtifacts.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.compilation.TestCompilationArtifact +import org.jetbrains.kotlin.konan.test.blackbox.support.compilation.TestCompilationArtifact import java.io.File private fun invokeKlibTool(kotlinNativeClassLoader: ClassLoader, klibFile: File, functionName: String, vararg args: Any): String { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestListing.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestListing.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestListing.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestListing.kt index 442bea5fbc3..29aa95ffab5 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestListing.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestListing.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail /** diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestLogger.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestLogger.kt similarity index 90% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestLogger.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestLogger.kt index 9c5dd7028a4..34110ce9cd2 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestLogger.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestLogger.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import java.util.logging.LogManager import java.util.logging.Logger diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestOutput.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestOutput.kt similarity index 96% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestOutput.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestOutput.kt index 8f3fc72b456..8c6b3b6b809 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TestOutput.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TestOutput.kt @@ -1,15 +1,15 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util import jetbrains.buildServer.messages.serviceMessages.* -import org.jetbrains.kotlin.konan.blackboxtest.support.TestName +import org.jetbrains.kotlin.konan.test.blackbox.support.TestName import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue -import org.jetbrains.kotlin.konan.blackboxtest.support.util.TCTestReportParseState as State import java.text.ParseException +import org.jetbrains.kotlin.konan.test.blackbox.support.util.TCTestReportParseState as State internal class TestReport( val passedTests: Collection, diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ThreadSafe.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ThreadSafe.kt similarity index 80% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ThreadSafe.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ThreadSafe.kt index a8180c820e1..12d4018c9b3 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/ThreadSafe.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/ThreadSafe.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.util.NullStorage.unwrap -import org.jetbrains.kotlin.konan.blackboxtest.support.util.NullStorage.wrap +import org.jetbrains.kotlin.konan.test.blackbox.support.util.NullStorage.unwrap +import org.jetbrains.kotlin.konan.test.blackbox.support.util.NullStorage.wrap import java.util.concurrent.ConcurrentHashMap /** diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TreeNode.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TreeNode.kt similarity index 93% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TreeNode.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TreeNode.kt index 33f8d21a863..e30d4a2d418 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/TreeNode.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/TreeNode.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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.konan.blackboxtest.support.util +package org.jetbrains.kotlin.konan.test.blackbox.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName +import org.jetbrains.kotlin.konan.test.blackbox.support.PackageName internal interface TreeNode { val packageSegment: PackageName diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/diagnostics/AbstractDiagnosticsNativeTest.kt similarity index 99% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/diagnostics/AbstractDiagnosticsNativeTest.kt index c249e10b1a9..9102511fa7d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/diagnostics/AbstractDiagnosticsNativeTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/diagnostics/AbstractDiagnosticsNativeTest.kt @@ -3,7 +3,7 @@ * 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.konan.diagnostics +package org.jetbrains.kotlin.konan.test.diagnostics import org.jetbrains.kotlin.platform.konan.NativePlatforms import org.jetbrains.kotlin.test.Constructor diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractClassicNativeIrTextTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractClassicNativeIrTextTest.kt similarity index 90% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractClassicNativeIrTextTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractClassicNativeIrTextTest.kt index f92548f2a69..aa0ed5f5b00 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractClassicNativeIrTextTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractClassicNativeIrTextTest.kt @@ -3,9 +3,9 @@ * 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.konan.irtext +package org.jetbrains.kotlin.konan.test.irtext -import org.jetbrains.kotlin.konan.ClassicFrontend2NativeIrConverter +import org.jetbrains.kotlin.konan.test.ClassicFrontend2NativeIrConverter import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractNativeIrTextTestBase.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractNativeIrTextTestBase.kt similarity index 97% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractNativeIrTextTestBase.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractNativeIrTextTestBase.kt index be799c7a61f..b83c83f066a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/irtext/AbstractNativeIrTextTestBase.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/irtext/AbstractNativeIrTextTestBase.kt @@ -3,7 +3,7 @@ * 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.konan.irtext +package org.jetbrains.kotlin.konan.test.irtext import org.jetbrains.kotlin.platform.konan.NativePlatforms import org.jetbrains.kotlin.test.TargetBackend diff --git a/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/blackboxtest/AtomicfuNativeTestGenerated.java b/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/test/blackbox/AtomicfuNativeTestGenerated.java similarity index 98% rename from plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/blackboxtest/AtomicfuNativeTestGenerated.java rename to plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/test/blackbox/AtomicfuNativeTestGenerated.java index 4b6b64e5bb9..4a6f47a4a5b 100644 --- a/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/blackboxtest/AtomicfuNativeTestGenerated.java +++ b/plugins/atomicfu/atomicfu-compiler/test/org/jetbrains/kotlin/konan/test/blackbox/AtomicfuNativeTestGenerated.java @@ -3,12 +3,12 @@ * 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.konan.blackboxtest; +package org.jetbrains.kotlin.konan.test.blackbox; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.jupiter.api.Tag; -import org.jetbrains.kotlin.konan.blackboxtest.support.group.UseStandardTestCaseGroupProvider; +import org.jetbrains.kotlin.konan.test.blackbox.support.group.UseStandardTestCaseGroupProvider; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test;