From 9577dc75e4fdcc61e3c1f639ee45e8156380a0ef Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Mon, 2 Dec 2024 11:53:45 +0200 Subject: [PATCH] Edit some tests to check the stability of the order (#3943) --- .../analysis/test/jvm/mixed/SampleMixedJvmAnalysisTest.kt | 3 +-- .../plugin-base/src/test/kotlin/markdown/LinkTest.kt | 3 +-- .../dokka/javadoc/JavadocAllClassesTemplateMapTest.kt | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/jvm/mixed/SampleMixedJvmAnalysisTest.kt b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/jvm/mixed/SampleMixedJvmAnalysisTest.kt index bb5b208451..2a3231268f 100644 --- a/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/jvm/mixed/SampleMixedJvmAnalysisTest.kt +++ b/dokka-subprojects/analysis-kotlin-api/src/test/kotlin/org/jetbrains/dokka/analysis/test/jvm/mixed/SampleMixedJvmAnalysisTest.kt @@ -72,8 +72,7 @@ class SampleMixedJvmAnalysisTest { val secondClasslike = pckg.classlikes[1] assertEquals("MyJavaFileInJava", secondClasslike.name) - // TODO #3250 address unstable order - val functions = pckg.functions.sortedBy { it.name } + val functions = pckg.functions val firstFunction = functions[0] assertEquals("bar", firstFunction.name) diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/markdown/LinkTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/markdown/LinkTest.kt index 83c0ab9531..5be58147c2 100644 --- a/dokka-subprojects/plugin-base/src/test/kotlin/markdown/LinkTest.kt +++ b/dokka-subprojects/plugin-base/src/test/kotlin/markdown/LinkTest.kt @@ -776,8 +776,7 @@ class LinkTest : BaseAbstractTest() { } } @Test - @OnlyDescriptors("due to #3250 a result DRI is unstable") - fun `K1 - link should be stable for overloads in different files`() { + fun `link should be stable for overloads in different files`() { testInline( """ |/src/main/kotlin/Testing.kt diff --git a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt index e8bad583ce..16d7b73ceb 100644 --- a/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt +++ b/dokka-subprojects/plugin-javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt @@ -8,13 +8,11 @@ import org.jetbrains.dokka.javadoc.pages.AllClassesPage import org.jetbrains.dokka.javadoc.pages.LinkJavadocListEntry import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.pages.ContentKind -import org.junit.jupiter.api.Tag import kotlin.test.Test import kotlin.test.assertEquals internal class JavadocAllClassesTemplateMapTest : AbstractJavadocTemplateMapTest() { @Test - @Tag("onlyDescriptors") // https://github.com/Kotlin/dokka/issues/3250 fun `two classes from different packages`() { dualTestTemplateMapInline( """