Add tests for comment extraction, support one-line and mutliple joined doc-comments.

Start primitive ConsoleGenerator to dump model.

10 files changed, 114 insertions, 0 deletions

diff --git a/test/data/comments/emptyDoc.kt b/test/data/comments/emptyDoc.kt
new file mode 100644
index 00000000..b87cce57
--- /dev/null
+++ b/test/data/comments/emptyDoc.kt
@@ -0,0 +1 @@
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/emptyDocButComment.kt b/test/data/comments/emptyDocButComment.kt
new file mode 100644
index 00000000..ceb24753
--- /dev/null
+++ b/test/data/comments/emptyDocButComment.kt
@@ -0,0 +1,2 @@
+/* comment */
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/multilineDoc.kt b/test/data/comments/multilineDoc.kt
new file mode 100644
index 00000000..960c78bd
--- /dev/null
+++ b/test/data/comments/multilineDoc.kt
@@ -0,0 +1,6 @@
+/**
+ * doc1
+ * doc2
+ * doc3
+ */
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/multilineDocWithComment.kt b/test/data/comments/multilineDocWithComment.kt
new file mode 100644
index 00000000..d3c1084c
--- /dev/null
+++ b/test/data/comments/multilineDocWithComment.kt
@@ -0,0 +1,7 @@
+/**
+ * doc1
+ * doc2
+ * doc3
+ */
+// comment
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/multipleDocs.kt b/test/data/comments/multipleDocs.kt
new file mode 100644
index 00000000..654ea935
--- /dev/null
+++ b/test/data/comments/multipleDocs.kt
@@ -0,0 +1,8 @@
+/**
+ * doc1
+ */
+/**
+ * doc2
+ */
+/** doc3 */
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/oneLineDoc.kt b/test/data/comments/oneLineDoc.kt
new file mode 100644
index 00000000..92a40c67
--- /dev/null
+++ b/test/data/comments/oneLineDoc.kt
@@ -0,0 +1,2 @@
+/** doc */
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/oneLineDocWithComment.kt b/test/data/comments/oneLineDocWithComment.kt
new file mode 100644
index 00000000..c8467933
--- /dev/null
+++ b/test/data/comments/oneLineDocWithComment.kt
@@ -0,0 +1,3 @@
+/** doc */
+// comment
+val property = "test"
\ No newline at end of file
diff --git a/test/data/comments/oneLineDocWithEmptyLine.kt b/test/data/comments/oneLineDocWithEmptyLine.kt
new file mode 100644
index 00000000..e364c416
--- /dev/null
+++ b/test/data/comments/oneLineDocWithEmptyLine.kt
@@ -0,0 +1,3 @@
+/** doc */
+
+val property = "test"
\ No newline at end of file
diff --git a/test/playground.kt b/test/playground.kt
index 5bc5207a..50a43dfd 100644
--- a/test/playground.kt
+++ b/test/playground.kt
@@ -21,6 +21,7 @@ class Class {
     fun memberFunction() {
     }
 
+    val memberValue = "Member"
 }
 
 /**
@@ -38,6 +39,11 @@ data class DataClass(val name: String, val age: Int) {}
 object Object {
     fun objectFunction() {
     }
+
+    val objectValue: String
+    /** one line getter doc */
+        get() = "Member"
+
 }
 
 class OuterClass {
diff --git a/test/src/model/CommentTest.kt b/test/src/model/CommentTest.kt
new file mode 100644
index 00000000..7da50c1a
--- /dev/null
+++ b/test/src/model/CommentTest.kt
@@ -0,0 +1,76 @@
+package org.jetbrains.dokka.tests
+
+import org.junit.Test
+import kotlin.test.*
+
+public class CommentTest {
+    Test fun emptyDoc() {
+        verifyModel("test/data/comments/emptyDoc.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("", doc)
+            }
+        }
+    }
+
+    Test fun emptyDocButComment() {
+        verifyModel("test/data/comments/emptyDocButComment.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("", doc)
+            }
+        }
+    }
+
+    Test fun multilineDoc() {
+        verifyModel("test/data/comments/multilineDoc.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("""doc1
+doc2
+doc3""", doc)
+            }
+        }
+    }
+
+    Test fun multipleDocs() {
+        verifyModel("test/data/comments/multipleDocs.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("""doc1
+doc2
+doc3""", doc)
+            }
+        }
+    }
+
+    Test fun multilineDocWithComment() {
+        verifyModel("test/data/comments/multilineDocWithComment.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("""doc1
+doc2
+doc3""", doc)
+            }
+        }
+    }
+
+    Test fun oneLineDoc() {
+        verifyModel("test/data/comments/oneLineDoc.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("doc", doc)
+            }
+        }
+    }
+
+    Test fun oneLineDocWithComment() {
+        verifyModel("test/data/comments/oneLineDocWithComment.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("doc", doc)
+            }
+        }
+    }
+
+    Test fun oneLineDocWithEmptyLine() {
+        verifyModel("test/data/comments/oneLineDocWithEmptyLine.kt") { model ->
+            with(model.nodes.single().members.single()) {
+                assertEquals("doc", doc)
+            }
+        }
+    }
+}