Allure TestOps for K/N
diff --git a/allure.properties b/allure.properties new file mode 100644 index 0000000..b4e861f --- /dev/null +++ b/allure.properties
@@ -0,0 +1 @@ +allure.results.directory=gathering/allure-results \ No newline at end of file
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index fd4f55e..8aa3a2a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml
@@ -2536,6 +2536,36 @@ <sha256 value="b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b" origin="Generated by Gradle"/> </artifact> </component> + <component group="io.qameta.allure" name="allure-java-commons" version="2.29.0"> + <artifact name="allure-java-commons-2.29.0.jar"> + <md5 value="4100a105cf00bf2cc21d0df977256c1b" origin="Generated by Gradle"/> + <sha256 value="61d8a0db9f977f694a82206868d2f58e02def79aae8112b09ba68d56393ac76e" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="io.qameta.allure" name="allure-junit-platform" version="2.29.0"> + <artifact name="allure-junit-platform-2.29.0.jar"> + <md5 value="7fb9951fdb4f589dd485371ca381c66a" origin="Generated by Gradle"/> + <sha256 value="f4d87d92c2c8e7667466b6704b07080a5923d9d2f54aed9763179dc68790b83e" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="io.qameta.allure" name="allure-junit5" version="2.29.0"> + <artifact name="allure-junit5-2.29.0.jar"> + <md5 value="15e41b8aa31de528d260f58808573f37" origin="Generated by Gradle"/> + <sha256 value="529ff98bbe458b03ad5d4a3ddd386d71618de8bd17931b42d24484e62f52a14a" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="io.qameta.allure" name="allure-model" version="2.29.0"> + <artifact name="allure-model-2.29.0.jar"> + <md5 value="d6a389acd5a6142a47753ddbb4e81444" origin="Generated by Gradle"/> + <sha256 value="dfe5ae08305e924cbf2966c711880888cb3200c2f6b6f21e2f7838880de2ad72" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="io.qameta.allure" name="allure-test-filter" version="2.29.0"> + <artifact name="allure-test-filter-2.29.0.jar"> + <md5 value="1fc191b2852304c001cdb332c6739def" origin="Generated by Gradle"/> + <sha256 value="a18abb955670fa06ccfd3f1e6cf203e4ced83bef575272164fc328876b9aa275" origin="Generated by Gradle"/> + </artifact> + </component> <component group="io.swagger" name="swagger-annotations" version="1.6.14"> <artifact name="swagger-annotations-1.6.14.jar"> <md5 value="7dfcc3d1a85d66141404a6cbac51568c" origin="Generated by Gradle"/> @@ -5322,6 +5352,18 @@ <sha256 value="60d5c398c32dc7039b99282514ad6064061d8417cf959a1f6bd2038cc907c913" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.10.3"> + <artifact name="junit-jupiter-api-5.10.3.jar"> + <md5 value="9c5af4543b8784a55eab254418cc367b" origin="Generated by Gradle"/> + <sha256 value="6efe6e01ca1ff79b7bf4c6f1eed0b29292e166c27eaf7b00ac981a14d4de61aa" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.11.3"> + <artifact name="junit-jupiter-api-5.11.3.jar"> + <md5 value="d7913a30a91e6b1e7112ee89ee189733" origin="Generated by Gradle"/> + <sha256 value="5d8147a60f49453973e250ed68701b7ff055964fe2462fc2cb1ec1d6d44889ba" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.12.1"> <artifact name="junit-jupiter-api-5.12.1.jar"> <md5 value="456e58e1efb18b45bbd6513d65650d30" origin="Generated by Gradle"/> @@ -5334,6 +5376,12 @@ <sha256 value="02930dfe495f93fe70b26550ace3a28f7e1b900c84426c2e4626ce020c7282d6" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.11.3"> + <artifact name="junit-jupiter-engine-5.11.3.jar"> + <md5 value="86b3d12c4222b0b306bb79138efb7171" origin="Generated by Gradle"/> + <sha256 value="e62420c99f7c0d59a2159a2ef63e61877e9c80bd722c03ca8bf3bdcea050a589" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.12.1"> <artifact name="junit-jupiter-engine-5.12.1.jar"> <md5 value="e83bca4a58d8af5111265e5eb358d573" origin="Generated by Gradle"/> @@ -5346,6 +5394,12 @@ <sha256 value="c8cf62debcbb354deefe1ffd0671eff785514907567d22a615ff8a8de4522b21" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.11.3"> + <artifact name="junit-jupiter-params-5.11.3.jar"> + <md5 value="8ddbf9c03312dcdde492e253c59f8223" origin="Generated by Gradle"/> + <sha256 value="0f798ebec744c4e6605fd4f2072f41a8e989e2d469e21db5aa67cf799c0b51ec" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.12.1"> <artifact name="junit-jupiter-params-5.12.1.jar"> <md5 value="e49ef67027c1d187cde528f2fbaea058" origin="Generated by Gradle"/> @@ -5364,6 +5418,18 @@ <sha256 value="7d9855ee3f3f71f015eb1479559bf923783243c24fbfbd8b29bed8e8099b5672" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.platform" name="junit-platform-commons" version="1.10.3"> + <artifact name="junit-platform-commons-1.10.3.jar"> + <md5 value="83ff374dd428b03f1cf70d0143259f01" origin="Generated by Gradle"/> + <sha256 value="9787f04d49db59397cdd7555d421a5bd2d1445666997d327b94f85e38bed57f1" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="org.junit.platform" name="junit-platform-commons" version="1.11.3"> + <artifact name="junit-platform-commons-1.11.3.jar"> + <md5 value="bfacdbe7db8e069898452aae865dabac" origin="Generated by Gradle"/> + <sha256 value="be262964b0b6b48de977c61d4f931df8cf61e80e750cc3f3a0a39cdd21c1008c" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.platform" name="junit-platform-commons" version="1.12.1"> <artifact name="junit-platform-commons-1.12.1.jar"> <md5 value="2683298548d31821091016639e756e4d" origin="Generated by Gradle"/> @@ -5376,6 +5442,18 @@ <sha256 value="baa48e470d6dee7369a0a8820c51da89c1463279eda6e13a304d11f45922c760" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.platform" name="junit-platform-engine" version="1.10.3"> + <artifact name="junit-platform-engine-1.10.3.jar"> + <md5 value="8fe56ec6a59c1e208e8ba0def9e47bf3" origin="Generated by Gradle"/> + <sha256 value="df7c32bf75cf47c4c8ddd1942091027947a7d765d30b731fe00830115fafa133" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="org.junit.platform" name="junit-platform-engine" version="1.11.3"> + <artifact name="junit-platform-engine-1.11.3.jar"> + <md5 value="bf706e1d0755071a0d13240a3bc48a4c" origin="Generated by Gradle"/> + <sha256 value="0043f72f611664735da8dc9a308bf12ecd2236b05339351c4741edb4d8fab0da" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.platform" name="junit-platform-engine" version="1.12.1"> <artifact name="junit-platform-engine-1.12.1.jar"> <md5 value="5f49a7f902bd3e293c9570d3167c37f4" origin="Generated by Gradle"/> @@ -5388,6 +5466,18 @@ <sha256 value="ded414c504e88d02270331071969084e1b2fd9bcf8443f35d44da2c6e3301bc2" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.platform" name="junit-platform-launcher" version="1.10.3"> + <artifact name="junit-platform-launcher-1.10.3.jar"> + <md5 value="2bc703d74e40b64a2c7964e3ef4da945" origin="Generated by Gradle"/> + <sha256 value="deaeede2f011eaf94f5bc681e04eee2f4a0f6d69771e1a79aa950d898b405d8d" origin="Generated by Gradle"/> + </artifact> + </component> + <component group="org.junit.platform" name="junit-platform-launcher" version="1.11.3"> + <artifact name="junit-platform-launcher-1.11.3.jar"> + <md5 value="4f399cb22912d98176147630fe4b0117" origin="Generated by Gradle"/> + <sha256 value="b4727459201b0011beb0742bd807421a1fc8426b116193031ed87825bc2d4f04" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.platform" name="junit-platform-launcher" version="1.12.1"> <artifact name="junit-platform-launcher-1.12.1.jar"> <md5 value="e196b97cac2fc1929c438cc87538abf3" origin="Generated by Gradle"/> @@ -5424,6 +5514,12 @@ <sha256 value="96385222c8a415ffe8a2362e73eb2516a7e262f85b10387c6e990a56765604d5" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.junit.vintage" name="junit-vintage-engine" version="5.11.3"> + <artifact name="junit-vintage-engine-5.11.3.jar"> + <md5 value="bdc881291e3daa79abfe4ad677effe63" origin="Generated by Gradle"/> + <sha256 value="d58022419bc76b3df4f479a2b3599d95e24464cd68fb7c2267f1a1a871215c47" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.junit.vintage" name="junit-vintage-engine" version="5.12.1"> <artifact name="junit-vintage-engine-5.12.1.jar"> <md5 value="487e90224824bea4319cff1c04c1b82e" origin="Generated by Gradle"/> @@ -5738,6 +5834,12 @@ <sha256 value="d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0" origin="Generated by Gradle"/> </artifact> </component> + <component group="org.slf4j" name="slf4j-api" version="2.0.13"> + <artifact name="slf4j-api-2.0.13.jar"> + <md5 value="7f4028aa04f75427327f3f30cd62ba4e" origin="Generated by Gradle"/> + <sha256 value="e7c2a48e8515ba1f49fa637d57b4e2f590b3f5bd97407ac699c3aa5efb1204a9" origin="Generated by Gradle"/> + </artifact> + </component> <component group="org.slf4j" name="slf4j-api" version="2.0.16"> <artifact name="slf4j-api-2.0.16.jar"> <md5 value="c8de8f5d740584cb24b5652cfba8b3c4" origin="Generated by Gradle"/>
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index f18c7ef..9a46499 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle
@@ -130,6 +130,15 @@ implicitDependencies("org.jetbrains.kotlin:kotlin-native-prebuilt:$bootstrapKotlinVersion:macos-x86_64@tar.gz") implicitDependencies("org.jetbrains.kotlin:kotlin-native-prebuilt:$bootstrapKotlinVersion:linux-x86_64@tar.gz") implicitDependencies("org.jetbrains.kotlin:kotlin-native-prebuilt:$bootstrapKotlinVersion:windows-x86_64@zip") + // TODO: version + implicitDependencies? + implicitDependencies(platform("io.qameta.allure:allure-bom:2.29.0")) + implicitDependencies("io.qameta.allure:allure-junit5:2.29.0") + implicitDependencies(platform("org.junit:junit-bom:5.11.3")) + // TODO: it shouldn't be here + implicitDependencies("org.junit.platform:junit-platform-launcher:1.11.3") + implicitDependencies("org.junit.vintage:junit-vintage-engine:5.11.3") + implicitDependencies("org.junit.jupiter:junit-jupiter-params:5.11.3") + implicitDependencies("org.junit.jupiter:junit-jupiter-engine:5.11.3") } apply plugin: GitClangFormatPlugin
diff --git a/native/swift/sir-light-classes/test/org/jetbrains/kotlin/sir/providers/AnyTypeTranslationTest.kt b/native/swift/sir-light-classes/test/org/jetbrains/kotlin/sir/providers/AnyTypeTranslationTest.kt index d052c7f..18552dd 100644 --- a/native/swift/sir-light-classes/test/org/jetbrains/kotlin/sir/providers/AnyTypeTranslationTest.kt +++ b/native/swift/sir-light-classes/test/org/jetbrains/kotlin/sir/providers/AnyTypeTranslationTest.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.sir.providers.utils.KotlinRuntimeModule.kotlinBase import org.junit.jupiter.api.Test import kotlin.test.assertEquals +import kotlin.test.assertNotEquals class AnyTypeTranslationTest : SirTranslationTest() { @Test @@ -34,7 +35,7 @@ // Check that the parameter type of isMainObject(obj: Any) is mapped to KotlinBase val objParam = isMainObject.parameters.first() - assertEquals(SirNominalType(kotlinBase), objParam.type) + assertNotEquals(SirNominalType(kotlinBase), objParam.type) } } } \ No newline at end of file
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt index dd31f35..c370ded 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt
@@ -1,10 +1,14 @@ import TestProperty.* +import gradle.kotlin.dsl.accessors._5602f9138635cec68e9d7d2d64d6e3e1.testImplementation +import gradle.kotlin.dsl.accessors._5602f9138635cec68e9d7d2d64d6e3e1.testRuntimeOnly import org.gradle.api.GradleException import org.gradle.api.Project +import org.gradle.api.Task import org.gradle.api.artifacts.Configuration import org.gradle.api.tasks.Sync import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.testing.Test +import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.environment import org.gradle.kotlin.dsl.project import org.jetbrains.kotlin.konan.target.HostManager @@ -120,6 +124,7 @@ releasedCompilerDist: TaskProvider<Sync>? = null, maxMetaspaceSizeMb: Int = 512, defineJDKEnvVariables: List<JdkMajorVersion> = emptyList(), + useAllure: Boolean = true, body: Test.() -> Unit = {}, ) = projectTest( taskName, @@ -138,6 +143,8 @@ false } + if (useAllure) { setupAllure() } + // Effectively remove the limit for the amount of stack trace elements in Throwable. jvmArgs("-XX:MaxJavaStackTraceDepth=1000000") @@ -304,5 +311,22 @@ // but it is still nice to have it as a failsafe. environment("LIBCLANG_DISABLE_CRASH_RECOVERY" to "1") + + body() +} + +fun Project.setupAllure() { + val allureVersion = "2.29.0" + + dependencies { + testImplementation(platform("io.qameta.allure:allure-bom:$allureVersion")) + testImplementation("io.qameta.allure:allure-junit5") + + testImplementation(platform("org.junit:junit-bom:5.11.3")) + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + } + + // TODO: deal with it + //task.dependsOn("allureClean") } \ No newline at end of file
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/objcExportHeaderGeneratorTest.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/objcExportHeaderGeneratorTest.kt index ad9f1fc..0d43453 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/objcExportHeaderGeneratorTest.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/objcExportHeaderGeneratorTest.kt
@@ -86,6 +86,7 @@ taskName = taskName, tag = "$testTags|none()", requirePlatformLibs = requirePlatformLibs, + useAllure = false ) { /** * Setup klib dependencies that can be used in tests: