From 8ef68182c02d8ec8fc33d0de0b7fcdef183e7ee7 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 30 Dec 2014 12:36:14 +0100 Subject: more correct formatting of Markdown tables --- test/data/format/classWithClassObject.html | 44 ++++++++++++++++++++++++++++++ test/data/format/classWithClassObject.md | 29 ++------------------ test/src/TestAPI.kt | 7 ++--- test/src/format/HtmlFormatTest.kt | 15 ++++++++++ test/src/format/MarkdownFormatTest.kt | 4 +-- 5 files changed, 67 insertions(+), 32 deletions(-) create mode 100644 test/data/format/classWithClassObject.html create mode 100644 test/src/format/HtmlFormatTest.kt (limited to 'test') diff --git a/test/data/format/classWithClassObject.html b/test/data/format/classWithClassObject.html new file mode 100644 index 00000000..79546418 --- /dev/null +++ b/test/data/format/classWithClassObject.html @@ -0,0 +1,44 @@ + + + + +test /  / Klass
+
+

Klass

+
class Klass

+
+

Constructors

+ + + + + + + +
+<init> +public Klass()
+

Class Object Properties

+ + + + + + + +
+x +val x: Int
+

Class Object Functions

+ + + + + + + +
+foo +fun foo(): Unit
+ + diff --git a/test/data/format/classWithClassObject.md b/test/data/format/classWithClassObject.md index 10cac365..f694a76f 100644 --- a/test/data/format/classWithClassObject.md +++ b/test/data/format/classWithClassObject.md @@ -14,40 +14,17 @@ class Klass ### Constructors -| -[<init>](out.md) - - | -``` -public Klass() -``` - - | +| [<init>](out.md) | `public Klass()` | ### Class Object Properties -| -[x](out.md) - - | -``` -val x: Int -``` - - | +| [x](out.md) | `val x: Int` | ### Class Object Functions -| -[foo](out.md) - - | -``` -fun foo(): Unit -``` +| [foo](out.md) | `fun foo(): Unit` | - | diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt index 6f4e34c2..cc09f001 100644 --- a/test/src/TestAPI.kt +++ b/test/src/TestAPI.kt @@ -51,13 +51,12 @@ public fun verifyModel(vararg files: String, verifier: (DocumentationModule) -> Disposer.dispose(environment) } -public fun verifyOutput(path: String, outputGenerator: (DocumentationModule, StringBuilder) -> Unit) { +public fun verifyOutput(path: String, outputExtension: String, outputGenerator: (DocumentationModule, StringBuilder) -> Unit) { verifyModel(path) { val output = StringBuilder() outputGenerator(it, output) - val trimmedOutput = output.toString().split('\n').map { it.trimTrailing() }.join("\n") - val expectedOutput = File(path.replace(".kt", ".md")).readText() - assertEquals(expectedOutput.trimTrailing(), trimmedOutput) + val expectedOutput = File(path.replace(".kt", outputExtension)).readText() + assertEquals(expectedOutput, output.toString()) } } diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt new file mode 100644 index 00000000..758c6e7b --- /dev/null +++ b/test/src/format/HtmlFormatTest.kt @@ -0,0 +1,15 @@ +package org.jetbrains.dokka.tests + +import org.jetbrains.dokka.KotlinLanguageService +import org.junit.Test +import org.jetbrains.dokka.HtmlFormatService + +public class HtmlFormatTest { + private val htmlService = HtmlFormatService(InMemoryLocationService, KotlinLanguageService()) + + Test fun classWithClassObject() { + verifyOutput("test/data/format/classWithClassObject.kt", ".html") { model, output -> + htmlService.appendNodes(tempLocation, output, model.members.single().members) + } + } +} diff --git a/test/src/format/MarkdownFormatTest.kt b/test/src/format/MarkdownFormatTest.kt index ea501c53..5cdfb8b5 100644 --- a/test/src/format/MarkdownFormatTest.kt +++ b/test/src/format/MarkdownFormatTest.kt @@ -9,13 +9,13 @@ public class MarkdownFormatTest { private val markdownService = MarkdownFormatService(InMemoryLocationService, KotlinLanguageService()) Test fun emptyDescription() { - verifyOutput("test/data/format/emptyDescription.kt") { model, output -> + verifyOutput("test/data/format/emptyDescription.kt", ".md") { model, output -> markdownService.appendNodes(tempLocation, output, model.members.single().members) } } Test fun classWithClassObject() { - verifyOutput("test/data/format/classWithClassObject.kt") { model, output -> + verifyOutput("test/data/format/classWithClassObject.kt", ".md") { model, output -> markdownService.appendNodes(tempLocation, output, model.members.single().members) } } -- cgit