aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-09-07 20:57:17 +0200
committerDmitry Jemerov <yole@jetbrains.com>2015-09-07 20:57:17 +0200
commit97257371e1594b25395c7c4baaaa92fb98a0ce97 (patch)
treec04101d93fa6b20edb924d0cfe0ea9d3fe403327 /test
parent3d4cda549bdde68935cb0053dceddb8e64e1e20c (diff)
downloaddokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.gz
dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.bz2
dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.zip
work in progress on updating Dokka to latest Kotlin (compiles but does not run yet)
Diffstat (limited to 'test')
-rw-r--r--test/data/classes/annotatedClassWithAnnotationParameters.kt2
-rw-r--r--test/data/classes/javaAnnotationClass.kt2
-rw-r--r--test/src/model/ClassTest.kt9
3 files changed, 3 insertions, 10 deletions
diff --git a/test/data/classes/annotatedClassWithAnnotationParameters.kt b/test/data/classes/annotatedClassWithAnnotationParameters.kt
index 1af97e75..930d6a62 100644
--- a/test/data/classes/annotatedClassWithAnnotationParameters.kt
+++ b/test/data/classes/annotatedClassWithAnnotationParameters.kt
@@ -1 +1 @@
-deprecated("should no longer be used") class Foo() {}
+@Deprecated("should no longer be used") class Foo() {}
diff --git a/test/data/classes/javaAnnotationClass.kt b/test/data/classes/javaAnnotationClass.kt
index c5f5cac4..95600147 100644
--- a/test/data/classes/javaAnnotationClass.kt
+++ b/test/data/classes/javaAnnotationClass.kt
@@ -1,5 +1,5 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
-Retention(RetentionPolicy.SOURCE)
+@Retention(RetentionPolicy.SOURCE)
public annotation class throws()
diff --git a/test/src/model/ClassTest.kt b/test/src/model/ClassTest.kt
index 6eec91cc..05fc2fc3 100644
--- a/test/src/model/ClassTest.kt
+++ b/test/src/model/ClassTest.kt
@@ -11,7 +11,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Class, kind)
assertEquals("Klass", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertEquals("<init>", members.single().name)
assertTrue(links.none())
}
@@ -24,7 +23,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Object, kind)
assertEquals("Obj", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertTrue(members.none())
assertTrue(links.none())
}
@@ -37,7 +35,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Class, kind)
assertEquals("Klass", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertTrue(links.none())
assertEquals(1, members.count())
@@ -68,7 +65,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Class, kind)
assertEquals("Klass", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertTrue(links.none())
assertEquals(2, members.count())
@@ -99,7 +95,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Class, kind)
assertEquals("Klass", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertTrue(links.none())
assertEquals(2, members.count())
@@ -130,7 +125,6 @@ public class ClassTest {
assertEquals(DocumentationNode.Kind.Class, kind)
assertEquals("Klass", name)
assertEquals(Content.Empty, content)
- assertEquals(2, details.count())
assertTrue(links.none())
assertEquals(3, members.count())
@@ -171,7 +165,7 @@ public class ClassTest {
verifyModel("test/data/classes/annotatedClassWithAnnotationParameters.kt") { model ->
with(model.members.single().members.single()) {
with(deprecation!!) {
- assertEquals("deprecated", name)
+ assertEquals("Deprecated", name)
assertEquals(Content.Empty, content)
assertEquals(DocumentationNode.Kind.Annotation, kind)
assertEquals(1, details.count())
@@ -196,7 +190,6 @@ public class ClassTest {
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())