aboutsummaryrefslogtreecommitdiff
path: root/core/src/test/kotlin/format
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2017-02-24 14:44:55 +0100
committerDmitry Jemerov <yole@jetbrains.com>2017-02-24 14:44:55 +0100
commit0f9dac9ea2137fe5935566d84cb2f5264be1a8ba (patch)
tree1064587501fb4e6bad5f4542ddcabfbb31f99749 /core/src/test/kotlin/format
parent004fc0c4eaf9d1ecaa78cf97f7d0fb2e91405031 (diff)
parent2ceff9c41cff42b7fb3ffe75ea36a7c570f3615b (diff)
downloaddokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.tar.gz
dokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.tar.bz2
dokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.zip
Merge remote-tracking branch 'origin/0.9.14/BlankLines'
# Conflicts: # core/src/test/kotlin/format/HtmlFormatTest.kt # core/src/test/kotlin/format/MarkdownFormatTest.kt
Diffstat (limited to 'core/src/test/kotlin/format')
-rw-r--r--core/src/test/kotlin/format/HtmlFormatTest.kt4
-rw-r--r--core/src/test/kotlin/format/MarkdownFormatTest.kt4
2 files changed, 8 insertions, 0 deletions
diff --git a/core/src/test/kotlin/format/HtmlFormatTest.kt b/core/src/test/kotlin/format/HtmlFormatTest.kt
index 221ee811..cbea3209 100644
--- a/core/src/test/kotlin/format/HtmlFormatTest.kt
+++ b/core/src/test/kotlin/format/HtmlFormatTest.kt
@@ -142,6 +142,10 @@ class HtmlFormatTest {
verifyHtmlNode("sinceKotlin")
}
+ @Test fun blankLineInsideCodeBlock() {
+ verifyHtmlNode("blankLineInsideCodeBlock")
+ }
+
private fun verifyHtmlNode(fileName: String, withKotlinRuntime: Boolean = false) {
verifyHtmlNodes(fileName, withKotlinRuntime) { model -> model.members.single().members }
}
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 34870ce7..4830d760 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -298,6 +298,10 @@ class MarkdownFormatTest {
}
}
+ @Test fun blankLineInsideCodeBlock() {
+ verifyMarkdownNode("blankLineInsideCodeBlock")
+ }
+
private fun verifyMarkdownPackage(fileName: String, withKotlinRuntime: Boolean = false) {
verifyOutput("testdata/format/$fileName.kt", ".package.md", withKotlinRuntime = withKotlinRuntime) { model, output ->
markdownService.createOutputBuilder(output, tempLocation).appendNodes(model.members)