From c7916f74964246bee4d256c106b01c7e317e6c10 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 17 Mar 2015 19:54:11 +0100 Subject: default objects -> companion objects --- test/data/classes/classWithCompanionObject.kt | 7 ++++ test/data/classes/classWithDefaultObject.kt | 7 ---- test/data/classes/companionObjectExtension.kt | 10 ++++++ test/data/classes/defaultObjectExtension.kt | 10 ------ test/data/format/classWithCompanionObject.html | 46 ++++++++++++++++++++++++++ test/data/format/classWithCompanionObject.kt | 7 ++++ test/data/format/classWithCompanionObject.md | 26 +++++++++++++++ test/data/format/classWithDefaultObject.html | 46 -------------------------- test/data/format/classWithDefaultObject.kt | 7 ---- test/data/format/classWithDefaultObject.md | 26 --------------- test/data/format/companionObjectExtension.kt | 10 ++++++ test/data/format/companionObjectExtension.md | 23 +++++++++++++ test/data/format/defaultObjectExtension.kt | 10 ------ test/data/format/defaultObjectExtension.md | 23 ------------- test/src/format/HtmlFormatTest.kt | 4 +-- test/src/format/MarkdownFormatTest.kt | 8 ++--- test/src/markdown/MarkdownTestRunner.kt | 2 +- test/src/model/ClassTest.kt | 14 ++++---- test/src/model/JavaTest.kt | 4 +-- 19 files changed, 145 insertions(+), 145 deletions(-) create mode 100644 test/data/classes/classWithCompanionObject.kt delete mode 100644 test/data/classes/classWithDefaultObject.kt create mode 100644 test/data/classes/companionObjectExtension.kt delete mode 100644 test/data/classes/defaultObjectExtension.kt create mode 100644 test/data/format/classWithCompanionObject.html create mode 100644 test/data/format/classWithCompanionObject.kt create mode 100644 test/data/format/classWithCompanionObject.md delete mode 100644 test/data/format/classWithDefaultObject.html delete mode 100644 test/data/format/classWithDefaultObject.kt delete mode 100644 test/data/format/classWithDefaultObject.md create mode 100644 test/data/format/companionObjectExtension.kt create mode 100644 test/data/format/companionObjectExtension.md delete mode 100644 test/data/format/defaultObjectExtension.kt delete mode 100644 test/data/format/defaultObjectExtension.md (limited to 'test') diff --git a/test/data/classes/classWithCompanionObject.kt b/test/data/classes/classWithCompanionObject.kt new file mode 100644 index 00000000..fdbd915d --- /dev/null +++ b/test/data/classes/classWithCompanionObject.kt @@ -0,0 +1,7 @@ +class Klass() { + companion object { + val x = 1 + + fun foo() {} + } +} diff --git a/test/data/classes/classWithDefaultObject.kt b/test/data/classes/classWithDefaultObject.kt deleted file mode 100644 index 92e1a695..00000000 --- a/test/data/classes/classWithDefaultObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Klass() { - default object { - val x = 1 - - fun foo() {} - } -} diff --git a/test/data/classes/companionObjectExtension.kt b/test/data/classes/companionObjectExtension.kt new file mode 100644 index 00000000..4b471376 --- /dev/null +++ b/test/data/classes/companionObjectExtension.kt @@ -0,0 +1,10 @@ +class Foo { + companion object Default { + } +} + + +/** + * The def + */ +val Foo.Default.x: Int get() = 1 diff --git a/test/data/classes/defaultObjectExtension.kt b/test/data/classes/defaultObjectExtension.kt deleted file mode 100644 index 58d2e86a..00000000 --- a/test/data/classes/defaultObjectExtension.kt +++ /dev/null @@ -1,10 +0,0 @@ -class Foo { - default object Default { - } -} - - -/** - * The def - */ -val Foo.Default.x: Int get() = 1 diff --git a/test/data/format/classWithCompanionObject.html b/test/data/format/classWithCompanionObject.html new file mode 100644 index 00000000..be9247ea --- /dev/null +++ b/test/data/format/classWithCompanionObject.html @@ -0,0 +1,46 @@ + + +test / Klass + + +test / Klass
+
+

Klass

+class Klass
+
+
+

Constructors

+ + + + + + + +

+<init> +Klass()

Companion Object Properties

+ + + + + + + +

+x	+`val x: Int`

Companion Object Functions

+ + + + + + + +

+foo	+`fun foo(): Unit`

+ + diff --git a/test/data/format/classWithCompanionObject.kt b/test/data/format/classWithCompanionObject.kt new file mode 100644 index 00000000..fdbd915d --- /dev/null +++ b/test/data/format/classWithCompanionObject.kt @@ -0,0 +1,7 @@ +class Klass() { + companion object { + val x = 1 + + fun foo() {} + } +} diff --git a/test/data/format/classWithCompanionObject.md b/test/data/format/classWithCompanionObject.md new file mode 100644 index 00000000..9398c3d3 --- /dev/null +++ b/test/data/format/classWithCompanionObject.md @@ -0,0 +1,26 @@ +[test](test/index) / [Klass](test/-klass/index) + + +# Klass + +`class Klass` + + + +### Constructors + + +| [<init>](test/-klass/-init-) | `Klass()` | + + +### Companion Object Properties + + +| [x](test/-klass/x) | `val x: Int` | + + +### Companion Object Functions + + +| [foo](test/-klass/foo) | `fun foo(): Unit` | + diff --git a/test/data/format/classWithDefaultObject.html b/test/data/format/classWithDefaultObject.html deleted file mode 100644 index 663d8f64..00000000 --- a/test/data/format/classWithDefaultObject.html +++ /dev/null @@ -1,46 +0,0 @@ - - -test / Klass - - -test / Klass
-
-

Klass

-class Klass
-
-
-

Constructors

- - - - - - - -

-<init> -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 deleted file mode 100644 index 92e1a695..00000000 --- a/test/data/format/classWithDefaultObject.kt +++ /dev/null @@ -1,7 +0,0 @@ -class Klass() { - default object { - val x = 1 - - fun foo() {} - } -} diff --git a/test/data/format/classWithDefaultObject.md b/test/data/format/classWithDefaultObject.md deleted file mode 100644 index 645f4755..00000000 --- a/test/data/format/classWithDefaultObject.md +++ /dev/null @@ -1,26 +0,0 @@ -[test](test/index) / [Klass](test/-klass/index) - - -# Klass - -`class Klass` - - - -### Constructors - - -| [<init>](test/-klass/-init-) | `Klass()` | - - -### Default Object Properties - - -| [x](test/-klass/x) | `val x: Int` | - - -### Default Object Functions - - -| [foo](test/-klass/foo) | `fun foo(): Unit` | - diff --git a/test/data/format/companionObjectExtension.kt b/test/data/format/companionObjectExtension.kt new file mode 100644 index 00000000..f452de2c --- /dev/null +++ b/test/data/format/companionObjectExtension.kt @@ -0,0 +1,10 @@ +class Foo { + companion object Default { + } +} + + +/** + * The default object property. + */ +val Foo.Default.x: Int get() = 1 diff --git a/test/data/format/companionObjectExtension.md b/test/data/format/companionObjectExtension.md new file mode 100644 index 00000000..271da5b0 --- /dev/null +++ b/test/data/format/companionObjectExtension.md @@ -0,0 +1,23 @@ +[test](test/index) / [Foo](test/-foo/index) + + +# Foo + +`class Foo` + + + +### Constructors + + +| [<init>](test/-foo/-init-) | `Foo()` | + + +### Companion Object Extension Properties + + +| [x](test/x) | `val Foo.Default.x: Int` +The default object property. + + | + diff --git a/test/data/format/defaultObjectExtension.kt b/test/data/format/defaultObjectExtension.kt deleted file mode 100644 index 78df38c5..00000000 --- a/test/data/format/defaultObjectExtension.kt +++ /dev/null @@ -1,10 +0,0 @@ -class Foo { - default object Default { - } -} - - -/** - * The default object property. - */ -val Foo.Default.x: Int get() = 1 diff --git a/test/data/format/defaultObjectExtension.md b/test/data/format/defaultObjectExtension.md deleted file mode 100644 index 4ede33e8..00000000 --- a/test/data/format/defaultObjectExtension.md +++ /dev/null @@ -1,23 +0,0 @@ -[test](test/index) / [Foo](test/-foo/index) - - -# Foo - -`class Foo` - - - -### Constructors - - -| [<init>](test/-foo/-init-) | `Foo()` | - - -### Default Object Extension Properties - - -| [x](test/x) | `val Foo.Default.x: Int` -The default object property. - - | - diff --git a/test/src/format/HtmlFormatTest.kt b/test/src/format/HtmlFormatTest.kt index fb2df875..98b47f06 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 classWithDefaultObject() { - verifyOutput("test/data/format/classWithDefaultObject.kt", ".html") { model, output -> + Test fun classWithCompanionObject() { + verifyOutput("test/data/format/classWithCompanionObject.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 1c46e662..059b491b 100644 --- a/test/src/format/MarkdownFormatTest.kt +++ b/test/src/format/MarkdownFormatTest.kt @@ -12,8 +12,8 @@ public class MarkdownFormatTest { } } - Test fun classWithDefaultObject() { - verifyOutput("test/data/format/classWithDefaultObject.kt", ".md") { model, output -> + Test fun classWithCompanionObject() { + verifyOutput("test/data/format/classWithCompanionObject.kt", ".md") { model, output -> markdownService.appendNodes(tempLocation, output, model.members.single().members) } } @@ -161,8 +161,8 @@ public class MarkdownFormatTest { } } - Test fun defaultObjectExtension() { - verifyOutput("test/data/format/defaultObjectExtension.kt", ".md") { model, output -> + Test fun companionObjectExtension() { + verifyOutput("test/data/format/companionObjectExtension.kt", ".md") { model, output -> markdownService.appendNodes(tempLocation, output, model.members.single().members.filter { it.name == "Foo" }) } } diff --git a/test/src/markdown/MarkdownTestRunner.kt b/test/src/markdown/MarkdownTestRunner.kt index 99c3732e..4aceb8e8 100644 --- a/test/src/markdown/MarkdownTestRunner.kt +++ b/test/src/markdown/MarkdownTestRunner.kt @@ -9,7 +9,7 @@ import kotlin.properties.Delegates import org.junit.ComparisonFailure data class MarkdownTestUniqueId(val id: Int) : Serializable { - default object { + companion object { var id = 0 fun next() = MarkdownTestUniqueId(id++) } diff --git a/test/src/model/ClassTest.kt b/test/src/model/ClassTest.kt index 0a8fc147..6eec91cc 100644 --- a/test/src/model/ClassTest.kt +++ b/test/src/model/ClassTest.kt @@ -124,8 +124,8 @@ public class ClassTest { } } - Test fun classWithDefaultObject() { - verifyModel("test/data/classes/classWithDefaultObject.kt") { model -> + Test fun classWithCompanionObject() { + verifyModel("test/data/classes/classWithCompanionObject.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.DefaultObjectProperty, kind) + assertEquals(DocumentationNode.Kind.CompanionObjectProperty, kind) assertTrue(members.none()) assertTrue(links.none()) } with(members.elementAt(2)) { assertEquals("foo", name) - assertEquals(DocumentationNode.Kind.DefaultObjectFunction, kind) + assertEquals(DocumentationNode.Kind.CompanionObjectFunction, kind) assertTrue(members.none()) assertTrue(links.none()) } @@ -245,11 +245,11 @@ public class ClassTest { } } - Test fun defaultObjectExtension() { - verifyModel("test/data/classes/defaultObjectExtension.kt") { model -> + Test fun companionObjectExtension() { + verifyModel("test/data/classes/companionObjectExtension.kt") { model -> val pkg = model.members.single() val cls = pkg.members.single { it.name == "Foo" } - val extensions = cls.extensions.filter { it.kind == DocumentationNode.Kind.DefaultObjectProperty } + val extensions = cls.extensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectProperty } assertEquals(1, extensions.size()) } } diff --git a/test/src/model/JavaTest.kt b/test/src/model/JavaTest.kt index 41feb26a..cef548c3 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.DefaultObjectProperty).single { it.name == "s" } + val s = cls.members(DocumentationNode.Kind.CompanionObjectProperty).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.DefaultObjectFunction).single { it.name == "foo" } + val m = cls.members(DocumentationNode.Kind.CompanionObjectFunction).single { it.name == "foo" } assertFalse("static" in m.details(DocumentationNode.Kind.Modifier).map { it.name }) } } -- cgit