From 6166ddfeb6ee977a302d4cacc80dac23cc7e2baf Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Fri, 10 Apr 2020 16:59:25 +0200 Subject: Working tests for includes, sources and samples. Minor bugfixes --- core/src/main/kotlin/pages/ContentNodes.kt | 2 +- .../ModuleAndPackageDocumentationTransformer.kt | 34 +++-- .../pages/samples/SamplesTransformer.kt | 74 ++++++---- .../DefaultDescriptorToDocumentableTranslator.kt | 15 +- .../documentables/DefaultPageCreator.kt | 18 +++ .../kotlin/linkableContent/LinkableContentTest.kt | 161 +++++++++++++++++++++ .../test/resources/linkable/includes/include1.md | 7 + .../test/resources/linkable/includes/include2.md | 7 + .../linkable/samples/jsMain/kotlin/JsClass.kt | 9 ++ .../linkable/samples/jsMain/resources/Samples.kt | 10 ++ .../linkable/samples/jvmMain/kotlin/JvmClass.kt | 9 ++ .../linkable/samples/jvmMain/resources/Samples.kt | 10 ++ .../linkable/sources/jsMain/kotlin/JsClass.kt | 3 + .../linkable/sources/jvmMain/kotlin/JvmClass.kt | 3 + 14 files changed, 313 insertions(+), 49 deletions(-) create mode 100644 plugins/base/src/test/kotlin/linkableContent/LinkableContentTest.kt create mode 100644 plugins/base/src/test/resources/linkable/includes/include1.md create mode 100644 plugins/base/src/test/resources/linkable/includes/include2.md create mode 100644 plugins/base/src/test/resources/linkable/samples/jsMain/kotlin/JsClass.kt create mode 100644 plugins/base/src/test/resources/linkable/samples/jsMain/resources/Samples.kt create mode 100644 plugins/base/src/test/resources/linkable/samples/jvmMain/kotlin/JvmClass.kt create mode 100644 plugins/base/src/test/resources/linkable/samples/jvmMain/resources/Samples.kt create mode 100644 plugins/base/src/test/resources/linkable/sources/jsMain/kotlin/JsClass.kt create mode 100644 plugins/base/src/test/resources/linkable/sources/jvmMain/kotlin/JvmClass.kt diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt index c0576006..4127796c 100644 --- a/core/src/main/kotlin/pages/ContentNodes.kt +++ b/core/src/main/kotlin/pages/ContentNodes.kt @@ -91,6 +91,7 @@ data class ContentResolvedLink( /** All links that do not need to be resolved */ data class ContentEmbeddedResource( + override val children: List = emptyList(), val address: String, val altText: String?, override val dci: DCI, @@ -98,7 +99,6 @@ data class ContentEmbeddedResource( override val style: Set