diff options
Diffstat (limited to 'plugins/base/src/test')
47 files changed, 107 insertions, 198 deletions
diff --git a/plugins/base/src/test/kotlin/model/ClassesTest.kt b/plugins/base/src/test/kotlin/model/ClassesTest.kt index a7ec861a..ee109ba1 100644 --- a/plugins/base/src/test/kotlin/model/ClassesTest.kt +++ b/plugins/base/src/test/kotlin/model/ClassesTest.kt @@ -1,7 +1,9 @@ package model +import org.jetbrains.dokka.Platform import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.KotlinModifier.* +import org.jetbrains.dokka.pages.PlatformData import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Test import utils.AbstractModelTest @@ -167,7 +169,7 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class ) { with((this / "classes" / "Klass").cast<DClass>()) { name equals "Klass" - modifier equals Sealed + modifier.allValues.forEach { it equals Sealed } } } } @@ -209,15 +211,15 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val D = (this / "classes" / "D").cast<DClass>() with(C) { - modifier equals Open + modifier.allValues.forEach { it equals Open } with((this / "f").cast<DFunction>()) { - modifier equals Open + modifier.allValues.forEach { it equals Open } } } with(D) { - modifier equals Final + modifier.allValues.forEach { it equals Final } with((this / "f").cast<DFunction>()) { - modifier equals Open + modifier.allValues.forEach { it equals Open } } D.supertypes.flatMap { it.component2() }.firstOrNull() equals C.dri } @@ -244,16 +246,16 @@ class ClassesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "class val E = (this / "classes" / "E").cast<DClass>() with(C) { - modifier equals Abstract - ((this / "foo").cast<DFunction>()).modifier equals Abstract + modifier.allValues.forEach { it equals Abstract } + ((this / "foo").cast<DFunction>()).modifier.allValues.forEach { it equals Abstract } } with(D) { - modifier equals Abstract + modifier.allValues.forEach { it equals Abstract } } with(E) { - modifier equals Final + modifier.allValues.forEach { it equals Final } } D.supers.firstOrNull() equals C.dri diff --git a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt index f46f8b59..f8ba51a6 100644 --- a/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt +++ b/plugins/base/src/test/kotlin/renderers/html/PlatformDependentHintTest.kt @@ -40,7 +40,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("a"), "[pl1]", Div("b"), "[pl2]", Div("c"), "[pl3]") + renderedContent.match("[pl1]", Div("a"), "[pl2]", Div("b"), "[pl3]", Div("c")) } @Test @@ -54,7 +54,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("ab"), "[pl1]", Div("bc"), "[pl2]") + renderedContent.match("[pl1]", Div("ab"), "[pl2]", Div("bc")) } @Test @@ -84,7 +84,7 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div(Div("ab")), "[pl1]", Div(Div("a"), "b"), "[pl2]") + renderedContent.match("[pl1]", Div(Div("ab")), "[pl2]", Div(Div("a"), "b")) } @Test @@ -115,6 +115,6 @@ class PlatformDependentHintTest : RenderingOnlyTestBase() { } HtmlRenderer(context).render(page) - renderedContent.match(Div("a"), "[pl1, pl2]", Div("b"), "[pl3]") + renderedContent.match("[pl1, pl2]", Div("a"), "[pl3]", Div("b")) } }
\ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a> <h1>f</h1> - <div class="symbol monospace">final fun <a href="f.html">f</a>()</div> - </div> +<div class="symbol monospace">final fun <a href="f.html">f</a>()</div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html index 6ed21e80..b22194f8 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html @@ -24,9 +24,8 @@ <tbody> <tr> <td><a href="f.html">f</a></td> - <td> - <div class="symbol monospace">final fun <a href="f.html">f</a>()</div> - <div class="brief "></div> + <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div> + <div class="brief "> </div> </td> </tr> </tbody> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html index 1f8f163c..54f356bf 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/<init>/#kotlin.Int//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a> <h1><init></h1> - <div class="symbol monospace">final fun <a href="-init-.html"><init></a>(size: <a href="">Int</a>)</div> - </div> +<div class="symbol monospace">final fun <a href="-init-.html"><init></a>(size: <a href="">Int</a>)</div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html index 095832b0..3047ead0 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a> <h1>equals</h1> - <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> - </div> +<div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html index c600cba6..aae30759 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/hashCode/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a> <h1>hashCode</h1> - <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div> - </div> +<div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html index fd1f598b..e43d5514 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html @@ -18,30 +18,27 @@ </div> <div id="content" pageIds="/Fancy////">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a> <h1>Fancy</h1> - <div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div> +<div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div><br> <h2>Functions</h2> <table> <thead></thead> <tbody> <tr> <td><a href="equals.html">equals</a></td> - <td> - <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> - <div class="brief "></div> + <td><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> + <div class="brief "> </div> </td> </tr> <tr> <td><a href="hash-code.html">hashCode</a></td> - <td> - <div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div> - <div class="brief "></div> + <td><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div> + <div class="brief "> </div> </td> </tr> <tr> <td><a href="to-string.html">toString</a></td> - <td> - <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div> - <div class="brief "></div> + <td><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div> + <div class="brief "> </div> </td> </tr> </tbody> @@ -52,12 +49,9 @@ <tbody> <tr> <td><a href="">size</a></td> + <td><div class="symbol monospace"><a href="">Int</a></div></td> <td> - <div class="symbol monospace"><a href="">Int</a></div> - </td> - <td><br></td> - <td> - <div class="brief "></div> + <div class="brief "> </div> </td> </tr> </tbody> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html index 01f5bd2f..89cc4ecc 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/toString/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a> <h1>toString</h1> - <div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div> - </div> +<div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html index 699949e0..b212ca00 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="//f/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="f.html">f</a> <h1>f</h1> - <div class="symbol monospace">final fun <a href="f.html">f</a>()</div> - </div> +<div class="symbol monospace">final fun <a href="f.html">f</a>()</div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html index 7bd8b485..f485569d 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html @@ -24,9 +24,8 @@ <tbody> <tr> <td><a href="-fancy/index.html">Fancy</a></td> - <td> - <div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div> - <div class="brief "></div> + <td><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div> + <div class="brief "> </div> </td> </tr> </tbody> @@ -37,9 +36,8 @@ <tbody> <tr> <td><a href="f.html">f</a></td> - <td> - <div class="symbol monospace">final fun <a href="f.html">f</a>()</div> - <div class="brief "></div> + <td><div class="symbol monospace">final fun <a href="f.html">f</a>()</div> + <div class="brief "> </div> </td> </tr> </tbody> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html index 9e52f490..600c6f19 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/fn.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/fn.html @@ -18,10 +18,8 @@ </div> <div id="content" pageIds="//fn/#//">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="fn.html">fn</a> <h1>fn</h1> - <div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div> - <h3>Description</h3> -Function fn -</div> +<div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div> <h3>Description</h3> +Function fn<br> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html index fe2eeab7..8c346556 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html @@ -24,9 +24,8 @@ <tbody> <tr> <td><a href="fn.html">fn</a></td> - <td> - <div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div> - <div class="brief ">Function fn</div> + <td><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div> + <div class="brief "> </div> </td> </tr> </tbody> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html index 68608d40..51e4544a 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/<init>/#//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="-init-.html"><init></a> <h1><init></h1> - <div class="symbol monospace">final fun <a href="-init-.html"><init></a>()</div> - </div> +<div class="symbol monospace">final fun <a href="-init-.html"><init></a>()</div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html index 095832b0..3047ead0 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html @@ -18,8 +18,7 @@ </div> <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">//<a href="../../index.html">root</a>/<a href="../index.html"></a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a> <h1>equals</h1> - <div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> - </div> +<div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div> </div> </div> </div> </body> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html index c600cba6..aae30759 100644 --- a/ |