From 46b4bbb68ce1285a1aea700cc0d0000c6b7ed97b Mon Sep 17 00:00:00 2001 From: Paweł Marks Date: Wed, 12 Feb 2020 18:05:24 +0100 Subject: Moves all core tests to base plugin --- .../commonMain/kotlin/Clock.kt | 15 ++++++++++ .../commonMain/kotlin/House.kt | 24 +++++++++++++++ .../basicMultiplatformTest/jsMain/kotlin/Clock.kt | 21 +++++++++++++ .../jvmAndJsSecondCommonMain/kotlin/Greeter.kt | 10 +++++++ .../jvmMain/kotlin/example/Clock.kt | 34 ++++++++++++++++++++++ .../jvmMain/kotlin/example/ClockDays.kt | 15 ++++++++++ .../jvmMain/kotlin/example/ParticularClock.kt | 32 ++++++++++++++++++++ 7 files changed, 151 insertions(+) create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/Clock.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/House.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jsMain/kotlin/Clock.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmAndJsSecondCommonMain/kotlin/Greeter.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/Clock.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ClockDays.kt create mode 100644 plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ParticularClock.kt (limited to 'plugins/base/src/test/resources') diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/Clock.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/Clock.kt new file mode 100644 index 00000000..4753cb32 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/Clock.kt @@ -0,0 +1,15 @@ +package example + +/** + * Documentation for expected class Clock + * in common module + */ +expect open class Clock() { + fun getTime(): String + /** + * Time in minis + */ + fun getTimesInMillis(): String + fun getYear(): String +} + diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/House.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/House.kt new file mode 100644 index 00000000..c879dee7 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/commonMain/kotlin/House.kt @@ -0,0 +1,24 @@ +package example + +class House(val street: String, val number: Int) { + + /** + * The owner of the house + */ + var owner: String = "" + + /** + * The owner of the house + */ + val differentOwner: String = "" + + fun addFloor() {} + + class Basement { + val pickles : List = mutableListOf() + } + + companion object { + val DEFAULT = House("",0) + } +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jsMain/kotlin/Clock.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jsMain/kotlin/Clock.kt new file mode 100644 index 00000000..967cffcd --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jsMain/kotlin/Clock.kt @@ -0,0 +1,21 @@ +package example + +import greeteer.Greeter +import kotlin.js.Date + +/** + * Documentation for actual class Clock in JS + */ +actual open class Clock { + actual fun getTime() = Date.now().toString() + fun onlyJsFunction(): Int = 42 + actual fun getTimesInMillis(): String = Date.now().toString() + + actual fun getYear(): String { + TODO("not implemented") //To change body of created functions use File | Settings | File Templates. + } +} + +fun main() { + Greeter().greet().also { println(it) } +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmAndJsSecondCommonMain/kotlin/Greeter.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmAndJsSecondCommonMain/kotlin/Greeter.kt new file mode 100644 index 00000000..8a52e2f3 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmAndJsSecondCommonMain/kotlin/Greeter.kt @@ -0,0 +1,10 @@ +package greeteer + +import example.Clock + +class Greeter { + /** + * Some docs for the [greet] function + */ + fun greet() = Clock().let{ "Hello there! THe time is ${it.getTime()}" } +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/Clock.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/Clock.kt new file mode 100644 index 00000000..9ec01fb6 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/Clock.kt @@ -0,0 +1,34 @@ +package example + +import greeteer.Greeter + +actual open class Clock { + actual fun getTime(): String = System.currentTimeMillis().toString() + actual fun getTimesInMillis(): String = System.currentTimeMillis().toString() + + /** + * Documentation for onlyJVMFunction on... + * wait for it... + * ...JVM! + */ + fun onlyJVMFunction(): Double = 2.5 + /** + * Custom equals function + */ + override fun equals(other: Any?): Boolean { + return super.equals(other) + } + + open fun getDayOfTheWeek(): String { + TODO("not implemented") + } + actual fun getYear(): String { + TODO("not implemented") + } +} + +fun clockList() = listOf(Clock()) + +fun main() { + Greeter().greet().also { println(it) } +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ClockDays.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ClockDays.kt new file mode 100644 index 00000000..136ae5c8 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ClockDays.kt @@ -0,0 +1,15 @@ +package example + +/** + * frgergergrthe + * */ +enum class ClockDays { + /** + * dfsdfsdfds + * */ + FIRST, + SECOND, // test2 + THIRD, // test3 + FOURTH, // test4 + FIFTH // test5 +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ParticularClock.kt b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ParticularClock.kt new file mode 100644 index 00000000..40813b50 --- /dev/null +++ b/plugins/base/src/test/resources/multiplatform/basicMultiplatformTest/jvmMain/kotlin/example/ParticularClock.kt @@ -0,0 +1,32 @@ +package example + +import greeteer.Greeter + +class ParticularClock(private val clockDay: ClockDays) : Clock() { + + /** + * Rings bell [times] + */ + fun ringBell(times: Int) {} + + /** + * Uses provider [greeter] + */ + fun useGreeter(greeter: Greeter) { + + } + + /** + * Day of the week + */ + override fun getDayOfTheWeek() = clockDay.name +} + +/** + * A sample extension function + * When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are $$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$ + * @usesMathJax + */ +fun Clock.extensionFun() { + +} \ No newline at end of file -- cgit From c5b4475e4adf5f5168b6131df78970dc06d470a2 Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Tue, 25 Feb 2020 17:22:51 +0100 Subject: output comparing --- .../test/resources/expect/test/out/-search.html | 25 ++ .../expect/test/out/images/arrow_down.svg | 4 + .../resources/expect/test/out/images/logo-icon.svg | 3 + .../resources/expect/test/out/images/logo-text.svg | 10 + .../test/resources/expect/test/out/navigation.html | 14 + .../test/resources/expect/test/out/root/fn.html | 30 ++ .../test/resources/expect/test/out/root/index.html | 37 +++ .../expect/test/out/scripts/navigationLoader.js | 12 + .../resources/expect/test/out/scripts/pages.js | 5 + .../resources/expect/test/out/scripts/scripts.js | 11 + .../resources/expect/test/out/scripts/search.js | 6 + .../resources/expect/test/out/styles/style.css | 353 +++++++++++++++++++++ .../src/test/resources/expect/test/src/function.kt | 5 + 13 files changed, 515 insertions(+) create mode 100644 plugins/base/src/test/resources/expect/test/out/-search.html create mode 100644 plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg create mode 100644 plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg create mode 100644 plugins/base/src/test/resources/expect/test/out/images/logo-text.svg create mode 100644 plugins/base/src/test/resources/expect/test/out/navigation.html create mode 100644 plugins/base/src/test/resources/expect/test/out/root/fn.html create mode 100644 plugins/base/src/test/resources/expect/test/out/root/index.html create mode 100644 plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js create mode 100644 plugins/base/src/test/resources/expect/test/out/scripts/pages.js create mode 100644 plugins/base/src/test/resources/expect/test/out/scripts/scripts.js create mode 100644 plugins/base/src/test/resources/expect/test/out/scripts/search.js create mode 100644 plugins/base/src/test/resources/expect/test/out/styles/style.css create mode 100644 plugins/base/src/test/resources/expect/test/src/function.kt (limited to 'plugins/base/src/test/resources') diff --git a/plugins/base/src/test/resources/expect/test/out/-search.html b/plugins/base/src/test/resources/expect/test/out/-search.html new file mode 100644 index 00000000..6f6af500 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/-search.html @@ -0,0 +1,25 @@ + + + Search + + + + + + +
+

Search results for

+ + +
+
+ + + diff --git a/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg new file mode 100644 index 00000000..d6dedd64 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg @@ -0,0 +1,4 @@ + + + diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg new file mode 100644 index 00000000..61606c7e --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg new file mode 100644 index 00000000..e98992a8 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/plugins/base/src/test/resources/expect/test/out/navigation.html b/plugins/base/src/test/resources/expect/test/out/navigation.html new file mode 100644 index 00000000..b0f35878 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/navigation.html @@ -0,0 +1,14 @@ + + diff --git a/plugins/base/src/test/resources/expect/test/out/root/fn.html b/plugins/base/src/test/resources/expect/test/out/root/fn.html new file mode 100644 index 00000000..8b6a80c1 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/root/fn.html @@ -0,0 +1,30 @@ + + + fn + + + + + + +
//root//fn +

fn

+ fun fn() +

Description [jvm]

+ Function fn + +

Parameters

+ + + +
+
+ + + diff --git a/plugins/base/src/test/resources/expect/test/out/root/index.html b/plugins/base/src/test/resources/expect/test/out/root/index.html new file mode 100644 index 00000000..0c469a1d --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/root/index.html @@ -0,0 +1,37 @@ + + + + + + + + + +
//root/ +

Package

+

Types

+ + + +
+

Functions

+ + + + + + + + + +
fnfun fn()Function fn
+
+ + + diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js new file mode 100644 index 00000000..c2117dd5 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js @@ -0,0 +1,12 @@ +onload = () => { + fetch(pathToRoot + "navigation.html") + .then(response => response.text()) + .then(data => { + document.getElementById("sideMenu").innerHTML = data; + }).then(() => { + document.querySelectorAll(".overview > a").forEach(link => { + link.setAttribute("href", pathToRoot + link.getAttribute("href")) + console.log(link.attributes["href"]) + }) + }) +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/pages.js b/plugins/base/src/test/resources/expect/test/out/scripts/pages.js new file mode 100644 index 00000000..93315f40 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/scripts/pages.js @@ -0,0 +1,5 @@ +var pages = [ + {"name": "root", "location": "root/index.html"}, + {"name": "", "location": "root//index.html"}, + {"name": "fn", "location": "root//fn.html"} +] diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js b/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js new file mode 100644 index 00000000..8b84d525 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js @@ -0,0 +1,11 @@ +document.getElementById("navigationFilter").oninput = function (e) { + var input = e.target.value; + var menuParts = document.getElementsByClassName("sideMenuPart") + for (let part of menuParts) { + if (part.querySelector("a").textContent.startsWith(input)) { + part.classList.remove("filtered"); + } else { + part.classList.add("filtered"); + } + } +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/search.js b/plugins/base/src/test/resources/expect/test/out/scripts/search.js new file mode 100644 index 00000000..22346f38 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/scripts/search.js @@ -0,0 +1,6 @@ +var query = new URLSearchParams(window.location.search).get("query"); +document.getElementById("searchTitle").innerHTML += '"' + query + '":'; +document.getElementById("searchTable").innerHTML = pages.filter(el => el.name.startsWith(query)).reduce((acc, element) => { + return acc + + '' + element.name + '' +}, ""); \ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/test/out/styles/style.css b/plugins/base/src/test/resources/expect/test/out/styles/style.css new file mode 100644 index 00000000..9a44da89 --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/out/styles/style.css @@ -0,0 +1,353 @@ +@import url(https://fonts.googleapis.com/css?family=Open+Sans:300i,400,700); + + +#content { + margin-top: 3em; + margin-left: 15em; +} + +#navigation { + position: relative +} + +#sideMenu, #searchBar { + position: absolute; +} + +#sideMenu { + width: 14em; + padding-left: 0.5em; +} + +#sideMenu .sideMenuPart { + margin-left: 1em; +} + +#sideMenu img { + margin: 1em 0.25em; +} + +#sideMenu hr { + background: #DADFE6; +} + +#searchBar { + width: 100%; + pointer-events: none; +} + +#searchForm { + float: right; + pointer-events: all; +} + +.sideMenuPart > .navButton { + margin-left: 0.25em +} + +.sideMenuPart > .overview .navButtonContent::after { + float: right; + content: url("../images/arrow_down.svg"); +} + +.sideMenuPart.hidden > .navButton .navButtonContent::after { + content: '\02192'; +} + +.sideMenuPart.hidden > .sideMenuPart { + display: none; +} + +.filtered > a, .filtered > .navButton { + display: none; +} + +body, table { + font: 14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; + background: #F4F4F4; + font-weight: 300; + margin-left: auto; + margin-right: auto; + max-width: 1440px; +} + +table { + display: flex; + padding: 5px; +} + +td:first-child { + width: 20vw; +} + +.keyword { + color: black; + font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-size: 12px; +} + +.symbol { + font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-size: 12px; +} + +.identifier { + color: darkblue; + font-size: 12px; + font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; +} + +h1, h2, h3, h4, h5, h6 { + color: #222; + margin: 0 0 20px; +} + +p, ul, ol, table, pre, dl { + margin: 0 0 20px; +} + +h1, h2, h3 { + line-height: 1.1; +} + +h1 { + font-size: 28px; +} + +h2 { + color: #393939; +} + +h3, h4, h5, h6 { + color: #494949; +} + +a { + color: #258aaf; + font-weight: 400; + text-decoration: none; +} + +a:hover { + color: inherit; + text-decoration: underline; +} + +a small { + font-size: 11px; + color: #555; + margin-top: -0.6em; + display: block; +} + +.wrapper { + width: 860px; + margin: 0 auto; +} + +blockquote { + border-left: 1px solid #e5e5e5; + margin: 0; + padding: 0 0 0 20px; + font-style: italic; +} + +code, pre { + font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + color: #333; + font-size: 12px; +} + +pre { + display: block; + /* + padding:8px 8px; + background: #f8f8f8; + border-radius:5px; + border:1px solid #e5e5e5; + */ + overflow-x: auto; +} + +table { + width: 100%; + border-collapse: collapse; +} + +th, td { + text-align: left; + vertical-align: top; + padding: 5px 10px; +} + +dt { + color: #444; + font-weight: 700; +} + +th { + color: #444; +} + +img { + max-width: 100%; +} + +header { + width: 270px; + float: left; + position: fixed; +} + +header ul { + list-style: none; + height: 40px; + + padding: 0; + + background: #eee; + background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8f8f8), color-stop(100%, #dddddd)); + background: -webkit-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + background: -o-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + background: -ms-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + + border-radius: 5px; + border: 1px solid #d2d2d2; + box-shadow: inset #fff 0 1px 0, inset rgba(0, 0, 0, 0.03) 0 -1px 0; + width: 270px; +} + +header li { + width: 89px; + float: left; + border-right: 1px solid #d2d2d2; + height: 40px; +} + +header ul a { + line-height: 1; + font-size: 11px; + color: #999; + display: block; + text-align: center; + padding-top: 6px; + height: 40px; +} + +strong { + color: #222; + font-weight: 700; +} + +header ul li + li { + width: 88px; + border-left: 1px solid #fff; +} + +header ul li + li + li { + border-right: none; + width: 89px; +} + +header ul a strong { + font-size: 14px; + display: block; + color: #222; +} + +section { + width: 500px; + float: right; + padding-bottom: 50px; +} + +small { + font-size: 11px; +} + +hr { + border: 0; + background: #e5e5e5; + height: 1px; + margin: 0 0 20px; +} + +footer { + width: 270px; + float: left; + position: fixed; + bottom: 50px; +} + +@media print, screen and (max-width: 960px) { + + div.wrapper { + width: auto; + margin: 0; + } + + header, section, footer { + float: none; + position: static; + width: auto; + } + + header { + padding-right: 320px; + } + + section { + border: 1px solid #e5e5e5; + border-width: 1px 0; + padding: 20px 0; + margin: 0 0 20px; + } + + header a small { + display: inline; + } + + header ul { + position: absolute; + right: 50px; + top: 52px; + } +} + +@media print, screen and (max-width: 720px) { + body { + word-wrap: break-word; + } + + header { + padding: 0; + } + + header ul, header p.view { + position: static; + } + + pre, code { + word-wrap: normal; + } +} + +@media print, screen and (max-width: 480px) { + body { + padding: 15px; + } + + header ul { + display: none; + } +} + +@media print { + body { + padding: 0.4in; + font-size: 12pt; + color: #444; + } +} diff --git a/plugins/base/src/test/resources/expect/test/src/function.kt b/plugins/base/src/test/resources/expect/test/src/function.kt new file mode 100644 index 00000000..3ed81dfa --- /dev/null +++ b/plugins/base/src/test/resources/expect/test/src/function.kt @@ -0,0 +1,5 @@ +/** + * Function fn + */ +fun fn() { +} \ No newline at end of file -- cgit From 971ca471fbca2d382557e8609706eb683a3ada96 Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Wed, 26 Feb 2020 11:33:43 +0100 Subject: response to comments --- .../test/resources/expect/test/out/-search.html | 42 ++-- .../expect/test/out/images/arrow_down.svg | 3 +- .../resources/expect/test/out/images/logo-icon.svg | 2 +- .../resources/expect/test/out/images/logo-text.svg | 12 +- .../test/resources/expect/test/out/navigation.html | 16 +- .../test/resources/expect/test/out/root/fn.html | 37 ++-- .../test/resources/expect/test/out/root/index.html | 41 ++-- .../expect/test/out/scripts/navigationLoader.js | 8 +- .../resources/expect/test/out/scripts/pages.js | 6 +- .../resources/expect/test/out/scripts/scripts.js | 18 +- .../resources/expect/test/out/scripts/search.js | 7 +- .../resources/expect/test/out/styles/style.css | 240 ++++++++++----------- 12 files changed, 209 insertions(+), 223 deletions(-) (limited to 'plugins/base/src/test/resources') diff --git a/plugins/base/src/test/resources/expect/test/out/-search.html b/plugins/base/src/test/resources/expect/test/out/-search.html index 6f6af500..1ee812bb 100644 --- a/plugins/base/src/test/resources/expect/test/out/-search.html +++ b/plugins/base/src/test/resources/expect/test/out/-search.html @@ -1,25 +1,23 @@ - - Search - - - - - - -
-

Search results for

- - -
-
- + + Search + + + + + + +
+

Search results for

+ + +
+
+ diff --git a/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg index d6dedd64..89e7df47 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg @@ -1,4 +1,3 @@ - + diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg index 61606c7e..1b3b3670 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg @@ -1,3 +1,3 @@ - + diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg index e98992a8..7bf3e6c5 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg @@ -1,10 +1,6 @@ - - - - + + + + diff --git a/plugins/base/src/test/resources/expect/test/out/navigation.html b/plugins/base/src/test/resources/expect/test/out/navigation.html index b0f35878..ebff817d 100644 --- a/plugins/base/src/test/resources/expect/test/out/navigation.html +++ b/plugins/base/src/test/resources/expect/test/out/navigation.html @@ -1,14 +1,10 @@
//root/

Package

-

Types

- - - -

Functions

-- cgit From ad8d1e01a8d4f1f6066c74f89466f3b33c948f87 Mon Sep 17 00:00:00 2001 From: Paweł Marks Date: Wed, 4 Mar 2020 00:37:56 +0100 Subject: Update of test data --- plugins/base/src/test/resources/expect/test/out/root/fn.html | 2 +- plugins/base/src/test/resources/expect/test/out/root/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/base/src/test/resources') diff --git a/plugins/base/src/test/resources/expect/test/out/root/fn.html b/plugins/base/src/test/resources/expect/test/out/root/fn.html index 806730da..cc0ae002 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/fn.html +++ b/plugins/base/src/test/resources/expect/test/out/root/fn.html @@ -14,7 +14,7 @@
//root//fn

fn

-fun fn() +public final fun fn()

Description

Function fn
diff --git a/plugins/base/src/test/resources/expect/test/out/root/index.html b/plugins/base/src/test/resources/expect/test/out/root/index.html index fa51a24a..81f2bcc2 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/index.html +++ b/plugins/base/src/test/resources/expect/test/out/root/index.html @@ -20,7 +20,7 @@ - + -- cgit From 1ed877e8b51ec586a2976e8088e34d17de82fc52 Mon Sep 17 00:00:00 2001 From: Paweł Marks Date: Wed, 4 Mar 2020 14:07:57 +0100 Subject: Now signature provider uses new visibility model --- plugins/base/src/test/resources/expect/test/out/root/fn.html | 2 +- plugins/base/src/test/resources/expect/test/out/root/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/base/src/test/resources') diff --git a/plugins/base/src/test/resources/expect/test/out/root/fn.html b/plugins/base/src/test/resources/expect/test/out/root/fn.html index cc0ae002..e87d7bc4 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/fn.html +++ b/plugins/base/src/test/resources/expect/test/out/root/fn.html @@ -14,7 +14,7 @@
//root//fn

fn

-public final fun fn() +final fun fn()

Description

Function fn
diff --git a/plugins/base/src/test/resources/expect/test/out/root/index.html b/plugins/base/src/test/resources/expect/test/out/root/index.html index 81f2bcc2..25c65b11 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/index.html +++ b/plugins/base/src/test/resources/expect/test/out/root/index.html @@ -20,7 +20,7 @@ - + -- cgit From 4002c4e91cb42ef77e93cac57ac49823629d33da Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Thu, 27 Feb 2020 14:50:27 +0100 Subject: Add expect with generation --- .../expect/annotatedFunction/out/html/-search.html | 23 ++ .../annotatedFunction/out/html/navigation.html | 10 + .../expect/annotatedFunction/out/html/root/f.html | 20 ++ .../annotatedFunction/out/html/root/index.html | 31 ++ .../annotatedFunction/src/annotatedFunction.kt | 2 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 25 ++ .../out/html/root/-fancy/-init-.html | 30 ++ .../out/html/root/-fancy/equals.html | 30 ++ .../out/html/root/-fancy/hash-code.html | 20 ++ .../out/html/root/-fancy/index.html | 61 ++++ .../out/html/root/-fancy/to-string.html | 20 ++ .../out/html/root/f.html | 20 ++ .../out/html/root/index.html | 42 +++ .../annotatedFunctionWithAnnotationParameters.kt | 7 + .../expect/function/out/html/-search.html | 23 ++ .../expect/function/out/html/navigation.html | 10 + .../expect/function/out/html/root/fn.html | 23 ++ .../expect/function/out/html/root/index.html | 31 ++ .../test/resources/expect/function/src/function.kt | 5 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 25 ++ .../out/html/root/-fancy/-init-.html | 20 ++ .../out/html/root/-fancy/equals.html | 30 ++ .../out/html/root/-fancy/hash-code.html | 20 ++ .../out/html/root/-fancy/index.html | 51 +++ .../out/html/root/-fancy/to-string.html | 20 ++ .../out/html/root/function.html | 30 ++ .../out/html/root/index.html | 42 +++ .../src/functionWithAnnotatedParam.kt | 7 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 10 + .../out/html/root/f.html | 30 ++ .../out/html/root/index.html | 31 ++ .../src/functionWithDefaultParameter.kt | 1 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 10 + .../out/html/root/function.html | 30 ++ .../out/html/root/index.html | 31 ++ .../src/functionWithNoinlineParam.kt | 2 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 10 + .../out/html/root/f.html | 20 ++ .../out/html/root/index.html | 31 ++ .../src/functionWithNotDocumentedAnnotation.kt | 2 + .../functionWithParams/out/html/-search.html | 23 ++ .../functionWithParams/out/html/navigation.html | 10 + .../functionWithParams/out/html/root/function.html | 34 ++ .../functionWithParams/out/html/root/index.html | 31 ++ .../functionWithParams/src/functionWithParams.kt | 8 + .../functionWithReceiver/out/html/-search.html | 23 ++ .../functionWithReceiver/out/html/navigation.html | 10 + .../functionWithReceiver/out/html/root/fn.html | 38 +++ .../functionWithReceiver/out/html/root/index.html | 36 +++ .../src/functionWithReceiver.kt | 11 + .../expect/genericFunction/out/html/-search.html | 23 ++ .../genericFunction/out/html/navigation.html | 10 + .../genericFunction/out/html/root/generic.html | 23 ++ .../genericFunction/out/html/root/index.html | 31 ++ .../expect/genericFunction/src/genericFunction.kt | 5 + .../out/html/-search.html | 23 ++ .../out/html/navigation.html | 10 + .../out/html/root/generic.html | 23 ++ .../out/html/root/index.html | 31 ++ .../src/genericFunctionWithConstraints.kt | 6 + .../expect/inlineFunction/out/html/-search.html | 23 ++ .../expect/inlineFunction/out/html/navigation.html | 10 + .../expect/inlineFunction/out/html/root/f.html | 30 ++ .../expect/inlineFunction/out/html/root/index.html | 31 ++ .../expect/inlineFunction/src/inlineFunction.kt | 2 + .../inlineSuspendFunction/out/html/-search.html | 23 ++ .../inlineSuspendFunction/out/html/navigation.html | 10 + .../inlineSuspendFunction/out/html/root/f.html | 30 ++ .../inlineSuspendFunction/out/html/root/index.html | 31 ++ .../src/inlineSuspendFunction.kt | 2 + .../expect/sinceKotlin/out/html/-search.html | 23 ++ .../expect/sinceKotlin/out/html/navigation.html | 10 + .../out/html/root/available-since1.1.html | 23 ++ .../expect/sinceKotlin/out/html/root/index.html | 31 ++ .../expect/sinceKotlin/src/sinceKotlin.kt | 5 + .../expect/suspendFunction/out/html/-search.html | 23 ++ .../suspendFunction/out/html/navigation.html | 10 + .../expect/suspendFunction/out/html/root/f.html | 20 ++ .../suspendFunction/out/html/root/index.html | 31 ++ .../expect/suspendFunction/src/suspendFunction.kt | 2 + .../suspendInlineFunction/out/html/-search.html | 23 ++ .../suspendInlineFunction/out/html/navigation.html | 10 + .../suspendInlineFunction/out/html/root/f.html | 30 ++ .../suspendInlineFunction/out/html/root/index.html | 31 ++ .../src/suspendInlineFunction.kt | 2 + .../test/resources/expect/test/out/-search.html | 23 -- .../expect/test/out/images/arrow_down.svg | 3 - .../resources/expect/test/out/images/logo-icon.svg | 3 - .../resources/expect/test/out/images/logo-text.svg | 6 - .../test/resources/expect/test/out/navigation.html | 10 - .../test/resources/expect/test/out/root/fn.html | 23 -- .../test/resources/expect/test/out/root/index.html | 31 -- .../expect/test/out/scripts/navigationLoader.js | 12 - .../resources/expect/test/out/scripts/pages.js | 5 - .../resources/expect/test/out/scripts/scripts.js | 11 - .../resources/expect/test/out/scripts/search.js | 5 - .../resources/expect/test/out/styles/style.css | 353 --------------------- .../src/test/resources/expect/test/src/function.kt | 5 - 103 files changed, 1876 insertions(+), 490 deletions(-) create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/-search.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/src/annotatedFunction.kt create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/-search.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/src/annotatedFunctionWithAnnotationParameters.kt create mode 100644 plugins/base/src/test/resources/expect/function/out/html/-search.html create mode 100644 plugins/base/src/test/resources/expect/function/out/html/navigation.html create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/fn.html create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/index.html create mode 100644 plugins/base/src/test/resources/expect/function/src/function.kt create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/-search.html c
fnfun fn()public final fun fn() Function fn
fnpublic final fun fn()final fun fn() Function fn