- Move `test` projects into semantic parent projects

- Implement new `:test-utils` project
- Resolve requirement for Android SDK installation

15 files changed, 17 insertions, 16 deletions

diff --git a/plugins/base/test-utils/build.gradle.kts b/plugins/base/base-test-utils/build.gradle.kts
index 4c39ed60..a4a4df69 100644
--- a/plugins/base/test-utils/build.gradle.kts
+++ b/plugins/base/base-test-utils/build.gradle.kts
@@ -1,4 +1,4 @@
 dependencies {
     compileOnly(project(":plugins:base"))
-    implementation(project(":testApi"))
-}
\ No newline at end of file
+    implementation(project(":core:test-api"))
+}
diff --git a/plugins/base/test-utils/src/main/kotlin/renderers/RenderingOnlyTestBase.kt b/plugins/base/base-test-utils/src/main/kotlin/renderers/RenderingOnlyTestBase.kt
index e5ff8fa8..e5ff8fa8 100644
--- a/plugins/base/test-utils/src/main/kotlin/renderers/RenderingOnlyTestBase.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/renderers/RenderingOnlyTestBase.kt
diff --git a/plugins/base/test-utils/src/main/kotlin/renderers/TestPage.kt b/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt
index 0dae8ce6..0dae8ce6 100644
--- a/plugins/base/test-utils/src/main/kotlin/renderers/TestPage.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt
diff --git a/plugins/base/test-utils/src/main/kotlin/renderers/defaultSourceSet.kt b/plugins/base/base-test-utils/src/main/kotlin/renderers/defaultSourceSet.kt
index a7a20f88..a7a20f88 100644
--- a/plugins/base/test-utils/src/main/kotlin/renderers/defaultSourceSet.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/renderers/defaultSourceSet.kt
diff --git a/plugins/base/test-utils/src/main/kotlin/utils/TestOutputWriter.kt b/plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt
index 00b865b4..00b865b4 100644
--- a/plugins/base/test-utils/src/main/kotlin/utils/TestOutputWriter.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/utils/TestOutputWriter.kt
diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 9ffecbd7..e8335999 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -11,8 +11,8 @@ dependencies {
     api(project(":kotlin-analysis"))
     implementation("org.jsoup:jsoup:1.12.1")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1")
-    testImplementation(project(":test-tools"))
-    testImplementation(project(":plugins:base:test-utils"))
+    testImplementation(project(":plugins:base:base-test-utils"))
+    testImplementation(project(":core:content-matcher-test-utils"))
 
     val kotlinx_html_version: String by project
     implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 6ce58a47..dad4d647 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -13,7 +13,8 @@ subprojects {
         implementation(kotlin("stdlib"))
         implementation(kotlin("reflect"))
 
-        testImplementation(project(":testApi"))
+        testImplementation(project(":test-utils"))
+        testImplementation(project(":core:test-api"))
         testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
     }
 
@@ -27,4 +28,4 @@ subprojects {
             showStackTraces = true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index 3f69043d..33917cdf 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.registerDokkaArtifactPublication
 dependencies {
     implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
-    testImplementation(project(":plugins:base:test-utils"))
+    testImplementation(project(":plugins:base:base-test-utils"))
 }
 
 registerDokkaArtifactPublication("gfmPlugin") {
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index a20daac0..d57e14f3 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -4,7 +4,7 @@ dependencies {
     implementation("com.soywiz.korlibs.korte:korte-jvm:1.10.3")
     implementation(project(":plugins:base"))
     implementation(project(":plugins:kotlin-as-java"))
-    testImplementation(project(":plugins:base:test-utils"))
+    testImplementation(project(":plugins:base:base-test-utils"))
 
     val kotlinx_html_version: String by project
     implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version")
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
index 57835490..f62c1886 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocAllClassesTemplateMapTest.kt
@@ -4,9 +4,9 @@ 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.jetbrains.dokka.test.assertIsInstance
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.jetbrains.dokka.testApi.utils.assertIsInstance
 
 internal class JavadocAllClassesTemplateMapTest : AbstractJavadocTemplateMapTest() {
     @Test
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
index 2ae5302d..f03b10b4 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocClasslikeTemplateMapTest.kt
@@ -3,7 +3,7 @@ package org.jetbrains.dokka.javadoc
 import org.jetbrains.dokka.javadoc.pages.JavadocClasslikePageNode
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.jetbrains.dokka.testApi.utils.assertIsInstance
+import org.jetbrains.dokka.test.assertIsInstance
 
 internal class JavadocClasslikeTemplateMapTest : AbstractJavadocTemplateMapTest() {
 
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
index 7353be94..8a999fb3 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocModuleTemplateMapTest.kt
@@ -5,7 +5,7 @@ import org.jetbrains.dokka.javadoc.pages.RowJavadocListEntry
 import org.jetbrains.dokka.links.DRI
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.jetbrains.dokka.testApi.utils.assertIsInstance
+import org.jetbrains.dokka.test.assertIsInstance
 
 internal class JavadocModuleTemplateMapTest : AbstractJavadocTemplateMapTest() {
 
diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt
index aa5013e5..9816c11c 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocPackageTemplateMapTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/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 org.jetbrains.dokka.testApi.utils.assertIsInstance
+import org.jetbrains.dokka.test.assertIsInstance
 import java.io.File
 
 internal class JavadocPackageTemplateMapTest : AbstractJavadocTemplateMapTest() {
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index eda6114f..f03a28c6 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.registerDokkaArtifactPublication
 dependencies {
     implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
-    testImplementation(project(":plugins:base:test-utils"))
-    testImplementation(project(":test-tools"))
+    testImplementation(project(":plugins:base:base-test-utils"))
+    testImplementation(project(":core:content-matcher-test-utils"))
 }
 
 registerDokkaArtifactPublication("kotlinAsJavaPlugin") {
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index e570de46..448d9e6d 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.registerDokkaArtifactPublication
 dependencies {
     testImplementation("org.jsoup:jsoup:1.12.1")
     testImplementation(project(":plugins:base"))
-    testImplementation(project(":plugins:base:test-utils"))
-    testImplementation(project(":test-tools"))
+    testImplementation(project(":plugins:base:base-test-utils"))
+    testImplementation(project(":core:content-matcher-test-utils"))
     testImplementation(kotlin("test-junit"))
     testImplementation(project(":kotlin-analysis"))
 }