From bd7ffc71aae11b0ed3ec5c3e72d10d118ff701ed Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Tue, 13 Feb 2024 15:35:19 +0100 Subject: [PATCH] [K/N][Tests] Migrate test kt62262.kt ^KT-61259 --- kotlin-native/backend.native/tests/build.gradle | 6 ------ .../backend.native/tests/interop/objc/kt62262.kt | 8 -------- native/native.tests/testData/codegen/kt62262.kt | 14 ++++++++++++++ .../FirNativeCodegenLocalTestGenerated.java | 6 ++++++ .../blackbox/NativeCodegenLocalTestGenerated.java | 6 ++++++ 5 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 kotlin-native/backend.native/tests/interop/objc/kt62262.kt create mode 100644 native/native.tests/testData/codegen/kt62262.kt diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index cb7dd9a76fc..9343db15938 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -1160,12 +1160,6 @@ standaloneTest("interop_objc_illegal_sharing") { } } -standaloneTest("interop_kt62262") { - enabled = project.testTarget == 'ios_x64' || project.testTarget == 'ios_arm64' || project.testTarget == 'ios_simulator_arm64' - source = "interop/objc/kt62262.kt" - UtilsKt.dependsOnPlatformLibs(it) -} - dynamicTest("produce_dynamic") { source = "produce_dynamic/simple/hello.kt" cSource = "$projectDir/produce_dynamic/simple/main.c" diff --git a/kotlin-native/backend.native/tests/interop/objc/kt62262.kt b/kotlin-native/backend.native/tests/interop/objc/kt62262.kt deleted file mode 100644 index a5fe30a6abe..00000000000 --- a/kotlin-native/backend.native/tests/interop/objc/kt62262.kt +++ /dev/null @@ -1,8 +0,0 @@ -import platform.UIKit.UIViewController - -class ViewController : UIViewController { - @OverrideInit - constructor() : super(nibName = null, bundle = null) -} - -fun main() {} diff --git a/native/native.tests/testData/codegen/kt62262.kt b/native/native.tests/testData/codegen/kt62262.kt new file mode 100644 index 00000000000..618c4236304 --- /dev/null +++ b/native/native.tests/testData/codegen/kt62262.kt @@ -0,0 +1,14 @@ +// This test is now compile-only for iOS and tvOS. +// It also makes sense also to invoke overridden constructor from box() and check the sanity of resulting object of class ViewController. +// DISABLE_NATIVE: isAppleTarget=false +// DISABLE_NATIVE: targetFamily=OSX +// DISABLE_NATIVE: targetFamily=WATCHOS + +import platform.UIKit.UIViewController + +class ViewController : UIViewController { + @OverrideInit + constructor() : super(nibName = null, bundle = null) +} + +fun box() = "OK" diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java index 420041e1bea..1b0a0bfa5e3 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenLocalTestGenerated.java @@ -31,6 +31,12 @@ public class FirNativeCodegenLocalTestGenerated extends AbstractNativeCodegenBox KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } + @Test + @TestMetadata("kt62262.kt") + public void testKt62262() { + runTest("native/native.tests/testData/codegen/kt62262.kt"); + } + @Nested @TestMetadata("native/native.tests/testData/codegen/annotations") @TestDataPath("$PROJECT_ROOT") diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java index 1d418064e60..1f2b6619c6e 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenLocalTestGenerated.java @@ -27,6 +27,12 @@ public class NativeCodegenLocalTestGenerated extends AbstractNativeCodegenBoxTes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/codegen"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } + @Test + @TestMetadata("kt62262.kt") + public void testKt62262() { + runTest("native/native.tests/testData/codegen/kt62262.kt"); + } + @Nested @TestMetadata("native/native.tests/testData/codegen/annotations") @TestDataPath("$PROJECT_ROOT")