diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-17 12:32:17 +0100 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-17 12:32:17 +0100 |
commit | 2822a3eee07a27495d5af4fc36304d483756d3a6 (patch) | |
tree | 77b1023320f74dcc004b5f2c8b2e210b669aeebd /test | |
parent | c28923c56bb0c9d5271ceadfafe42e562862acac (diff) | |
download | dokka-2822a3eee07a27495d5af4fc36304d483756d3a6.tar.gz dokka-2822a3eee07a27495d5af4fc36304d483756d3a6.tar.bz2 dokka-2822a3eee07a27495d5af4fc36304d483756d3a6.zip |
updated according to language change: class object -> default object
Diffstat (limited to 'test')
-rw-r--r-- | test/data/classes/classWithDefaultObject.kt (renamed from test/data/classes/classWithClassObject.kt) | 0 | ||||
-rw-r--r-- | test/data/format/classWithDefaultObject.html (renamed from test/data/format/classWithClassObject.html) | 4 | ||||
-rw-r--r-- | test/data/format/classWithDefaultObject.kt (renamed from test/data/format/classWithClassObject.kt) | 0 | ||||
-rw-r--r-- | test/data/format/classWithDefaultObject.md (renamed from test/data/format/classWithClassObject.md) | 4 | ||||
-rw-r--r-- | test/src/format/HtmlFormatTest.kt | 4 | ||||
-rw-r--r-- | test/src/format/MarkdownFormatTest.kt | 4 | ||||
-rw-r--r-- | test/src/model/ClassTest.kt | 8 | ||||
-rw-r--r-- | test/src/model/JavaTest.kt | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/test/data/classes/classWithClassObject.kt b/test/data/classes/classWithDefaultObject.kt index 459efad6..459efad6 100644 --- a/test/data/classes/classWithClassObject.kt +++ b/test/data/classes/classWithDefaultObject.kt diff --git a/test/data/format/classWithClassObject.html b/test/data/format/classWithDefaultObject.html index c1b18041..1fd648ff 100644 --- a/test/data/format/classWithClassObject.html +++ b/test/data/format/classWithDefaultObject.html @@ -20,7 +20,7 @@ </tr> </tbody> </table> -<h3>Class Object Properties</h3> +<h3>Default Object Properties</h3> <table> <tbody> <tr> @@ -31,7 +31,7 @@ </tr> </tbody> </table> -<h3>Class Object Functions</h3> +<h3>Default Object Functions</h3> <table> <tbody> <tr> diff --git a/test/data/format/classWithClassObject.kt b/test/data/format/classWithDefaultObject.kt index 459efad6..459efad6 100644 --- a/test/data/format/classWithClassObject.kt +++ b/test/data/format/classWithDefaultObject.kt diff --git a/test/data/format/classWithClassObject.md b/test/data/format/classWithDefaultObject.md index b1191099..030d5a21 100644 --- a/test/data/format/classWithClassObject.md +++ b/test/data/format/classWithDefaultObject.md @@ -13,13 +13,13 @@ | [<init>](out.md) | `public Klass()` | -### Class Object Properties +### Default Object Properties | [x](out.md) | `val x: Int` | -### Class Object Functions +### Default Object Functions | [foo](out.md) | `fun foo(): Unit` | diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt index 247cc057..6fd7696a 100644 --- a/test/src/format/HtmlFormatTest.kt +++ b/test/src/format/HtmlFormatTest.kt @@ -7,8 +7,8 @@ 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 -> + Test fun classWithDefaultObject() { + verifyOutput("test/data/format/classWithDefaultObject.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 57882c1a..cf894898 100644 --- a/test/src/format/MarkdownFormatTest.kt +++ b/test/src/format/MarkdownFormatTest.kt @@ -12,8 +12,8 @@ public class MarkdownFormatTest { } } - Test fun classWithClassObject() { - verifyOutput("test/data/format/classWithClassObject.kt", ".md") { model, output -> + Test fun classWithDefaultObject() { + verifyOutput("test/data/format/classWithDefaultObject.kt", ".md") { model, output -> markdownService.appendNodes(tempLocation, output, model.members.single().members) } } diff --git a/test/src/model/ClassTest.kt b/test/src/model/ClassTest.kt index d607b593..d16b9491 100644 --- a/test/src/model/ClassTest.kt +++ b/test/src/model/ClassTest.kt @@ -124,8 +124,8 @@ public class ClassTest { } } - Test fun classWithClassObject() { - verifyModel("test/data/classes/classWithClassObject.kt") { model -> + Test fun classWithDefaultObject() { + verifyModel("test/data/classes/classWithDefaultObject.kt") { model -> with(model.members.single().members.single()) { assertEquals(DocumentationNode.Kind.Class, kind) assertEquals("Klass", name) @@ -140,13 +140,13 @@ public class ClassTest { } with(members.elementAt(1)) { assertEquals("x", name) - assertEquals(DocumentationNode.Kind.ClassObjectProperty, kind) + assertEquals(DocumentationNode.Kind.DefaultObjectProperty, kind) assertTrue(members.none()) assertTrue(links.none()) } with(members.elementAt(2)) { assertEquals("foo", name) - assertEquals(DocumentationNode.Kind.ClassObjectFunction, kind) + assertEquals(DocumentationNode.Kind.DefaultObjectFunction, kind) assertTrue(members.none()) assertTrue(links.none()) } diff --git a/test/src/model/JavaTest.kt b/test/src/model/JavaTest.kt index 6b3d7820..26e5536f 100644 --- a/test/src/model/JavaTest.kt +++ b/test/src/model/JavaTest.kt @@ -131,7 +131,7 @@ public class JavaTest { val i = cls.members(DocumentationNode.Kind.Property).single { it.name == "i" } assertEquals("Int", i.detail(DocumentationNode.Kind.Type).name) assertTrue("var" in i.details(DocumentationNode.Kind.Modifier).map { it.name }) - val s = cls.members(DocumentationNode.Kind.ClassObjectProperty).single { it.name == "s" } + val s = cls.members(DocumentationNode.Kind.DefaultObjectProperty).single { it.name == "s" } assertEquals("String", s.detail(DocumentationNode.Kind.Type).name) assertFalse("var" in s.details(DocumentationNode.Kind.Modifier).map { it.name }) } @@ -139,7 +139,7 @@ public class JavaTest { Test fun staticMethod() { verifyPackageMember("test/data/java/staticMethod.java") { cls -> - val m = cls.members(DocumentationNode.Kind.ClassObjectFunction).single { it.name == "foo" } + val m = cls.members(DocumentationNode.Kind.DefaultObjectFunction).single { it.name == "foo" } assertFalse("static" in m.details(DocumentationNode.Kind.Modifier).map { it.name }) } } |