1 files changed, 31 insertions, 28 deletions

diff --git a/test/src/model/JavaTest.kt b/test/src/model/JavaTest.kt
index 3129bcc0..5ec29b25 100644
--- a/test/src/model/JavaTest.kt
+++ b/test/src/model/JavaTest.kt
@@ -1,11 +1,14 @@
 package org.jetbrains.dokka.tests
 
-import kotlin.test.*
-import org.jetbrains.dokka.*
-import org.junit.*
+import org.jetbrains.dokka.DocumentationNode
+import org.jetbrains.dokka.DocumentationReference
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 public class JavaTest {
-    Test fun function() {
+    @Test fun function() {
         verifyPackageMember("test/data/java/member.java") { cls ->
             assertEquals("Test", cls.name)
             assertEquals(DocumentationNode.Kind.Class, cls.kind)
@@ -13,7 +16,7 @@ public class JavaTest {
                 assertEquals("fn", name)
                 assertEquals(DocumentationNode.Kind.Function, kind)
                 assertEquals("Summary for Function", content.summary.toTestString().trimEnd())
-                assertEquals(3, content.sections.size())
+                assertEquals(3, content.sections.size)
                 with(content.sections[0]) {
                     assertEquals("Parameters", tag)
                     assertEquals("name", subjectName)
@@ -43,7 +46,7 @@ public class JavaTest {
         }
     }
 
-    Test fun memberWithModifiers() {
+    @Test fun memberWithModifiers() {
         verifyPackageMember("test/data/java/memberWithModifiers.java") { cls ->
             assertEquals("abstract", cls.details[0].name)
             with(cls.members.single { it.name == "fn" }) {
@@ -55,16 +58,16 @@ public class JavaTest {
         }
     }
 
-    Test fun superClass() {
+    @Test fun superClass() {
         verifyPackageMember("test/data/java/superClass.java") { cls ->
             val superTypes = cls.details(DocumentationNode.Kind.Supertype)
-            assertEquals(2, superTypes.size())
+            assertEquals(2, superTypes.size)
             assertEquals("Exception", superTypes[0].name)
             assertEquals("Cloneable", superTypes[1].name)
         }
     }
 
-    Test fun arrayType() {
+    @Test fun arrayType() {
         verifyPackageMember("test/data/java/arrayType.java") { cls ->
             with(cls.members.single()) {
                 val type = detail(DocumentationNode.Kind.Type)
@@ -79,7 +82,7 @@ public class JavaTest {
         }
     }
 
-    Test fun typeParameter() {
+    @Test fun typeParameter() {
         verifyPackageMember("test/data/java/typeParameter.java") { cls ->
             val typeParameters = cls.details(DocumentationNode.Kind.TypeParameter)
             with(typeParameters.single()) {
@@ -98,24 +101,24 @@ public class JavaTest {
         }
     }
 
-    Test fun constructors() {
+    @Test fun constructors() {
         verifyPackageMember("test/data/java/constructors.java") { cls ->
             val constructors = cls.members(DocumentationNode.Kind.Constructor)
-            assertEquals(2, constructors.size())
+            assertEquals(2, constructors.size)
             with(constructors[0]) {
                 assertEquals("<init>", name)
             }
         }
     }
 
-    Test fun innerClass() {
+    @Test fun innerClass() {
         verifyPackageMember("test/data/java/innerClass.java") { cls ->
             val innerClass = cls.members(DocumentationNode.Kind.Class).single()
             assertEquals("D", innerClass.name)
         }
     }
 
-    Test fun varargs() {
+    @Test fun varargs() {
         verifyPackageMember("test/data/java/varargs.java") { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             val param = fn.detail(DocumentationNode.Kind.Parameter)
@@ -126,7 +129,7 @@ public class JavaTest {
         }
     }
 
-    Test fun fields() {
+    @Test fun fields() {
         verifyPackageMember("test/data/java/field.java") { cls ->
             val i = cls.members(DocumentationNode.Kind.Property).single { it.name == "i" }
             assertEquals("Int", i.detail(DocumentationNode.Kind.Type).name)
@@ -137,16 +140,16 @@ public class JavaTest {
         }
     }
 
-    Test fun staticMethod() {
+    @Test fun staticMethod() {
         verifyPackageMember("test/data/java/staticMethod.java") { cls ->
             val m = cls.members(DocumentationNode.Kind.CompanionObjectFunction).single { it.name == "foo" }
             assertFalse("static" in m.details(DocumentationNode.Kind.Modifier).map { it.name })
         }
     }
 
-    Test fun annotatedAnnotation() {
+    @Test fun annotatedAnnotation() {
         verifyPackageMember("test/data/java/annotatedAnnotation.java") { cls ->
-            assertEquals(2, cls.annotations.size())
+            assertEquals(2, cls.annotations.size)
             with(cls.annotations[0]) {
                 assertEquals(1, details.count())
                 with(details[0]) {
@@ -161,8 +164,8 @@ public class JavaTest {
         }
     }
 
-    Test fun deprecation() {
-        verifyPackageMember("test/data/java/deprecation.java") { cls ->
+    @Test fun deprecation() {
+        verifyPackageMember("test/data/java/deprecation.java", withJdk = true) { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             with(fn.deprecation!!) {
                 assertEquals(1, details.count())
@@ -178,26 +181,26 @@ public class JavaTest {
         }
     }
 
-    Test fun javaLangObject() {
-        verifyPackageMember("test/data/java/javaLangObject.java") { cls ->
+    @Test fun javaLangObject() {
+        verifyPackageMember("test/data/java/javaLangObject.java", withJdk = true) { cls ->
             val fn = cls.members(DocumentationNode.Kind.Function).single()
             assertEquals("Any", fn.detail(DocumentationNode.Kind.Type).name)
         }
     }
 
-    Test fun enumValues() {
-        verifyPackageMember("test/data/java/enumValues.java") { cls ->
+    @Test fun enumValues() {
+        verifyPackageMember("test/data/java/enumValues.java", withJdk = true) { cls ->
             val superTypes = cls.details(DocumentationNode.Kind.Supertype)
-            assertEquals(0, superTypes.size())
-            assertEquals(1, cls.members(DocumentationNode.Kind.EnumItem).size())
+            assertEquals(0, superTypes.size)
+            assertEquals(1, cls.members(DocumentationNode.Kind.EnumItem).size)
         }
     }
 
-    Test fun inheritorLinks() {
+    @Test fun inheritorLinks() {
         verifyPackageMember("test/data/java/inheritorLinks.java") { cls ->
             val fooClass = cls.members.single { it.name == "Foo" }
             val inheritors = fooClass.references(DocumentationReference.Kind.Inheritor)
-            assertEquals(1, inheritors.size())
+            assertEquals(1, inheritors.size)
         }
     }
 }