Merge pull request #9 from orangy/annotations

Support annotation classes and annotations in model and rendered output

3 files changed, 156 insertions, 15 deletions

diff --git a/test/src/model/ClassTest.kt b/test/src/model/ClassTest.kt
index b95a31dc..f21c5c57 100644
--- a/test/src/model/ClassTest.kt
+++ b/test/src/model/ClassTest.kt
@@ -166,4 +166,60 @@ public class ClassTest {
             }
         }
     }
+
+    Test fun annotatedClass() {
+        verifyModel("test/data/classes/annotatedClass.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals(1, annotations.count())
+                with(annotations[0]) {
+                    assertEquals("data", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                }
+            }
+        }
+    }
+
+    Test fun annotatedClassWithAnnotationParameters() {
+        verifyModel("test/data/classes/annotatedClassWithAnnotationParameters.kt") { model ->
+            with(model.members.single().members.single()) {
+                with(deprecation!!) {
+                    assertEquals("deprecated", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                    assertEquals(1, details.count())
+                    with(details[0]) {
+                        assertEquals(DocumentationNode.Kind.Parameter, kind)
+                        assertEquals(1, details.count())
+                        with(details[0]) {
+                            assertEquals(DocumentationNode.Kind.Value, kind)
+                            assertEquals("\"should no longer be used\"", name)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Test fun javaAnnotationClass() {
+        verifyModel("test/data/classes/javaAnnotationClass.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals(1, annotations.count())
+                with(annotations[0]) {
+                    assertEquals("Retention", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                    assertEquals(1, details.count())
+                    with(details[0]) {
+                        assertEquals(DocumentationNode.Kind.Parameter, kind)
+                        assertEquals(1, details.count())
+                        with(details[0]) {
+                            assertEquals(DocumentationNode.Kind.Value, kind)
+                            assertEquals("RetentionPolicy.SOURCE", name)
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/test/src/model/FunctionTest.kt b/test/src/model/FunctionTest.kt
index 2a4ad0a5..299f33a8 100644
--- a/test/src/model/FunctionTest.kt
+++ b/test/src/model/FunctionTest.kt
@@ -21,23 +21,32 @@ public class FunctionTest {
     Test fun functionWithReceiver() {
         verifyModel("test/data/functions/functionWithReceiver.kt") { model ->
             with(model.members.single().members.single()) {
-                assertEquals("fn", name)
-                assertEquals(DocumentationNode.Kind.Function, kind)
-                assertEquals("Function with receiver", content.summary.toTestString())
-                assertEquals(4, details.count())
-                assertEquals("internal", details.elementAt(0).name)
-                assertEquals("final", details.elementAt(1).name)
-                with(details.elementAt(2)) {
-                    assertEquals("<this>", name)
-                    assertEquals(DocumentationNode.Kind.Receiver, kind)
-                    assertEquals(Content.Empty, content)
-                    assertEquals("String", details.single().name)
+                assertEquals("String", name)
+                assertEquals(DocumentationNode.Kind.ExternalClass, kind)
+                assertEquals(2, members.count())
+                with(members[0]) {
+                    assertEquals("fn", name)
+                    assertEquals(DocumentationNode.Kind.Function, kind)
+                    assertEquals("Function with receiver", content.summary.toTestString())
+                    assertEquals(4, details.count())
+                    assertEquals("internal", details.elementAt(0).name)
+                    assertEquals("final", details.elementAt(1).name)
+                    with(details.elementAt(2)) {
+                        assertEquals("<this>", name)
+                        assertEquals(DocumentationNode.Kind.Receiver, kind)
+                        assertEquals(Content.Empty, content)
+                        assertEquals("String", details.single().name)
+                        assertTrue(members.none())
+                        assertTrue(links.none())
+                    }
+                    assertEquals("Unit", details.elementAt(3).name)
                     assertTrue(members.none())
                     assertTrue(links.none())
                 }
-                assertEquals("Unit", details.elementAt(3).name)
-                assertTrue(members.none())
-                assertTrue(links.none())
+                with(members[1]) {
+                    assertEquals("fn", name)
+                    assertEquals(DocumentationNode.Kind.Function, kind)
+                }
             }
         }
     }
@@ -135,4 +144,54 @@ Documentation""", content.description.toTestString())
             }
         }
     }
-}
\ No newline at end of file
+
+    Test fun annotatedFunction() {
+        verifyModel("test/data/functions/annotatedFunction.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals(1, annotations.count())
+                with(annotations[0]) {
+                    assertEquals("inline", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                }
+            }
+        }
+    }
+
+    Test fun functionWithAnnotatedParam() {
+        verifyModel("test/data/functions/functionWithAnnotatedParam.kt") { model ->
+            with(model.members.single().members.single()) {
+                with(details.elementAt(2)) {
+                    assertEquals(1, annotations.count())
+                    with(annotations[0]) {
+                        assertEquals("noinline", name)
+                        assertEquals(Content.Empty, content)
+                        assertEquals(DocumentationNode.Kind.Annotation, kind)
+                    }
+                }
+            }
+        }
+    }
+
+    Test fun annotatedFunctionWithAnnotationParameters() {
+        verifyModel("test/data/functions/annotatedFunctionWithAnnotationParameters.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals(1, annotations.count())
+                with(annotations[0]) {
+                    assertEquals("inlineOptions", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                    assertEquals(1, details.count())
+                    with(details[0]) {
+                        assertEquals(DocumentationNode.Kind.Parameter, kind)
+                        assertEquals(1, details.count())
+                        with(details[0]) {
+                            assertEquals(DocumentationNode.Kind.Value, kind)
+                            assertEquals("[InlineOption.LOCAL_CONTINUE_AND_BREAK]", name)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/src/model/PropertyTest.kt b/test/src/model/PropertyTest.kt
index 103da170..14c43f78 100644
--- a/test/src/model/PropertyTest.kt
+++ b/test/src/model/PropertyTest.kt
@@ -99,4 +99,30 @@ public class PropertyTest {
             }
         }
     }
+
+    Test fun annotatedProperty() {
+        verifyModel("test/data/properties/annotatedProperty.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals(1, annotations.count())
+                with(annotations[0]) {
+                    assertEquals("inline", name)
+                    assertEquals(Content.Empty, content)
+                    assertEquals(DocumentationNode.Kind.Annotation, kind)
+                }
+            }
+        }
+    }
+
+    Test fun propertyWithReceiver() {
+        verifyModel("test/data/properties/propertyWithReceiver.kt") { model ->
+            with(model.members.single().members.single()) {
+                assertEquals("String", name)
+                assertEquals(DocumentationNode.Kind.ExternalClass, kind)
+                with(members.single()) {
+                    assertEquals("foobar", name)
+                    assertEquals(DocumentationNode.Kind.Property, kind)
+                }
+            }
+        }
+    }
 }