diff --git a/native/swift/build.gradle.kts b/native/swift/build.gradle.kts new file mode 100644 index 00000000000..cbbb8a2fdfd --- /dev/null +++ b/native/swift/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + kotlin("jvm") +} + +tasks.register("sirAllTests") { + dependsOn( + ":native:swift:sir:test", + ":native:swift:sir-analysis-api:test", + ":native:swift:sir-compiler-bridge:test", + ":native:swift:sir-passes:test", + ":native:swift:sir-printer:test", + ) +} diff --git a/native/swift/sir-analysis-api/build.gradle.kts b/native/swift/sir-analysis-api/build.gradle.kts index fa13a260e1e..929ff94e9b1 100644 --- a/native/swift/sir-analysis-api/build.gradle.kts +++ b/native/swift/sir-analysis-api/build.gradle.kts @@ -31,7 +31,10 @@ sourceSets { } } +val testDataDir = projectDir.resolve("testData") + projectTest(jUnitMode = JUnitMode.JUnit5) { + inputs.dir(testDataDir) dependsOn(":dist") workingDir = rootDir useJUnitPlatform { } diff --git a/native/swift/sir-analysis-api/tests/org/jetbrains/kotlin/sir/analysisapi/AbstractKotlinSirContextTest.kt b/native/swift/sir-analysis-api/tests/org/jetbrains/kotlin/sir/analysisapi/AbstractKotlinSirContextTest.kt index 4303320d5f7..dbf60cf6c71 100644 --- a/native/swift/sir-analysis-api/tests/org/jetbrains/kotlin/sir/analysisapi/AbstractKotlinSirContextTest.kt +++ b/native/swift/sir-analysis-api/tests/org/jetbrains/kotlin/sir/analysisapi/AbstractKotlinSirContextTest.kt @@ -22,16 +22,6 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions open class AbstractKotlinSirContextTest : AbstractKotlinSirContextTestBase() { - - override fun configureTest(builder: TestConfigurationBuilder) { - super.configureTest(builder) - with(builder) { - globalDefaults { - targetPlatform = NativePlatforms.unspecifiedNativePlatform - } - } - } - override val configurator: AnalysisApiTestConfigurator get() = AnalysisApiFirTestConfiguratorFactory.createConfigurator( AnalysisApiTestConfiguratorFactoryData( diff --git a/native/swift/sir-compiler-bridge/build.gradle.kts b/native/swift/sir-compiler-bridge/build.gradle.kts index 4134367c806..df492f7808d 100644 --- a/native/swift/sir-compiler-bridge/build.gradle.kts +++ b/native/swift/sir-compiler-bridge/build.gradle.kts @@ -25,7 +25,10 @@ sourceSets { } } +val testDataDir = projectDir.resolve("testData") + projectTest(jUnitMode = JUnitMode.JUnit5) { + inputs.dir(testDataDir) workingDir = rootDir useJUnitPlatform { } } diff --git a/native/swift/sir-printer/build.gradle.kts b/native/swift/sir-printer/build.gradle.kts index de58612661b..03769de14ff 100644 --- a/native/swift/sir-printer/build.gradle.kts +++ b/native/swift/sir-printer/build.gradle.kts @@ -22,4 +22,13 @@ dependencies { sourceSets { "main" { projectDefault() } "test" { projectDefault() } -} \ No newline at end of file +} + +val testDataDir = projectDir.resolve("testData") + +projectTest(jUnitMode = JUnitMode.JUnit5) { + inputs.dir(testDataDir) + useJUnitPlatform { } +} + +testsJar() diff --git a/native/swift/sir-printer/tests/org/jetbrains/kotlin/sir/printer/SirAsSwiftSourcesPrinterTests.kt b/native/swift/sir-printer/tests/org/jetbrains/kotlin/sir/printer/SirAsSwiftSourcesPrinterTests.kt index 8b22085044d..505fb829f70 100644 --- a/native/swift/sir-printer/tests/org/jetbrains/kotlin/sir/printer/SirAsSwiftSourcesPrinterTests.kt +++ b/native/swift/sir-printer/tests/org/jetbrains/kotlin/sir/printer/SirAsSwiftSourcesPrinterTests.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.sir.util.SirSwiftModule import org.jetbrains.kotlin.test.services.JUnit5Assertions import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.sir.printer.SirAsSwiftSourcesPrinter -import org.junit.Test +import org.junit.jupiter.api.Test import java.io.File class SirAsSwiftSourcesPrinterTests {