From 64e600b126ae8edcfbb3c2716febb01d221520b5 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Tue, 14 Apr 2020 14:14:31 +0200 Subject: Fix path clash with top-level declarations, catch link resolving exception, remove default values while merging, merge expect by targets --- plugins/base/src/test/kotlin/model/PackagesTest.kt | 4 +- .../annotatedFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../expect/annotatedFunction/out/html/root/f.html | 29 -------- .../annotatedFunction/out/html/root/index.html | 23 +++---- .../annotatedFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../annotatedFunction/out/html/scripts/main.js.map | 1 + .../annotatedFunction/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 10 +-- .../out/html/root/-fancy/-init-.html | 29 -------- .../out/html/root/-fancy/equals.html | 29 -------- .../out/html/root/-fancy/hash-code.html | 29 -------- .../out/html/root/-fancy/index.html | 77 ---------------------- .../out/html/root/-fancy/to-string.html | 29 -------- .../out/html/root//-fancy/-init-.html | 29 ++++++++ .../out/html/root//-fancy/equals.html | 29 ++++++++ .../out/html/root//-fancy/hash-code.html | 29 ++++++++ .../out/html/root//-fancy/index.html | 77 ++++++++++++++++++++++ .../out/html/root//-fancy/to-string.html | 29 ++++++++ .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 59 +++++++++++++++++ .../out/html/root/f.html | 29 -------- .../out/html/root/index.html | 38 +++-------- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 14 ++-- .../expect/function/out/html/navigation.html | 6 +- .../function/out/html/root//fn.html | 30 +++++++++ .../function/out/html/root//index.html | 44 +++++++++++++ .../expect/function/out/html/root/fn.html | 30 --------- .../expect/function/out/html/root/index.html | 23 +++---- .../expect/function/out/html/scripts/main.js | 59 +++++++++++++++++ .../expect/function/out/html/scripts/main.js.map | 1 + .../expect/function/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 10 +-- .../out/html/root/-fancy/-init-.html | 29 -------- .../out/html/root/-fancy/equals.html | 29 -------- .../out/html/root/-fancy/hash-code.html | 29 -------- .../out/html/root/-fancy/index.html | 62 ----------------- .../out/html/root/-fancy/to-string.html | 29 -------- .../out/html/root//-fancy/-init-.html | 29 ++++++++ .../out/html/root//-fancy/equals.html | 29 ++++++++ .../out/html/root//-fancy/hash-code.html | 29 ++++++++ .../out/html/root//-fancy/index.html | 62 +++++++++++++++++ .../out/html/root//-fancy/to-string.html | 29 ++++++++ .../out/html/root//function.html | 29 ++++++++ .../out/html/root//index.html | 59 +++++++++++++++++ .../out/html/root/function.html | 29 -------- .../out/html/root/index.html | 38 +++-------- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 14 ++-- .../out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../out/html/root/f.html | 29 -------- .../out/html/root/index.html | 23 +++---- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//function.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../out/html/root/function.html | 29 -------- .../out/html/root/index.html | 23 +++---- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../out/html/root/f.html | 29 -------- .../out/html/root/index.html | 23 +++---- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- .../functionWithParams/out/html/navigation.html | 6 +- .../out/html/root//function.html | 30 +++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../functionWithParams/out/html/root/function.html | 30 --------- .../functionWithParams/out/html/root/index.html | 23 +++---- .../functionWithParams/out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../functionWithParams/out/html/scripts/pages.js | 4 +- .../functionWithReceiver/out/html/navigation.html | 6 +- .../out/html/root//fn.html | 34 ++++++++++ .../out/html/root//index.html | 53 +++++++++++++++ .../functionWithReceiver/out/html/root/fn.html | 34 ---------- .../functionWithReceiver/out/html/root/index.html | 32 +++------ .../functionWithReceiver/out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../functionWithReceiver/out/html/scripts/pages.js | 4 +- .../genericFunction/out/html/navigation.html | 6 +- .../out/html/root//generic.html | 30 +++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../genericFunction/out/html/root/generic.html | 30 --------- .../genericFunction/out/html/root/index.html | 23 +++---- .../genericFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../genericFunction/out/html/scripts/main.js.map | 1 + .../genericFunction/out/html/scripts/pages.js | 4 +- .../out/html/navigation.html | 6 +- .../out/html/root//generic.html | 30 +++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../out/html/root/generic.html | 30 --------- .../out/html/root/index.html | 23 +++---- .../out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- .../expect/inlineFunction/out/html/navigation.html | 6 +- .../inlineFunction/out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../expect/inlineFunction/out/html/root/f.html | 29 -------- .../expect/inlineFunction/out/html/root/index.html | 23 +++---- .../expect/inlineFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../inlineFunction/out/html/scripts/main.js.map | 1 + .../inlineFunction/out/html/scripts/pages.js | 4 +- .../inlineSuspendFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../inlineSuspendFunction/out/html/root/f.html | 29 -------- .../inlineSuspendFunction/out/html/root/index.html | 23 +++---- .../inlineSuspendFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- .../expect/signatureTest/out/html/scripts/main.js | 59 +++++++++++++++++ .../signatureTest/out/html/scripts/main.js.map | 1 + .../expect/sinceKotlin/out/html/navigation.html | 6 +- .../html/root//available-since1.1.html | 30 +++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../out/html/root/available-since1.1.html | 30 --------- .../expect/sinceKotlin/out/html/root/index.html | 23 +++---- .../expect/sinceKotlin/out/html/scripts/main.js | 59 +++++++++++++++++ .../sinceKotlin/out/html/scripts/main.js.map | 1 + .../expect/sinceKotlin/out/html/scripts/pages.js | 4 +- .../suspendFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../expect/suspendFunction/out/html/root/f.html | 29 -------- .../suspendFunction/out/html/root/index.html | 23 +++---- .../suspendFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../suspendFunction/out/html/scripts/main.js.map | 1 + .../suspendFunction/out/html/scripts/pages.js | 4 +- .../suspendInlineFunction/out/html/navigation.html | 6 +- .../out/html/root//f.html | 29 ++++++++ .../out/html/root//index.html | 44 +++++++++++++ .../suspendInlineFunction/out/html/root/f.html | 29 -------- .../suspendInlineFunction/out/html/root/index.html | 23 +++---- .../suspendInlineFunction/out/html/scripts/main.js | 59 +++++++++++++++++ .../out/html/scripts/main.js.map | 1 + .../out/html/scripts/pages.js | 4 +- 151 files changed, 2864 insertions(+), 1188 deletions(-) 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 delete 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/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/main.js.map delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html delete 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//-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 delete 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/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/main.js.map 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 delete 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/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/function/out/html/scripts/main.js.map delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/-init-.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/equals.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/hash-code.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/index.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//-fancy/to-string.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root//function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root//function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root//fn.html create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root//generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/signatureTest/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/signatureTest/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//available-since1.1.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/main.js.map create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root//f.html create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/f.html create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/main.js.map (limited to 'plugins/base/src/test') diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt index 8885dae0..ec8921d6 100644 --- a/plugins/base/src/test/kotlin/model/PackagesTest.kt +++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt @@ -14,8 +14,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac """.trimIndent(), prependPackage = false ) { - with((this / "").cast()) { - name equals "" + with((this / "").cast()) { + name equals "" children counts 0 } } diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html index a6a421f1..463b028f 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html @@ -1,9 +1,9 @@