From fea73ae64a5b9e00471a28807eb1f8d6fa18823c Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 29 Nov 2023 13:43:00 +0200 Subject: [PATCH] [Swift Export] Minor tests fixes and adjustments --- .../org/jetbrains/kotlin/sir/passes/SirPassTests.kt | 11 ++++------- .../sir/printer/SirAsSwiftSourcesPrinterTests.kt | 2 -- .../sir/tests/org/jetbrains/kotlin/sir/SirTest.kt | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/native/swift/sir-passes/tests/org/jetbrains/kotlin/sir/passes/SirPassTests.kt b/native/swift/sir-passes/tests/org/jetbrains/kotlin/sir/passes/SirPassTests.kt index e286748f9bd..0d9e4a47b96 100644 --- a/native/swift/sir-passes/tests/org/jetbrains/kotlin/sir/passes/SirPassTests.kt +++ b/native/swift/sir-passes/tests/org/jetbrains/kotlin/sir/passes/SirPassTests.kt @@ -5,10 +5,7 @@ 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.* import org.jetbrains.kotlin.sir.builder.buildForeignFunction import org.jetbrains.sir.passes.SirPass import kotlin.test.Test @@ -19,13 +16,13 @@ class SirPassTests { fun smoke() { val elementDescription = "mySirElement" val mySirElement = buildForeignFunction { - origin = SirOrigin(listOf(elementDescription)) + origin = SirOrigin.KotlinEntity(listOf(elementDescription)) visibility = SirVisibility.PUBLIC } val myPass = object : SirPass?, Unit> { override fun run(element: SirElement, data: Unit): List? { - if (element is SirForeignFunction) { - return element.origin.path + if (element is SirDeclaration) { + return (element.origin as? SirOrigin.KotlinEntity)?.path } return null } 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 d5bf5f24000..8b22085044d 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 @@ -16,8 +16,6 @@ import org.jetbrains.sir.printer.SirAsSwiftSourcesPrinter import org.junit.Test import java.io.File -fun basicModule(): SirModule = buildModule { name = "Test" } - class SirAsSwiftSourcesPrinterTests { @Test fun `should ignore foreign elements`() { diff --git a/native/swift/sir/tests/org/jetbrains/kotlin/sir/SirTest.kt b/native/swift/sir/tests/org/jetbrains/kotlin/sir/SirTest.kt index bfa07571ac5..4ced8315ae1 100644 --- a/native/swift/sir/tests/org/jetbrains/kotlin/sir/SirTest.kt +++ b/native/swift/sir/tests/org/jetbrains/kotlin/sir/SirTest.kt @@ -22,8 +22,8 @@ class SirTest { private fun produceSwiftElement(): Any { return buildEnum { - origin = SirOrigin(path = listOf()) - name = "name" + origin = SirOrigin.KotlinEntity(path = listOf("org.me.MyEnum")) + name = "MyEnum" visibility = SirVisibility.PUBLIC } }