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 --- plugins/base/src/test/kotlin/expect/ExpectTest.kt | 9 +- .../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 ++++++++++----------- 13 files changed, 213 insertions(+), 228 deletions(-) (limited to 'plugins') diff --git a/plugins/base/src/test/kotlin/expect/ExpectTest.kt b/plugins/base/src/test/kotlin/expect/ExpectTest.kt index c014c65f..3a85db17 100644 --- a/plugins/base/src/test/kotlin/expect/ExpectTest.kt +++ b/plugins/base/src/test/kotlin/expect/ExpectTest.kt @@ -1,6 +1,5 @@ package expect -import org.jetbrains.dokka.utilities.DokkaConsoleLogger import org.junit.Test import testApi.testRunner.AbstractCoreTest import java.nio.file.Files @@ -34,19 +33,18 @@ class ExpectTest : AbstractCoreTest() { "diff", expected.asString(), path.asString() - ).also { DokkaConsoleLogger.info("git diff command: ${it.command().joinToString(" ")}") } + ).also { logger.info("git diff command: ${it.command().joinToString(" ")}") } .start() assert(gitCompare.waitFor(gitTimeout, TimeUnit.MILLISECONDS)) { "Git timed out after $gitTimeout" } - gitCompare.inputStream.bufferedReader().lines().forEach { DokkaConsoleLogger.info(it) } - gitCompare.errorStream.bufferedReader().lines().forEach { DokkaConsoleLogger.info(it) } + gitCompare.inputStream.bufferedReader().lines().forEach { logger.info(it) } + gitCompare.errorStream.bufferedReader().lines().forEach { logger.info(it) } assert(gitCompare.exitValue() == 0) { "${path.fileName}: outputs don't match" } } ?: throw AssertionError("obtained path is null") } @Test fun expectTest() { - val logger = DokkaConsoleLogger val sources = Paths.get("src/test", "resources", "expect") Files.list(sources).forEach { p -> @@ -55,6 +53,7 @@ class ExpectTest : AbstractCoreTest() { .also { logger.info("Test out: ${it?.asString()}") } compareOutput(expectOut, testOut) + testOut?.toFile()?.deleteRecursively() } } 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

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 8b6a80c1..f272cbe7 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 @@ -1,30 +1,29 @@ - + fn - - -

- + + + -

//root//fn -

fn

- fun fn() -

Description [jvm]

- Function fn +

//root//fn +

fn

+fun fn() +

Description [jvm]

+Function fn -

Parameters

- +

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 index 0c469a1d..c17e426d 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 @@ -1,37 +1,36 @@ - + - - -

- + + + -

//root/ -

Package

Types

- +

//root/ +

Package

Types

Functions

- +

Functions

+ - + - + -

fn	fun 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 index c2117dd5..99a885a9 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js @@ -1,9 +1,9 @@ onload = () => { fetch(pathToRoot + "navigation.html") - .then(response => response.text()) - .then(data => { - document.getElementById("sideMenu").innerHTML = data; - }).then(() => { + .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"]) 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 index 93315f40..c0bd7a2f 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ - {"name": "root", "location": "root/index.html"}, - {"name": "", "location": "root//index.html"}, - {"name": "fn", "location": "root//fn.html"} +{ "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 index 8b84d525..c2e29b9f 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js @@ -1,11 +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"); - } - } + 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 index 22346f38..63112ac5 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/search.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/search.js @@ -1,6 +1,5 @@ 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 + + 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 + }, ""); \ 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 index 9a44da89..4a76dd96 100644 --- a/plugins/base/src/test/resources/expect/test/out/styles/style.css +++ b/plugins/base/src/test/resources/expect/test/out/styles/style.css @@ -42,7 +42,7 @@ } .sideMenuPart > .navButton { - margin-left: 0.25em + margin-left:0.25em } .sideMenuPart > .overview .navButtonContent::after { @@ -62,10 +62,10 @@ display: none; } -body, table { - font: 14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; +body, table{ + font:14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; background: #F4F4F4; - font-weight: 300; + font-weight:300; margin-left: auto; margin-right: auto; max-width: 1440px; @@ -73,7 +73,7 @@ body, table { table { display: flex; - padding: 5px; + padding:5px; } td:first-child { @@ -81,273 +81,273 @@ td:first-child { } .keyword { - color: black; - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; - font-size: 12px; + 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; + 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; + 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; + color:#222; + margin:0 0 20px; } p, ul, ol, table, pre, dl { - margin: 0 0 20px; + margin:0 0 20px; } h1, h2, h3 { - line-height: 1.1; + line-height:1.1; } h1 { - font-size: 28px; + font-size:28px; } h2 { - color: #393939; + color:#393939; } h3, h4, h5, h6 { - color: #494949; + color:#494949; } a { - color: #258aaf; - font-weight: 400; - text-decoration: none; + color:#258aaf; + font-weight:400; + text-decoration:none; } a:hover { color: inherit; - text-decoration: underline; + text-decoration:underline; } a small { - font-size: 11px; - color: #555; - margin-top: -0.6em; - display: block; + font-size:11px; + color:#555; + margin-top:-0.6em; + display:block; } .wrapper { - width: 860px; - margin: 0 auto; + width:860px; + margin:0 auto; } blockquote { - border-left: 1px solid #e5e5e5; - margin: 0; - padding: 0 0 0 20px; - font-style: italic; + 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; + 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; - */ +/* + padding:8px 8px; + background: #f8f8f8; + border-radius:5px; + border:1px solid #e5e5e5; +*/ overflow-x: auto; } table { - width: 100%; - border-collapse: collapse; + width:100%; + border-collapse:collapse; } th, td { - text-align: left; + text-align:left; vertical-align: top; - padding: 5px 10px; + padding:5px 10px; } dt { - color: #444; - font-weight: 700; + color:#444; + font-weight:700; } th { - color: #444; + color:#444; } img { - max-width: 100%; + max-width:100%; } header { - width: 270px; - float: left; - position: fixed; + width:270px; + float:left; + position:fixed; } header ul { - list-style: none; - height: 40px; + list-style:none; + height:40px; - padding: 0; + 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%); + 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; + 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; + 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; + line-height:1; + font-size:11px; + color:#999; + display:block; + text-align:center; + padding-top:6px; + height:40px; } strong { - color: #222; - font-weight: 700; + color:#222; + font-weight:700; } header ul li + li { - width: 88px; - border-left: 1px solid #fff; + width:88px; + border-left:1px solid #fff; } header ul li + li + li { - border-right: none; - width: 89px; + border-right:none; + width:89px; } header ul a strong { - font-size: 14px; - display: block; - color: #222; + font-size:14px; + display:block; + color:#222; } section { - width: 500px; - float: right; - padding-bottom: 50px; + width:500px; + float:right; + padding-bottom:50px; } small { - font-size: 11px; + font-size:11px; } hr { - border: 0; - background: #e5e5e5; - height: 1px; - margin: 0 0 20px; + border:0; + background:#e5e5e5; + height:1px; + margin:0 0 20px; } footer { - width: 270px; - float: left; - position: fixed; - bottom: 50px; + width:270px; + float:left; + position:fixed; + bottom:50px; } @media print, screen and (max-width: 960px) { div.wrapper { - width: auto; - margin: 0; + width:auto; + margin:0; } header, section, footer { - float: none; - position: static; - width: auto; + float:none; + position:static; + width:auto; } header { - padding-right: 320px; + padding-right:320px; } section { - border: 1px solid #e5e5e5; - border-width: 1px 0; - padding: 20px 0; - margin: 0 0 20px; + border:1px solid #e5e5e5; + border-width:1px 0; + padding:20px 0; + margin:0 0 20px; } header a small { - display: inline; + display:inline; } header ul { - position: absolute; - right: 50px; - top: 52px; + position:absolute; + right:50px; + top:52px; } } @media print, screen and (max-width: 720px) { body { - word-wrap: break-word; + word-wrap:break-word; } header { - padding: 0; + padding:0; } header ul, header p.view { - position: static; + position:static; } pre, code { - word-wrap: normal; + word-wrap:normal; } } @media print, screen and (max-width: 480px) { body { - padding: 15px; + padding:15px; } header ul { - display: none; + display:none; } } @media print { body { - padding: 0.4in; - font-size: 12pt; - color: #444; + padding:0.4in; + font-size:12pt; + color:#444; } } -- cgit