From fdf8a298f586d7e334c312346b70b59c64c8d037 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Thu, 21 Jan 2021 00:34:43 +0100 Subject: Empty modules filtering (#1699) --- plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt | 12 ++++++++---- .../base/src/test/kotlin/filter/DeprecationFilterTest.kt | 10 +++++----- .../base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt | 13 +++++++------ plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt | 12 ++++++------ 4 files changed, 26 insertions(+), 21 deletions(-) (limited to 'plugins/base/src/test') diff --git a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt index 2a3e4267..2a927b97 100644 --- a/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt +++ b/plugins/base/src/test/kotlin/basic/FailOnWarningTest.kt @@ -24,8 +24,9 @@ class FailOnWarningTest : BaseAbstractTest() { assertThrows { testInline( """ - |/src/main/kotlin + |/src/main/kotlin/Bar.kt |package sample + |class Bar {} """.trimIndent(), configuration ) { pluginsSetupStage = { @@ -49,8 +50,9 @@ class FailOnWarningTest : BaseAbstractTest() { assertThrows { testInline( """ - |/src/main/kotlin + |/src/main/kotlin/Bar.kt |package sample + |class Bar {} """.trimIndent(), configuration ) { pluginsSetupStage = { @@ -75,8 +77,9 @@ class FailOnWarningTest : BaseAbstractTest() { testInline( """ - |/src/main/kotlin + |/src/main/kotlin/Bar.kt |package sample + |class Bar {} """.trimIndent(), configuration, loggerForTest = TestLogger(ZeroErrorOrWarningCountDokkaLogger()) @@ -99,8 +102,9 @@ class FailOnWarningTest : BaseAbstractTest() { testInline( """ - |/src/main/kotlin + |/src/main/kotlin/Bar.kt |package sample + |class Bar {} """.trimIndent(), configuration ) { pluginsSetupStage = { diff --git a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt index cc5c2c29..ccb878d0 100644 --- a/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/DeprecationFilterTest.kt @@ -31,7 +31,7 @@ class DeprecationFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } @@ -61,7 +61,7 @@ class DeprecationFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } @@ -91,7 +91,7 @@ class DeprecationFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 0 + it.first().packages.first().functions.size == 0 ) } } @@ -130,7 +130,7 @@ class DeprecationFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 0 + it.first().packages.first().functions.size == 0 ) } } @@ -167,7 +167,7 @@ class DeprecationFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } diff --git a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt index 356f66bf..2a5a5dd5 100644 --- a/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/EmptyPackagesFilterTest.kt @@ -3,6 +3,7 @@ package filter import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test +import kotlin.test.assertEquals class EmptyPackagesFilterTest : BaseAbstractTest() { @Test @@ -28,7 +29,7 @@ class EmptyPackagesFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.isNotEmpty() + it.first().packages.isNotEmpty() ) } } @@ -39,7 +40,7 @@ class EmptyPackagesFilterTest : BaseAbstractTest() { sourceSets { sourceSet { skipEmptyPackages = true - sourceRoots = listOf("src/main/kotlin/basic/Test.kt") + sourceRoots = listOf("src/main/kotlin") } } } @@ -49,15 +50,15 @@ class EmptyPackagesFilterTest : BaseAbstractTest() { |/src/main/kotlin/basic/Test.kt |package example | - | + | class ThisShouldBePresent { } + |/src/main/kotlin/empty/TestEmpty.kt + |package empty """.trimMargin(), configuration ) { documentablesFirstTransformationStep = { modules -> modules.forEach { module -> - Assertions.assertTrue( - module.packages.isEmpty() - ) + assertEquals(listOf("example"), module.packages.map { it.name }) } } } diff --git a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt index 13997154..b0476b6e 100644 --- a/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt +++ b/plugins/base/src/test/kotlin/filter/VisibilityFilterTest.kt @@ -33,7 +33,7 @@ class VisibilityFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } @@ -64,7 +64,7 @@ class VisibilityFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 0 + it.first().packages.first().functions.size == 0 ) } } @@ -95,7 +95,7 @@ class VisibilityFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } @@ -135,7 +135,7 @@ class VisibilityFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 1 + it.first().packages.first().functions.size == 1 ) } } @@ -175,7 +175,7 @@ class VisibilityFilterTest : BaseAbstractTest() { ) { documentablesFirstTransformationStep = { Assertions.assertTrue( - it.component2().packages.first().functions.size == 0 + it.first().packages.first().functions.size == 0 ) } } @@ -202,7 +202,7 @@ class VisibilityFilterTest : BaseAbstractTest() { configuration ) { documentablesFirstTransformationStep = { - assertEquals(0, it.component2().packages.first().typealiases.size) + assertEquals(0, it.first().packages.first().typealiases.size) } } } -- cgit