azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][Tests] Migrate first ObjC test with framework

Browse Source 
^KT-61259
This commit is contained in:
Vladimir Sukharev
2024-01-17 11:49:34 +01:00
parent 6e2df0e086
commit 1b18f4ed1e
26 changed files with 263 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+19
View File
@@ -5056,6 +5056,25 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/objc")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
public class Objc {
@Test
public void testAllFilesPresentInObjc() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/cinterop/objc"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt53151.kt")
public void testKt53151() throws Exception {
runTest("compiler/testData/codegen/box/cinterop/objc/kt53151.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/packages")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+21
View File
@@ -5170,6 +5170,27 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/objc")
@TestDataPath("$PROJECT_ROOT")
@Tag("frontend-fir")
@FirPipeline()
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class Objc {
@Test
public void testAllFilesPresentInObjc() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/cinterop/objc"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt53151.kt")
public void testKt53151() throws Exception {
runTest("compiler/testData/codegen/box/cinterop/objc/kt53151.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/packages")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+17
View File
@@ -4942,6 +4942,23 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/objc")
@TestDataPath("$PROJECT_ROOT")
@UseExtTestCaseGroupProvider()
public class Objc {
@Test
public void testAllFilesPresentInObjc() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/cinterop/objc"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt53151.kt")
public void testKt53151() throws Exception {
runTest("compiler/testData/codegen/box/cinterop/objc/kt53151.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/packages")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+19
View File
@@ -5057,6 +5057,25 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/objc")
@TestDataPath("$PROJECT_ROOT")
@UseExtTestCaseGroupProvider()
@UsePartialLinkage(mode = Mode.DISABLED)
@Tag("no-partial-linkage-may-be-skipped")
public class Objc {
@Test
public void testAllFilesPresentInObjc() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/cinterop/objc"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
}
@Test
@TestMetadata("kt53151.kt")
public void testKt53151() throws Exception {
runTest("compiler/testData/codegen/box/cinterop/objc/kt53151.kt");
}
}
@Nested
@TestMetadata("compiler/testData/codegen/box/cinterop/packages")
@TestDataPath("$PROJECT_ROOT")
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/group/ExtTestCaseGroupProvider.kt
+2
View File
@@ -177,6 +177,7 @@ private class ExtTestDataFile(
args += "-opt-in=kotlin.native.internal.InternalForKotlinNativeTests" // for ReflectionPackageName
val freeCInteropArgs = structure.directives.listValues(FREE_CINTEROP_ARGS.name)
.orEmpty().flatMap { it.split(" ") }
.map { it.replace("\$generatedSourcesDir", testDataFileSettings.generatedSourcesDir.absolutePath) }
return TestCompilerArgs(args, freeCInteropArgs, testDataFileSettings.assertionsMode)
}
@@ -719,6 +720,7 @@ private class ExtTestDataFileStructureFactory(parentDisposable: Disposable) : Te
source.files.forEach { extTestFile ->
val file = moduleDir.resolve(extTestFile.name)
file.parentFile.mkdirs()
file.writeText(extTestFile.text)
process(destination, TestFile.createCommitted(file, destination))
}
native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/util/Names.kt
+3 -2
View File
@@ -7,14 +7,15 @@ package org.jetbrains.kotlin.konan.test.blackbox.support.util
internal val Class<*>.sanitizedName: String get() = sanitize(name)
internal fun getSanitizedFileName(fileName: String): String = sanitize(fileName, allowDots = true)
internal fun getSanitizedFileName(fileName: String): String = sanitize(fileName, allowDots = true, allowSlashes = true)
private fun sanitize(s: String, allowDots: Boolean = false) = buildString {
private fun sanitize(s: String, allowDots: Boolean = false, allowSlashes: Boolean = false) = buildString {
s.forEach { ch ->
append(
when {
ch.isLetterOrDigit() || ch == '_' -> ch
allowDots && ch == '.' -> ch
allowSlashes && ch == '/' -> ch
else -> '_'
}
)