Extract testApi from core

5 files changed, 19 insertions, 10 deletions

diff --git a/core/src/test/kotlin/format/GFMFormatTest.kt b/core/src/test/kotlin/format/GFMFormatTest.kt
index 60de7d29..4807d0f2 100644
--- a/core/src/test/kotlin/format/GFMFormatTest.kt
+++ b/core/src/test/kotlin/format/GFMFormatTest.kt
@@ -3,6 +3,8 @@ package org.jetbrains.dokka.tests
 import org.jetbrains.dokka.GFMFormatService
 import org.jetbrains.dokka.KotlinLanguageService
 import org.jetbrains.dokka.Platform
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.verifyOutput
 import org.junit.Test
 
 abstract class BaseGFMFormatTest(val analysisPlatform: Platform) : FileGeneratorTestCase() {
@@ -23,8 +25,8 @@ abstract class BaseGFMFormatTest(val analysisPlatform: Platform) : FileGenerator
     private fun verifyGFMNodeByName(fileName: String, name: String, modelConfig: ModelConfig) {
         verifyOutput("testdata/format/gfm/$fileName.kt", ".md", modelConfig) { model, output ->
             buildPagesAndReadInto(
-                    model.members.single().members.filter { it.name == name },
-                    output
+                model.members.single().members.filter { it.name == name },
+                output
             )
         }
     }
diff --git a/core/src/test/kotlin/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt
index 60e29006..a1742280 100644
--- a/core/src/test/kotlin/format/HtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/HtmlFormatTest.kt
@@ -1,6 +1,9 @@
 package org.jetbrains.dokka.tests
 
 import org.jetbrains.dokka.*
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.verifyJavaOutput
+import org.jetbrains.dokka.testApi.verifyOutput
 import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot
 import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
 import org.junit.Test
diff --git a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
index ebab5f36..d8b34394 100644
--- a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
@@ -2,6 +2,10 @@ package org.jetbrains.dokka.tests
 
 import org.jetbrains.dokka.*
 import org.jetbrains.dokka.Generation.DocumentationMerger
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.appendDocumentation
+import org.jetbrains.dokka.testApi.verifyModelOutput
+import org.jetbrains.dokka.testApi.verifyOutput
 import org.junit.Test
 
 abstract class BaseKotlinWebSiteHtmlFormatTest(val analysisPlatform: Platform): FileGeneratorTestCase() {
@@ -65,14 +69,14 @@ abstract class BaseKotlinWebSiteHtmlFormatTest(val analysisPlatform: Platform):
 
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val moduleName = "test"
-        val passConfiguration = PassConfigurationImpl(
+        val passConfiguration = org.jetbrains.dokka.testApi.PassConfigurationImpl(
                 noStdlibLink = true,
                 noJdkLink = true,
                 languageVersion = null,
                 apiVersion = null
         )
 
-        val dokkaConfiguration = DokkaConfigurationImpl(
+        val dokkaConfiguration = org.jetbrains.dokka.testApi.DokkaConfigurationImpl(
             outputDir = "",
             format = "kotlin-website-html",
             generateIndexPages = false,
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 4984e1d5..8900b267 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka.tests
 
 import org.jetbrains.dokka.*
 import org.jetbrains.dokka.Generation.DocumentationMerger
+import org.jetbrains.dokka.testApi.*
 import org.junit.Test
 
 abstract class BaseMarkdownFormatTest(val analysisPlatform: Platform): FileGeneratorTestCase() {
@@ -257,14 +258,14 @@ abstract class BaseMarkdownFormatTest(val analysisPlatform: Platform): FileGener
     @Test fun packagePlatformsWithExtExtensions() {
         val path = "multiplatform/packagePlatformsWithExtExtensions"
         val module = DocumentationModule("test")
-        val passConfiguration = PassConfigurationImpl(
+        val passConfiguration = org.jetbrains.dokka.testApi.PassConfigurationImpl(
                 noStdlibLink = true,
                 noJdkLink = true,
                 languageVersion = null,
                 apiVersion = null
         )
 
-        val dokkaConfiguration = DokkaConfigurationImpl(
+        val dokkaConfiguration = org.jetbrains.dokka.testApi.DokkaConfigurationImpl(
             outputDir = "",
             format = "html",
             generateIndexPages = false,
@@ -388,13 +389,13 @@ abstract class BaseMarkdownFormatTest(val analysisPlatform: Platform): FileGener
 
     private fun buildMultiplePlatforms(path: String): DocumentationModule {
         val moduleName = "test"
-        val passConfiguration = PassConfigurationImpl(
+        val passConfiguration = org.jetbrains.dokka.testApi.PassConfigurationImpl(
                 noStdlibLink = true,
                 noJdkLink = true,
                 languageVersion = null,
                 apiVersion = null
         )
-        val dokkaConfiguration = DokkaConfigurationImpl(
+        val dokkaConfiguration = org.jetbrains.dokka.testApi.DokkaConfigurationImpl(
             outputDir = "",
             format = "html",
             generateIndexPages = false,
diff --git a/core/src/test/kotlin/format/PackageDocsTest.kt b/core/src/test/kotlin/format/PackageDocsTest.kt
index 3ff5f123..c5fe7beb 100644
--- a/core/src/test/kotlin/format/PackageDocsTest.kt
+++ b/core/src/test/kotlin/format/PackageDocsTest.kt
@@ -7,10 +7,9 @@ import com.nhaarman.mockito_kotlin.doAnswer
 import com.nhaarman.mockito_kotlin.eq
 import com.nhaarman.mockito_kotlin.mock
 import org.jetbrains.dokka.*
-import org.jetbrains.dokka.tests.assertEqualsIgnoringSeparators
+import org.jetbrains.dokka.testApi.assertEqualsIgnoringSeparators
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.junit.After