aboutsummaryrefslogtreecommitdiff
path: root/test/src
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-01-14 20:23:44 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-01-14 20:23:44 +0100
commitcfc0348e120df881461ada2d3299f0fb4314f49e (patch)
tree2e52040fb3437146c77f1dbe6a33442a4ed71b4a /test/src
parent60e610ebdd86663bedf113d2235ac3c8364171d0 (diff)
parentfaad901ed29f802d7b304c06ae62954b149960e7 (diff)
downloaddokka-cfc0348e120df881461ada2d3299f0fb4314f49e.tar.gz
dokka-cfc0348e120df881461ada2d3299f0fb4314f49e.tar.bz2
dokka-cfc0348e120df881461ada2d3299f0fb4314f49e.zip
Merge branch 'property-var'
Conflicts: test/src/format/MarkdownFormatTest.kt
Diffstat (limited to 'test/src')
-rw-r--r--test/src/format/MarkdownFormatTest.kt6
-rw-r--r--test/src/model/PropertyTest.kt3
2 files changed, 8 insertions, 1 deletions
diff --git a/test/src/format/MarkdownFormatTest.kt b/test/src/format/MarkdownFormatTest.kt
index 580acd7c..293b9cb2 100644
--- a/test/src/format/MarkdownFormatTest.kt
+++ b/test/src/format/MarkdownFormatTest.kt
@@ -69,4 +69,10 @@ public class MarkdownFormatTest {
}
}
+
+ Test fun propertyVar() {
+ verifyOutput("test/data/format/propertyVar.kt", ".md") { model, output ->
+ markdownService.appendNodes(tempLocation, output, model.members.single().members)
+ }
+ }
}
diff --git a/test/src/model/PropertyTest.kt b/test/src/model/PropertyTest.kt
index 14c43f78..d6de84bb 100644
--- a/test/src/model/PropertyTest.kt
+++ b/test/src/model/PropertyTest.kt
@@ -57,11 +57,12 @@ public class PropertyTest {
assertEquals("property", name)
assertEquals(DocumentationNode.Kind.Property, kind)
assertEquals(Content.Empty, content)
- assertEquals(3, details.count())
+ assertEquals(4, details.count())
assertEquals("String", detail(DocumentationNode.Kind.Type).name)
val modifiers = details(DocumentationNode.Kind.Modifier).map { it.name }
assertTrue("final" in modifiers)
assertTrue("internal" in modifiers)
+ assertTrue("var" in modifiers)
assertTrue(links.none())
assertEquals(2, members.count())