From e5200753708274a96fe3036305d1b0696dce7022 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Wed, 29 Jul 2020 12:21:06 +0200 Subject: Move `testApi.utils` to `org.jetbrains.dokka.testApi.utils` --- .../kotlin/javadoc/JavadocAllClassesTemplateMapTest.kt | 2 +- .../kotlin/javadoc/JavadocClasslikeTemplateMapTest.kt | 2 +- .../test/kotlin/javadoc/JavadocModuleTemplateMapTest.kt | 2 +- .../kotlin/javadoc/JavadocPackageTemplateMapTest.kt | 2 +- .../jetbrains/dokka/testApi/utils/assertIsInstance.kt | 17 +++++++++++++++++ .../src/main/kotlin/testApi/utils/assertIsInstance.kt | 17 ----------------- 6 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 testApi/src/main/kotlin/org/jetbrains/dokka/testApi/utils/assertIsInstance.kt delete mode 100644 testApi/src/main/kotlin/testApi/utils/assertIsInstance.kt diff --git a/plugins/javadoc/src/test/kotlin/javadoc/JavadocAllClassesTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/JavadocAllClassesTemplateMapTest.kt index 314ba0a3..90789d43 100644 --- a/plugins/javadoc/src/test/kotlin/javadoc/JavadocAllClassesTemplateMapTest.kt +++ b/plugins/javadoc/src/test/kotlin/javadoc/JavadocAllClassesTemplateMapTest.kt @@ -6,7 +6,7 @@ import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.pages.ContentKind import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import testApi.utils.assertIsInstance +import org.jetbrains.dokka.testApi.utils.assertIsInstance internal class JavadocAllClassesTemplateMapTest : AbstractJavadocTemplateMapTest() { @Test diff --git a/plugins/javadoc/src/test/kotlin/javadoc/JavadocClasslikeTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/JavadocClasslikeTemplateMapTest.kt index 2dea1abe..1ad912c5 100644 --- a/plugins/javadoc/src/test/kotlin/javadoc/JavadocClasslikeTemplateMapTest.kt +++ b/plugins/javadoc/src/test/kotlin/javadoc/JavadocClasslikeTemplateMapTest.kt @@ -3,7 +3,7 @@ package javadoc import javadoc.pages.JavadocClasslikePageNode import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import testApi.utils.assertIsInstance +import org.jetbrains.dokka.testApi.utils.assertIsInstance internal class JavadocClasslikeTemplateMapTest : AbstractJavadocTemplateMapTest() { diff --git a/plugins/javadoc/src/test/kotlin/javadoc/JavadocModuleTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/JavadocModuleTemplateMapTest.kt index b8bf41f2..f591bf35 100644 --- a/plugins/javadoc/src/test/kotlin/javadoc/JavadocModuleTemplateMapTest.kt +++ b/plugins/javadoc/src/test/kotlin/javadoc/JavadocModuleTemplateMapTest.kt @@ -5,7 +5,7 @@ import javadoc.pages.RowJavadocListEntry import org.jetbrains.dokka.links.DRI import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import testApi.utils.assertIsInstance +import org.jetbrains.dokka.testApi.utils.assertIsInstance internal class JavadocModuleTemplateMapTest : AbstractJavadocTemplateMapTest() { diff --git a/plugins/javadoc/src/test/kotlin/javadoc/JavadocPackageTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/javadoc/JavadocPackageTemplateMapTest.kt index e0ef030e..f91bc024 100644 --- a/plugins/javadoc/src/test/kotlin/javadoc/JavadocPackageTemplateMapTest.kt +++ b/plugins/javadoc/src/test/kotlin/javadoc/JavadocPackageTemplateMapTest.kt @@ -7,7 +7,7 @@ import org.jetbrains.dokka.links.DRI import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import testApi.utils.assertIsInstance +import org.jetbrains.dokka.testApi.utils.assertIsInstance internal class JavadocPackageTemplateMapTest : AbstractJavadocTemplateMapTest() { diff --git a/testApi/src/main/kotlin/org/jetbrains/dokka/testApi/utils/assertIsInstance.kt b/testApi/src/main/kotlin/org/jetbrains/dokka/testApi/utils/assertIsInstance.kt new file mode 100644 index 00000000..00c00ebb --- /dev/null +++ b/testApi/src/main/kotlin/org/jetbrains/dokka/testApi/utils/assertIsInstance.kt @@ -0,0 +1,17 @@ +package org.jetbrains.dokka.testApi.utils + +import kotlin.contracts.ExperimentalContracts +import kotlin.contracts.contract + +@OptIn(ExperimentalContracts::class) +inline fun assertIsInstance(obj: Any?): T { + contract { + returns() implies (obj is T) + } + + if (obj is T) { + return obj + } + + throw AssertionError("Expected instance of type ${T::class.qualifiedName} but found $obj") +} diff --git a/testApi/src/main/kotlin/testApi/utils/assertIsInstance.kt b/testApi/src/main/kotlin/testApi/utils/assertIsInstance.kt deleted file mode 100644 index 279dbafa..00000000 --- a/testApi/src/main/kotlin/testApi/utils/assertIsInstance.kt +++ /dev/null @@ -1,17 +0,0 @@ -package testApi.utils - -import kotlin.contracts.ExperimentalContracts -import kotlin.contracts.contract - -@OptIn(ExperimentalContracts::class) -inline fun assertIsInstance(obj: Any?): T { - contract { - returns() implies (obj is T) - } - - if (obj is T) { - return obj - } - - throw AssertionError("Expected instance of type ${T::class.qualifiedName} but found $obj") -} -- cgit