From 37d12bed40edc226d96d0e1a4b28a24583ece94f Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Wed, 22 Jul 2020 11:12:16 +0200 Subject: DokkaConfiguration: Use `Set` instead of `List` when collections are expected to be distinct --- plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt | 4 +--- .../src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt | 8 ++++---- .../src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) (limited to 'plugins/base/src/test/kotlin/renderers/html') diff --git a/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt b/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt index 8ab277f1..b4de5aed 100644 --- a/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt +++ b/plugins/base/src/test/kotlin/renderers/html/DivergentTest.kt @@ -1,12 +1,10 @@ package renderers.html -import org.jetbrains.dokka.Platform -import org.jetbrains.dokka.SourceRootImpl import org.jetbrains.dokka.base.renderers.html.HtmlRenderer import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.pages.ContentDivergentGroup import org.junit.jupiter.api.Test -import renderers.* +import renderers.TestPage import utils.Div import utils.Span import utils.match diff --git a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt index ae494929..eea4dc0c 100644 --- a/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt +++ b/plugins/base/src/test/kotlin/renderers/html/HtmlRenderingOnlyTestBase.kt @@ -2,7 +2,6 @@ package renderers.html import org.jetbrains.dokka.DokkaConfigurationImpl import org.jetbrains.dokka.Platform -import org.jetbrains.dokka.SourceRootImpl import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.renderers.DefaultTabSortingStrategy import org.jetbrains.dokka.base.renderers.RootCreator @@ -17,6 +16,7 @@ import org.jsoup.nodes.TextNode import renderers.RenderingOnlyTestBase import utils.TestOutputWriter import renderers.defaultSourceSet +import java.io.File abstract class HtmlRenderingOnlyTestBase : RenderingOnlyTestBase() { @@ -25,7 +25,7 @@ abstract class HtmlRenderingOnlyTestBase : RenderingOnlyTestBase() { "JS", defaultSourceSet.sourceSetID.copy(sourceSetName = "js"), analysisPlatform = Platform.js, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) protected val jvm = defaultSourceSet.copy( "root", @@ -33,14 +33,14 @@ abstract class HtmlRenderingOnlyTestBase : RenderingOnlyTestBase() { defaultSourceSet.sourceSetID.copy(sourceSetName = "jvm"), analysisPlatform = Platform.jvm, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) protected val native = defaultSourceSet.copy( "root", "NATIVE", defaultSourceSet.sourceSetID.copy(sourceSetName = "native"), analysisPlatform = Platform.native, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) val files = TestOutputWriter() diff --git a/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt index cf7f47e6..77ba390e 100644 --- a/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt +++ b/plugins/base/src/test/kotlin/renderers/html/SourceSetDependentHintTest.kt @@ -1,7 +1,6 @@ package renderers.html import org.jetbrains.dokka.Platform -import org.jetbrains.dokka.SourceRootImpl import org.jetbrains.dokka.base.renderers.html.HtmlRenderer import org.jetbrains.dokka.pages.TextStyle import org.junit.jupiter.api.Test @@ -10,6 +9,7 @@ import renderers.defaultSourceSet import renderers.RenderingOnlyTestBase import utils.Div import utils.match +import java.io.File class SourceSetDependentHintTest : HtmlRenderingOnlyTestBase() { @@ -18,21 +18,21 @@ class SourceSetDependentHintTest : HtmlRenderingOnlyTestBase() { "pl1", defaultSourceSet.sourceSetID.copy(sourceSetName = "pl1"), analysisPlatform = Platform.js, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) private val pl2 = defaultSourceSet.copy( "root", "pl2", defaultSourceSet.sourceSetID.copy(sourceSetName = "pl2"), analysisPlatform = Platform.jvm, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) private val pl3 = defaultSourceSet.copy( "root", "pl3", defaultSourceSet.sourceSetID.copy(sourceSetName = "pl3"), analysisPlatform = Platform.native, - sourceRoots = listOf(SourceRootImpl("pl1")) + sourceRoots = setOf(File("pl1")) ) @Test -- cgit