From 451b678c6bdff8b8242f299c600d100929a5171f Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Fri, 11 Jul 2014 19:37:02 +0400 Subject: Add processing of classes into model. --- test/data/classes/classWithConstructor.kt | 1 + test/data/classes/classWithFunction.kt | 4 +++ test/data/classes/emptyClass.kt | 3 +++ test/data/functions/function.kt | 3 ++- test/data/functions/functionWithParams.kt | 3 ++- test/src/ClassTest.kt | 43 +++++++++++++++++++++++++++++++ test/src/FunctionTest.kt | 37 ++++++++++++++++++++++++++ test/src/TopLevelFunctionTest.kt | 37 -------------------------- 8 files changed, 92 insertions(+), 39 deletions(-) create mode 100644 test/data/classes/classWithConstructor.kt create mode 100644 test/data/classes/classWithFunction.kt create mode 100644 test/data/classes/emptyClass.kt create mode 100644 test/src/ClassTest.kt create mode 100644 test/src/FunctionTest.kt delete mode 100644 test/src/TopLevelFunctionTest.kt (limited to 'test') diff --git a/test/data/classes/classWithConstructor.kt b/test/data/classes/classWithConstructor.kt new file mode 100644 index 00000000..0751d570 --- /dev/null +++ b/test/data/classes/classWithConstructor.kt @@ -0,0 +1 @@ +class Klass(name: String) \ No newline at end of file diff --git a/test/data/classes/classWithFunction.kt b/test/data/classes/classWithFunction.kt new file mode 100644 index 00000000..a981cfb6 --- /dev/null +++ b/test/data/classes/classWithFunction.kt @@ -0,0 +1,4 @@ +class Klass { + fun fn() { + } +} diff --git a/test/data/classes/emptyClass.kt b/test/data/classes/emptyClass.kt new file mode 100644 index 00000000..abd20cc8 --- /dev/null +++ b/test/data/classes/emptyClass.kt @@ -0,0 +1,3 @@ +class Klass { + +} \ No newline at end of file diff --git a/test/data/functions/function.kt b/test/data/functions/function.kt index f8c64f94..3ed81dfa 100644 --- a/test/data/functions/function.kt +++ b/test/data/functions/function.kt @@ -1,4 +1,5 @@ /** * Function fn */ -fun fn() {} \ No newline at end of file +fun fn() { +} \ No newline at end of file diff --git a/test/data/functions/functionWithParams.kt b/test/data/functions/functionWithParams.kt index 135ed399..559f4f78 100644 --- a/test/data/functions/functionWithParams.kt +++ b/test/data/functions/functionWithParams.kt @@ -3,4 +3,5 @@ * Function * Documentation */ -fun function(x : Int) {} \ No newline at end of file +fun function(x: Int) { +} \ No newline at end of file diff --git a/test/src/ClassTest.kt b/test/src/ClassTest.kt new file mode 100644 index 00000000..914df53b --- /dev/null +++ b/test/src/ClassTest.kt @@ -0,0 +1,43 @@ +package com.jetbrains.dokka.tests + +import org.junit.Test +import kotlin.test.* +import com.jetbrains.dokka.* + +public class ClassTest { + Test fun emptyClass() { + verifyModel("test/data/classes/emptyClass.kt") { model -> + val item = model.nodes.single().members.single() + assertEquals(DocumentationNodeKind.Class, item.kind) + assertEquals("Klass", item.name) + assertEquals("", item.doc) + assertTrue(item.details.none()) + assertEquals("", item.members.single().name) + assertTrue(item.links.none()) + } + } + + Test fun classWithConstructor() { + verifyModel("test/data/classes/classWithConstructor.kt") { model -> + val item = model.nodes.single().members.single() + assertEquals(DocumentationNodeKind.Class, item.kind) + assertEquals("Klass", item.name) + assertEquals("", item.doc) + assertTrue(item.details.none()) + assertEquals("", item.members.single().name) + assertTrue(item.links.none()) + } + } + + Test fun classWithFunction() { + verifyModel("test/data/classes/classWithFunction.kt") { model -> + val item = model.nodes.single().members.single() + assertEquals(DocumentationNodeKind.Class, item.kind) + assertEquals("Klass", item.name) + assertEquals("", item.doc) + assertTrue(item.details.none()) + assertEquals("", item.members.single().name) + assertTrue(item.links.none()) + } + } +} \ No newline at end of file diff --git a/test/src/FunctionTest.kt b/test/src/FunctionTest.kt new file mode 100644 index 00000000..e8afe97b --- /dev/null +++ b/test/src/FunctionTest.kt @@ -0,0 +1,37 @@ +package com.jetbrains.dokka.tests + +import org.junit.Test +import kotlin.test.* +import com.jetbrains.dokka.* + + +public class FunctionTest { + Test fun function() { + verifyModel("test/data/functions/function.kt") { model -> + val item = model.nodes.single().members.single() + assertEquals(DocumentationNodeKind.Function, item.kind) + assertEquals("fn", item.name) + assertEquals("Function fn", item.doc) + assertTrue(item.details.none()) + assertTrue(item.members.none()) + assertTrue(item.links.none()) + } + } + + Test fun functionWithParams() { + verifyModel("test/data/functions/functionWithParams.kt") { model -> + val item = model.nodes.single().members.single() + assertEquals(DocumentationNodeKind.Function, item.kind) + assertEquals("function", item.name) + assertEquals("""Multiline +Function +Documentation""" + , item.doc) + assertEquals("x", item.details.single().name) + assertEquals(DocumentationNodeKind.Parameter, item.details.single().kind) + + assertTrue(item.members.none()) + assertTrue(item.links.none()) + } + } +} \ No newline at end of file diff --git a/test/src/TopLevelFunctionTest.kt b/test/src/TopLevelFunctionTest.kt deleted file mode 100644 index 342708f2..00000000 --- a/test/src/TopLevelFunctionTest.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.jetbrains.dokka.tests - -import org.junit.Test -import kotlin.test.* -import com.jetbrains.dokka.* - - -public class TopLevelFunctionTest { - Test fun function() { - verifyModel("test/data/functions/function.kt") { model -> - val item = model.nodes.single().members.single() - assertEquals(DocumentationNodeKind.Function, item.kind) - assertEquals("fn", item.name) - assertEquals("Function fn", item.doc) - assertTrue(item.details.none()) - assertTrue(item.members.none()) - assertTrue(item.links.none()) - } - } - - Test fun functionWithParams() { - verifyModel("test/data/functions/functionWithParams.kt") { model -> - val item = model.nodes.single().members.single() - assertEquals(DocumentationNodeKind.Function, item.kind) - assertEquals("function", item.name) - assertEquals("""Multiline -Function -Documentation""" - , item.doc) - assertEquals("x", item.details.single().name) - assertEquals(DocumentationNodeKind.Parameter, item.details.single().kind) - - assertTrue(item.members.none()) - assertTrue(item.links.none()) - } - } -} \ No newline at end of file -- cgit