From 1c78ecebfb6fc2b24c64c13f7e85218b01a7a69b Mon Sep 17 00:00:00 2001
From: Marcin Aman <marcin.aman@gmail.com>
Date: Tue, 16 Feb 2021 21:15:02 +0100
Subject: Fix displaying default java visibility (#1738)

---
 .../DefaultPsiToDocumentableTranslatorTest.kt      | 40 +++++-----------------
 .../kotlin/translators/JavadocInheritDocsTest.kt   |  2 +-
 .../translators/JavadocInheritedDocTagsTest.kt     |  1 +
 3 files changed, 10 insertions(+), 33 deletions(-)

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

diff --git a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
index 5e0eb484..5cbd4416 100644
--- a/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
+++ b/plugins/base/src/test/kotlin/translators/DefaultPsiToDocumentableTranslatorTest.kt
@@ -8,17 +8,17 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
 class DefaultPsiToDocumentableTranslatorTest : BaseAbstractTest() {
-
-    @Test
-    fun `method overriding two documented classes picks closest class documentation`() {
-        val configuration = dokkaConfiguration {
-            sourceSets {
-                sourceSet {
-                    sourceRoots = listOf("src/main/java")
-                }
+    val configuration = dokkaConfiguration {
+        sourceSets {
+            sourceSet {
+                sourceRoots = listOf("src/main/java")
+                includeNonPublic = true
             }
         }
+    }
 
+    @Test
+    fun `method overriding two documented classes picks closest class documentation`() {
         testInline(
             """
             |/src/main/java/sample/BaseClass1.java
@@ -56,14 +56,6 @@ class DefaultPsiToDocumentableTranslatorTest : BaseAbstractTest() {
 
     @Test
     fun `method overriding class and interface picks class documentation`() {
-        val configuration = dokkaConfiguration {
-            sourceSets {
-                sourceSet {
-                    sourceRoots = listOf("src/main/java")
-                }
-            }
-        }
-
         testInline(
             """
             |/src/main/java/sample/BaseClass1.java
@@ -101,14 +93,6 @@ class DefaultPsiToDocumentableTranslatorTest : BaseAbstractTest() {
 
     @Test
     fun `method overriding two classes picks closest documented class documentation`() {
-        val configuration = dokkaConfiguration {
-            sourceSets {
-                sourceSet {
-                    sourceRoots = listOf("src/main/java")
-                }
-            }
-        }
-
         testInline(
             """
             |/src/main/java/sample/BaseClass1.java
@@ -144,14 +128,6 @@ class DefaultPsiToDocumentableTranslatorTest : BaseAbstractTest() {
 
     @Test
     fun `java package-info package description`() {
-        val configuration = dokkaConfiguration {
-            sourceSets {
-                sourceSet {
-                    sourceRoots = listOf("src/main/java")
-                }
-            }
-        }
-
         testInline(
             """
             |/src/main/java/sample/BaseClass1.java
diff --git a/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt b/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt
index 4e2cf70f..d5d25dc7 100644
--- a/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt
+++ b/plugins/base/src/test/kotlin/translators/JavadocInheritDocsTest.kt
@@ -277,7 +277,7 @@ class JavadocInheritDocsTest : BaseAbstractTest() {
             |}
             |/src/main/java/sample/Subclass.java
             |package sample;
-            |class Subclass extends Superclass {
+            |public class Subclass extends Superclass {
             |    /**
             |     * Sample sub method. {@inheritDoc}
             |     */
diff --git a/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt b/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt
index c29c4e96..ecde2c77 100644
--- a/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt
+++ b/plugins/base/src/test/kotlin/translators/JavadocInheritedDocTagsTest.kt
@@ -16,6 +16,7 @@ class JavadocInheritedDocTagsTest : BaseAbstractTest() {
         sourceSets {
             sourceSet {
                 sourceRoots = listOf("src/main/java")
+                includeNonPublic = true
             }
         }
     }
-- 
cgit