diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:23:44 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:23:44 +0100 |
| commit | cfc0348e120df881461ada2d3299f0fb4314f49e (patch) | |
| tree | 2e52040fb3437146c77f1dbe6a33442a4ed71b4a /test/src/model | |
| parent | 60e610ebdd86663bedf113d2235ac3c8364171d0 (diff) | |
| parent | faad901ed29f802d7b304c06ae62954b149960e7 (diff) | |
| download | dokka-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/model')
| -rw-r--r-- | test/src/model/PropertyTest.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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()) |