diff options
4 files changed, 8 insertions, 11 deletions
diff --git a/plugins/base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt index dcf08f27..bfa60d24 100644 --- a/plugins/base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt +++ b/plugins/base/src/test/kotlin/locationProvider/DefaultExternalLocationProviderTest.kt @@ -1,16 +1,14 @@ package locationProvider +import org.jetbrains.dokka.ExternalDocumentationLink import org.jetbrains.dokka.base.resolvers.external.DefaultExternalLocationProvider -import org.jetbrains.dokka.base.resolvers.external.Dokka010ExternalLocationProvider -import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.base.resolvers.shared.ExternalDocumentation import org.jetbrains.dokka.base.resolvers.shared.PackageList import org.jetbrains.dokka.links.Callable import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.links.TypeConstructor -import org.jetbrains.dokka.links.TypeReference +import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.net.URL @@ -25,7 +23,7 @@ class DefaultExternalLocationProviderTest : AbstractCoreTest() { sourceSet { sourceRoots = listOf("src/") classpath += jvmStdlibPath!! - externalDocumentationLink(kotlinLang, packageListURL.toString()) + ExternalDocumentationLink(kotlinLang, packageListURL.toString()) } } } diff --git a/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt index 590bc0a3..1a2a45d7 100644 --- a/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt +++ b/plugins/base/src/test/kotlin/locationProvider/Dokka010ExternalLocationProviderTest.kt @@ -1,5 +1,6 @@ package locationProvider +import org.jetbrains.dokka.ExternalDocumentationLink import org.jetbrains.dokka.base.resolvers.external.Dokka010ExternalLocationProvider import org.jetbrains.dokka.plugability.DokkaContext import org.jetbrains.dokka.base.resolvers.shared.ExternalDocumentation @@ -23,7 +24,7 @@ class Dokka010ExternalLocationProviderTest : AbstractCoreTest() { sourceSet { sourceRoots = listOf("src/") classpath += jvmStdlibPath!! - externalDocumentationLink(kotlinLang, packageListURL.toString()) + ExternalDocumentationLink(kotlinLang, packageListURL.toString()) } } } diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/AbstractJavadocTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/AbstractJavadocTemplateMapTest.kt index 68b45678..e37f8daf 100644 --- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/AbstractJavadocTemplateMapTest.kt +++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/AbstractJavadocTemplateMapTest.kt @@ -1,6 +1,7 @@ package org.jetbrains.dokka.javadoc import org.jetbrains.dokka.DokkaConfigurationImpl +import org.jetbrains.dokka.ExternalDocumentationLink import org.jetbrains.dokka.javadoc.pages.JavadocPageNode import org.jetbrains.dokka.javadoc.pages.preprocessors import org.jetbrains.dokka.javadoc.renderer.JavadocContentToTemplateMapTranslator @@ -20,8 +21,8 @@ internal abstract class AbstractJavadocTemplateMapTest : AbstractCoreTest() { sourceRoots = listOf("src") analysisPlatform = "jvm" externalDocumentationLinks = listOf( - externalDocumentationLink("https://docs.oracle.com/javase/8/docs/api/"), - externalDocumentationLink("https://kotlinlang.org/api/latest/jvm/stdlib/") + ExternalDocumentationLink("https://docs.oracle.com/javase/8/docs/api/"), + ExternalDocumentationLink("https://kotlinlang.org/api/latest/jvm/stdlib/") ) } } diff --git a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt index 1063c27a..333642b1 100644 --- a/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt +++ b/testApi/src/main/kotlin/testApi/testRunner/TestRunner.kt @@ -246,9 +246,6 @@ abstract class AbstractCoreTest( ) } - fun externalDocumentationLink(url: String, packageListUrl: String? = null) = - ExternalDocumentationLink(url, packageListUrl) - protected val jvmStdlibPath: String? by lazy { PathManager.getResourceRoot(Strictfp::class.java, "/kotlin/jvm/Strictfp.class") } |