From 2822a3eee07a27495d5af4fc36304d483756d3a6 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 17 Feb 2015 12:32:17 +0100 Subject: updated according to language change: class object -> default object --- test/data/classes/classWithClassObject.kt | 7 ----- test/data/classes/classWithDefaultObject.kt | 7 +++++ test/data/format/classWithClassObject.html | 46 ---------------------------- test/data/format/classWithClassObject.kt | 7 ----- test/data/format/classWithClassObject.md | 26 ---------------- test/data/format/classWithDefaultObject.html | 46 ++++++++++++++++++++++++++++ test/data/format/classWithDefaultObject.kt | 7 +++++ test/data/format/classWithDefaultObject.md | 26 ++++++++++++++++ test/src/format/HtmlFormatTest.kt | 4 +-- test/src/format/MarkdownFormatTest.kt | 4 +-- test/src/model/ClassTest.kt | 8 ++--- test/src/model/JavaTest.kt | 4 +-- 12 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 test/data/classes/classWithClassObject.kt create mode 100644 test/data/classes/classWithDefaultObject.kt delete mode 100644 test/data/format/classWithClassObject.html delete mode 100644 test/data/format/classWithClassObject.kt delete mode 100644 test/data/format/classWithClassObject.md create mode 100644 test/data/format/classWithDefaultObject.html create mode 100644 test/data/format/classWithDefaultObject.kt create mode 100644 test/data/format/classWithDefaultObject.md (limited to 'test') diff --git a/test/data/classes/classWithClassObject.kt b/test/data/classes/classWithClassObject.kt deleted file mode 100644 index 459efad6..00000000 --- a/test/data/classes/classWithClassObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Klass() { - class object { - val x = 1 - - fun foo() {} - } -} diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithDefaultObject.kt new file mode 100644 index 00000000..459efad6 --- /dev/null +++ b/test/data/classes/classWithDefaultObject.kt @@ -0,0 +1,7 @@ +class Klass() { + class object { + val x = 1 + + fun foo() {} + } +} diff --git a/test/data/format/classWithClassObject.html b/test/data/format/classWithClassObject.html deleted file mode 100644 index c1b18041..00000000 --- a/test/data/format/classWithClassObject.html +++ /dev/null @@ -1,46 +0,0 @@ - - -test / Klass - - -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.kt b/test/data/format/classWithClassObject.kt deleted file mode 100644 index 459efad6..00000000 --- a/test/data/format/classWithClassObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Klass() { - class object { - val x = 1 - - fun foo() {} - } -} diff --git a/test/data/format/classWithClassObject.md b/test/data/format/classWithClassObject.md deleted file mode 100644 index b1191099..00000000 --- a/test/data/format/classWithClassObject.md +++ /dev/null @@ -1,26 +0,0 @@ -[test](out.md) / [](out.md) / [Klass](out.md) - - -# Klass - -`class Klass` - - - -### Constructors - - -| [<init>](out.md) | `public Klass()` | - - -### Class Object Properties - - -| [x](out.md) | `val x: Int` | - - -### Class Object Functions - - -| [foo](out.md) | `fun foo(): Unit` | - diff --git a/test/data/format/classWithDefaultObject.html b/test/data/format/classWithDefaultObject.html new file mode 100644 index 00000000..1fd648ff --- /dev/null +++ b/test/data/format/classWithDefaultObject.html @@ -0,0 +1,46 @@ + + +test / Klass + + +test / / Klass
+
+

Klass

+class Klass
+
+
+

Constructors

+ + + + + + + +

+<init> +public Klass()

Default Object Properties

+ + + + + + + +

+x	+`val x: Int`

Default Object Functions

+ + + + + + + +

+foo	+`fun foo(): Unit`

+ + diff --git a/test/data/format/classWithDefaultObject.kt b/test/data/format/classWithDefaultObject.kt new file mode 100644 index 00000000..459efad6 --- /dev/null +++ b/test/data/format/classWithDefaultObject.kt @@ -0,0 +1,7 @@ +class Klass() { + class object { + val x = 1 + + fun foo() {} + } +} diff --git a/test/data/format/classWithDefaultObject.md b/test/data/format/classWithDefaultObject.md new file mode 100644 index 00000000..030d5a21 --- /dev/null +++ b/test/data/format/classWithDefaultObject.md @@ -0,0 +1,26 @@ +[test](out.md) / [](out.md) / [Klass](out.md) + + +# Klass + +`class Klass` + + + +### Constructors + + +| [<init>](out.md) | `public Klass()` | + + +### Default Object Properties + + +| [x](out.md) | `val x: Int` | + + +### 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 }) } } -- cgit