Add tests

4 files changed, 32 insertions, 42 deletions

diff --git a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
index df2c3825..f5b1bf2e 100644
--- a/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
+++ b/plugins/base/src/test/kotlin/signatures/SignatureTest.kt
@@ -1,6 +1,8 @@
 package signatures
 
+import org.jetbrains.dokka.DokkaConfiguration
 import org.jetbrains.dokka.DokkaSourceSetID
+import org.jetbrains.dokka.jdk
 import org.jetbrains.dokka.testApi.testRunner.AbstractCoreTest
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
@@ -450,6 +452,34 @@ class SignatureTest : AbstractCoreTest() {
     }
 
     @Test
+    fun `typealias with generic params swapped`() {
+
+        val writerPlugin = TestOutputWriterPlugin()
+
+        testInline(
+            """
+            |/src/main/kotlin/kotlinAsJavaPlugin/Test.kt
+            |package kotlinAsJavaPlugin
+            |
+            |typealias XD<B, A> = Map<A, B>
+            |
+            |class ABC {
+            |    fun someFun(xd: XD<Int, String>) = 1
+            |}
+        """.trimMargin(),
+            configuration,
+            pluginOverrides = listOf(writerPlugin)
+        ) {
+            renderingStage = { _, _ ->
+                writerPlugin.writer.renderedContent("root/kotlinAsJavaPlugin/-a-b-c/some-fun.html").signature().first().match(
+                    "fun ", A("someFun"), "(xd: ", A("XD"), "<", A("Int"),
+                    ", ", A("String"), ">):", A("Int"), Span()
+                )
+            }
+        }
+    }
+
+    @Test
     fun `generic constructor params`() {
 
 
diff --git a/plugins/base/src/test/kotlin/signatures/SignatureUtils.kt b/plugins/base/src/test/kotlin/signatures/SignatureUtils.kt
deleted file mode 100644
index e77b8757..00000000
--- a/plugins/base/src/test/kotlin/signatures/SignatureUtils.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package signatures
-
-import org.jsoup.Jsoup
-import org.jsoup.nodes.Element
-import utils.TestOutputWriter
-
-fun TestOutputWriter.renderedContent(path: String = "root/example.html") =
-    contents.getValue(path).let { Jsoup.parse(it) }.select("#content")
-        .single()
-
-fun Element.signature() = select("div.symbol.monospace")
-fun Element.firstSignature() = signature().first()
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/utils/JsoupUtils.kt b/plugins/base/src/test/kotlin/utils/JsoupUtils.kt
deleted file mode 100644
index e8c7838d..00000000
--- a/plugins/base/src/test/kotlin/utils/JsoupUtils.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package utils
-
-import org.jsoup.nodes.Element
-import org.jsoup.nodes.Node
-import org.jsoup.nodes.TextNode
-
-fun Element.match(vararg matchers: Any): Unit =
-    childNodes()
-        .filter { it !is TextNode || it.text().isNotBlank() }
-        .let { it.drop(it.size - matchers.size) }
-        .zip(matchers)
-        .forEach { (n, m) -> m.accepts(n) }
-
-open class Tag(val name: String, vararg val matchers: Any)
-class Div(vararg matchers: Any) : Tag("div", *matchers)
-class P(vararg matchers: Any) : Tag("p", *matchers)
-class Span(vararg matchers: Any) : Tag("span", *matchers)
-class A(vararg matchers: Any) : Tag("a", *matchers)
-object Wbr : Tag("wbr")
-private fun Any.accepts(n: Node) {
-    when (this) {
-        is String -> assert(n is TextNode && n.text().trim() == this.trim()) { "\"$this\" expected but found: $n" }
-        is Tag -> {
-            assert(n is Element && n.tagName() == name) { "Tag $name expected but found: $n" }
-            if (n is Element && matchers.isNotEmpty()) n.match(*matchers)
-        }
-        else -> throw IllegalArgumentException("$this is not proper matcher")
-    }
-}
\ No newline at end of file
diff --git a/plugins/base/src/test/kotlin/utils/TestUtils.kt b/plugins/base/src/test/kotlin/utils/TestUtils.kt
index 5183972a..2ef6534e 100644
--- a/plugins/base/src/test/kotlin/utils/TestUtils.kt
+++ b/plugins/base/src/test/kotlin/utils/TestUtils.kt
@@ -76,4 +76,5 @@ val Bound.name: String?
         is Void -> "void"
         is Dynamic -> "dynamic"
         is UnresolvedBound -> "<ERROR CLASS>"
-    }
\ No newline at end of file
+        is TypeAliased -> typeAlias.name
+    }