From f4920fc9d067e59a5d843a185e07c5d321c91c6d Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 11 Sep 2019 15:34:55 +0200
Subject: Extract testApi from core

---
 core/src/test/kotlin/model/ClassTest.kt            | 4 ++++
 core/src/test/kotlin/model/CommentTest.kt          | 9 +++++++--
 core/src/test/kotlin/model/FunctionTest.kt         | 5 ++++-
 core/src/test/kotlin/model/JavaTest.kt             | 3 +++
 core/src/test/kotlin/model/KotlinAsJavaTest.kt     | 3 +++
 core/src/test/kotlin/model/LinkTest.kt             | 3 +++
 core/src/test/kotlin/model/PackageTest.kt          | 5 ++++-
 core/src/test/kotlin/model/PropertyTest.kt         | 2 ++
 core/src/test/kotlin/model/SourceLinksErrorTest.kt | 4 ++--
 core/src/test/kotlin/model/SourceLinksTest.kt      | 4 ++--
 core/src/test/kotlin/model/TypeAliasTest.kt        | 2 ++
 11 files changed, 36 insertions(+), 8 deletions(-)

(limited to 'core/src/test/kotlin/model')

diff --git a/core/src/test/kotlin/model/ClassTest.kt b/core/src/test/kotlin/model/ClassTest.kt
index 35ec1d09..b479e59e 100644
--- a/core/src/test/kotlin/model/ClassTest.kt
+++ b/core/src/test/kotlin/model/ClassTest.kt
@@ -4,6 +4,10 @@ import org.jetbrains.dokka.Content
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.RefKind
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
+import org.jetbrains.dokka.testApi.verifyPackageMember
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/core/src/test/kotlin/model/CommentTest.kt b/core/src/test/kotlin/model/CommentTest.kt
index 08aa3572..b94e9d0c 100644
--- a/core/src/test/kotlin/model/CommentTest.kt
+++ b/core/src/test/kotlin/model/CommentTest.kt
@@ -1,8 +1,13 @@
 package org.jetbrains.dokka.tests
 
+import org.jetbrains.dokka.Content
+import org.jetbrains.dokka.Platform
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.assertEqualsIgnoringSeparators
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
+import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.Assert.*
-import org.jetbrains.dokka.*
 
 abstract class BaseCommentTest(val analysisPlatform: Platform) {
     val defaultModelConfig = ModelConfig(analysisPlatform = analysisPlatform)
diff --git a/core/src/test/kotlin/model/FunctionTest.kt b/core/src/test/kotlin/model/FunctionTest.kt
index 4c6bfb74..9900446a 100644
--- a/core/src/test/kotlin/model/FunctionTest.kt
+++ b/core/src/test/kotlin/model/FunctionTest.kt
@@ -3,7 +3,10 @@ package org.jetbrains.dokka.tests
 import org.jetbrains.dokka.Content
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.Platform
-import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
+import org.jetbrains.dokka.testApi.verifyPackageMember
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/core/src/test/kotlin/model/JavaTest.kt b/core/src/test/kotlin/model/JavaTest.kt
index da9da624..018ab089 100644
--- a/core/src/test/kotlin/model/JavaTest.kt
+++ b/core/src/test/kotlin/model/JavaTest.kt
@@ -3,6 +3,9 @@ package org.jetbrains.dokka.tests
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.RefKind
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.toTestString
+import org.jetbrains.dokka.testApi.verifyJavaPackageMember
 import org.junit.Assert.*
 import org.junit.Ignore
 import org.junit.Test
diff --git a/core/src/test/kotlin/model/KotlinAsJavaTest.kt b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
index 8249dd0f..80ff95bd 100644
--- a/core/src/test/kotlin/model/KotlinAsJavaTest.kt
+++ b/core/src/test/kotlin/model/KotlinAsJavaTest.kt
@@ -4,6 +4,9 @@ import org.jetbrains.dokka.DocumentationModule
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.Platform
 import org.jetbrains.dokka.RefKind
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Test
diff --git a/core/src/test/kotlin/model/LinkTest.kt b/core/src/test/kotlin/model/LinkTest.kt
index 6526a4db..08e27db8 100644
--- a/core/src/test/kotlin/model/LinkTest.kt
+++ b/core/src/test/kotlin/model/LinkTest.kt
@@ -4,6 +4,9 @@ import org.jetbrains.dokka.ContentBlock
 import org.jetbrains.dokka.ContentNodeLazyLink
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.Platform
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
diff --git a/core/src/test/kotlin/model/PackageTest.kt b/core/src/test/kotlin/model/PackageTest.kt
index 47c88385..0afbbb5d 100644
--- a/core/src/test/kotlin/model/PackageTest.kt
+++ b/core/src/test/kotlin/model/PackageTest.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.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.verifyModel
 import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot
 import org.junit.Assert.*
 import org.junit.Test
@@ -121,7 +124,7 @@ abstract class BasePackageTest(val analysisPlatform: Platform) {
             ModelConfig(
                 roots = arrayOf(KotlinSourceRoot("testdata/packages/classInPackage.kt", false)),
                 perPackageOptions = listOf(
-                    PackageOptionsImpl(prefix = "simple.name", suppress = true)
+                    org.jetbrains.dokka.testApi.PackageOptionsImpl(prefix = "simple.name", suppress = true)
                 ),
                 analysisPlatform = analysisPlatform
             )
diff --git a/core/src/test/kotlin/model/PropertyTest.kt b/core/src/test/kotlin/model/PropertyTest.kt
index 9f070862..bce3c585 100644
--- a/core/src/test/kotlin/model/PropertyTest.kt
+++ b/core/src/test/kotlin/model/PropertyTest.kt
@@ -1,6 +1,8 @@
 package org.jetbrains.dokka.tests
 
 import org.jetbrains.dokka.*
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
diff --git a/core/src/test/kotlin/model/SourceLinksErrorTest.kt b/core/src/test/kotlin/model/SourceLinksErrorTest.kt
index 9812569d..2d587856 100644
--- a/core/src/test/kotlin/model/SourceLinksErrorTest.kt
+++ b/core/src/test/kotlin/model/SourceLinksErrorTest.kt
@@ -2,8 +2,8 @@ package org.jetbrains.dokka.tests.model
 
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.SourceLinkDefinitionImpl
-import org.jetbrains.dokka.tests.ModelConfig
-import org.jetbrains.dokka.tests.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
 import org.junit.Assert
 import org.junit.Test
 import java.io.File
diff --git a/core/src/test/kotlin/model/SourceLinksTest.kt b/core/src/test/kotlin/model/SourceLinksTest.kt
index a4ba870c..8f7766f6 100644
--- a/core/src/test/kotlin/model/SourceLinksTest.kt
+++ b/core/src/test/kotlin/model/SourceLinksTest.kt
@@ -2,8 +2,8 @@ package org.jetbrains.dokka.tests.model
 
 import org.jetbrains.dokka.NodeKind
 import org.jetbrains.dokka.SourceLinkDefinitionImpl
-import org.jetbrains.dokka.tests.ModelConfig
-import org.jetbrains.dokka.tests.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.ModelConfig
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/core/src/test/kotlin/model/TypeAliasTest.kt b/core/src/test/kotlin/model/TypeAliasTest.kt
index 71976dc3..6c9b90a8 100644
--- a/core/src/test/kotlin/model/TypeAliasTest.kt
+++ b/core/src/test/kotlin/model/TypeAliasTest.kt
@@ -3,6 +3,8 @@ package org.jetbrains.dokka.tests
 import junit.framework.TestCase.assertEquals
 import org.jetbrains.dokka.Content
 import org.jetbrains.dokka.NodeKind
+import org.jetbrains.dokka.testApi.checkSourceExistsAndVerifyModel
+import org.jetbrains.dokka.testApi.toTestString
 import org.junit.Test
 
 class TypeAliasTest {
-- 
cgit