From 93520158b4be59f98015d07e8fecaa7e5a49fd99 Mon Sep 17 00:00:00 2001
From: Marcin Aman <marcin.aman@gmail.com>
Date: Wed, 20 Jan 2021 10:30:50 +0100
Subject: Bring back displaying jvm name when KaJ is not present (#1702)

---
 .../kotlin/content/annotations/ContentForAnnotationsTest.kt  | 12 ++++++------
 .../test/kotlin/content/annotations/FileLevelJvmNameTest.kt  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/base/src/test/kotlin/content')

diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
index d88d9505..164e5f4a 100644
--- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt
@@ -1,19 +1,19 @@
 package content.annotations
 
 import matchers.content.*
-import org.jetbrains.dokka.pages.ContentPage
-import org.jetbrains.dokka.pages.PackagePageNode
 import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.Annotations
 import org.jetbrains.dokka.model.StringValue
+import org.jetbrains.dokka.pages.ContentPage
+import org.jetbrains.dokka.pages.PackagePageNode
 import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
 import org.junit.jupiter.api.Test
 import utils.ParamAttributes
 import utils.bareSignature
 import utils.propertySignature
 import kotlin.test.assertEquals
-import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 
 class ContentForAnnotationsTest : BaseAbstractTest() {
@@ -243,7 +243,7 @@ class ContentForAnnotationsTest : BaseAbstractTest() {
                     dri = DRI("kotlin.jvm", "JvmName"),
                     params = mapOf("name" to StringValue(name)),
                     scope = Annotations.AnnotationScope.DIRECT,
-                    mustBeDocumented = false
+                    mustBeDocumented = true
                 )
 
                 val property = modules.flatMap { it.packages }.flatMap { it.properties }.first()
@@ -255,11 +255,11 @@ class ContentForAnnotationsTest : BaseAbstractTest() {
                 }
 
                 assertEquals(expectedAnnotation("xd"), getterAnnotation)
-                assertFalse(getterAnnotation?.mustBeDocumented!!)
+                assertTrue(getterAnnotation?.mustBeDocumented!!)
                 assertEquals(Annotations.AnnotationScope.DIRECT, getterAnnotation.scope)
 
                 assertEquals(expectedAnnotation("asd"), setterAnnotation)
-                assertFalse(setterAnnotation?.mustBeDocumented!!)
+                assertTrue(setterAnnotation?.mustBeDocumented!!)
                 assertEquals(Annotations.AnnotationScope.DIRECT, setterAnnotation.scope)
             }
         }
diff --git a/plugins/base/src/test/kotlin/content/annotations/FileLevelJvmNameTest.kt b/plugins/base/src/test/kotlin/content/annotations/FileLevelJvmNameTest.kt
index f2fd518c..ff54f8a7 100644
--- a/plugins/base/src/test/kotlin/content/annotations/FileLevelJvmNameTest.kt
+++ b/plugins/base/src/test/kotlin/content/annotations/FileLevelJvmNameTest.kt
@@ -74,7 +74,7 @@ class FileLevelJvmNameTest : BaseAbstractTest() {
                     dri = DRI("kotlin.jvm", "JvmName"),
                     params = mapOf("name" to StringValue("CustomJvmName")),
                     scope = Annotations.AnnotationScope.FILE,
-                    mustBeDocumented = false
+                    mustBeDocumented = true
                 )
                 val function = modules.flatMap { it.packages }.first().functions.first()
                 val annotation = function.extra[Annotations]?.fileLevelAnnotations?.entries?.first()?.value?.single()
@@ -97,7 +97,7 @@ class FileLevelJvmNameTest : BaseAbstractTest() {
                     dri = DRI("kotlin.jvm", "JvmName"),
                     params = mapOf("name" to StringValue("CustomJvmName")),
                     scope = Annotations.AnnotationScope.FILE,
-                    mustBeDocumented = false
+                    mustBeDocumented = true
                 )
                 val properties = modules.flatMap { it.packages }.first().properties.first()
                 val annotation = properties.extra[Annotations]?.fileLevelAnnotations?.entries?.first()?.value?.single()
-- 
cgit