[Swift Export] Fix test infrastructure according to the review

generators/sir-tests-generator/build.gradle.kts

@@ -5,30 +5,14 @@ plugins {
 
 sourceSets {
     "main" { java.srcDirs("main") }
-    "test" { projectDefault() }
 }
 
 dependencies {
-    testApi(projectTests(":native:swift:sir-analysis-api"))
+    implementation(projectTests(":native:swift:sir-analysis-api"))
-    testApi(projectTests(":native:swift:sir-compiler-bridge"))
+    implementation(projectTests(":native:swift:sir-compiler-bridge"))
-    testImplementation(projectTests(":generators:test-generator"))
+    implementation(projectTests(":generators:test-generator"))
-
+    runtimeOnly(projectTests(":analysis:analysis-test-framework"))
-    testRuntimeOnly(projectTests(":analysis:analysis-test-framework"))
+    runtimeOnly(libs.junit.jupiter.api)
-    testImplementation(libs.junit.jupiter.api)
 }
 
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.native.swift.sir.GenerateSirTestsKt")
-
-testsJar()
-
-kotlin {
-    compilerOptions {
-        freeCompilerArgs.add("-Xcontext-receivers")
-    }
-}
-
-
-projectTest(jUnitMode = JUnitMode.JUnit5) {
-    workingDir = rootDir
-    useJUnitPlatform { }
-}

native/swift/sir-analysis-api/build.gradle.kts

@@ -31,13 +31,6 @@ sourceSets {
     }
 }
 
-kotlin {
-    compilerOptions {
-        freeCompilerArgs.add("-Xcontext-receivers")
-    }
-}
-
-
 projectTest(jUnitMode = JUnitMode.JUnit5) {
     dependsOn(":dist")
     workingDir = rootDir

native/swift/sir-analysis-api/tests/org/jetbrains/kotlin/sir/analysisapi/AbstractKotlinSirContextTest.kt

@@ -49,12 +49,12 @@ abstract class AbstractKotlinSirContextTestBase : AbstractAnalysisApiBasedTest()
         val ktFiles = moduleStructure.modules
             .flatMap { testServices.ktModuleProvider.getModuleFiles(it).filterIsInstance<KtFile>() }
 
-        val module = buildModule() {
+        val module = buildModule {
             val sirFactory = SirGenerator()
             ktFiles.forEach { file ->
                 declarations += sirFactory.build(file)
             }
-        }.build()
+        }
 
         val actual = buildString {
             module.declarations

native/swift/sir-passes/build.gradle.kts

@@ -9,7 +9,11 @@ dependencies {
 
     api(project(":native:swift:sir"))
 
-    testImplementation(libs.junit4)
+    testImplementation(kotlin("test-junit5"))
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+
     testImplementation(projectTests(":compiler:tests-common"))
 }
 
@@ -17,3 +21,8 @@ sourceSets {
     "main" { projectDefault() }
     "test" { projectDefault() }
 }
+
+projectTest(jUnitMode = JUnitMode.JUnit5) {
+    workingDir = rootDir
+    useJUnitPlatform { }
+}

native/swift/sir-passes/tests/org/jetbrains/kotlin/sir/passes/SirPassTests.kt

@@ -6,25 +6,31 @@
 package org.jetbrains.kotlin.sir.passes
 
 import org.jetbrains.kotlin.sir.SirElement
+import org.jetbrains.kotlin.sir.SirForeignFunction
+import org.jetbrains.kotlin.sir.SirOrigin
+import org.jetbrains.kotlin.sir.SirVisibility
+import org.jetbrains.kotlin.sir.builder.buildForeignFunction
 import org.jetbrains.sir.passes.SirPass
-import org.junit.Test
+import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class SirPassTests {
     @Test
     fun smoke() {
         val elementDescription = "mySirElement"
-        val mySirElement = object : SirElement {
+        val mySirElement = buildForeignFunction {
-            override fun toString(): String {
+            origin = SirOrigin(listOf(elementDescription))
-                return elementDescription
+            visibility = SirVisibility.PUBLIC
-            }
         }
-        val myPass = object : SirPass<String, Unit> {
+        val myPass = object : SirPass<List<String>?, Unit> {
-            override fun run(element: SirElement, data: Unit): String {
+            override fun run(element: SirElement, data: Unit): List<String>? {
-                return element.toString()
+                if (element is SirForeignFunction) {
+                    return element.origin.path
+                }
+                return null
             }
         }
         val result = myPass.run(mySirElement, Unit)
-        assertEquals(elementDescription, result)
+        assertEquals(elementDescription, result?.first())
     }
 }

native/swift/sir/build.gradle.kts

@@ -7,11 +7,10 @@ description = "Swift Intermediate Representation"
 dependencies {
     compileOnly(kotlinStdlib())
 
-    testApi(platform(libs.junit.bom))
+    testImplementation(kotlin("test-junit5"))
+    testImplementation(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
-
-    testImplementation(projectTests(":compiler:tests-common"))
 }
 
 sourceSets {
@@ -21,3 +20,8 @@ sourceSets {
     }
     "test" { projectDefault() }
 }
+
+projectTest(jUnitMode = JUnitMode.JUnit5) {
+    workingDir = rootDir
+    useJUnitPlatform { }
+}

native/swift/sir/tests/org/jetbrains/kotlin/sir/SirTest.kt

@@ -5,9 +5,8 @@
 
 package org.jetbrains.kotlin.sir
 
-import org.jetbrains.kotlin.sir.builder.SirEnumBuilder
 import org.jetbrains.kotlin.sir.builder.buildEnum
-import org.junit.Test
+import kotlin.test.Test
 import kotlin.test.assertTrue
 
 class SirTest {