diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-07-08 10:33:26 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-07-08 11:48:29 +0200 |
| commit | 6d1e25756c3e8c43ce4d5721e7665f439a19e47c (patch) | |
| tree | 4a0043bebf061479ccaeaa19129229894eb9598b /plugins/gfm | |
| parent | a97ae720815e462c2e941d84c6273d8ecc138e6b (diff) | |
| download | dokka-6d1e25756c3e8c43ce4d5721e7665f439a19e47c.tar.gz dokka-6d1e25756c3e8c43ce4d5721e7665f439a19e47c.tar.bz2 dokka-6d1e25756c3e8c43ce4d5721e7665f439a19e47c.zip | |
Move common base test utils to submodule
Diffstat (limited to 'plugins/gfm')
| -rw-r--r-- | plugins/gfm/build.gradle.kts | 2 | ||||
| -rw-r--r-- | plugins/gfm/src/main/kotlin/GfmPlugin.kt | 8 | ||||
| -rw-r--r-- | plugins/gfm/src/test/kotlin/renderers/gfm/DivergentTest.kt | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts index 7bea1b97..2addd9c9 100644 --- a/plugins/gfm/build.gradle.kts +++ b/plugins/gfm/build.gradle.kts @@ -10,5 +10,5 @@ publishing { dependencies { compileOnly(project(":plugins:base")) testImplementation(project(":plugins:base")) - testImplementation(project(":plugins:base", configuration = "testUtils")) + testImplementation(project(":plugins:base:test-utils")) } diff --git a/plugins/gfm/src/main/kotlin/GfmPlugin.kt b/plugins/gfm/src/main/kotlin/GfmPlugin.kt index 671b87f8..df9d032f 100644 --- a/plugins/gfm/src/main/kotlin/GfmPlugin.kt +++ b/plugins/gfm/src/main/kotlin/GfmPlugin.kt @@ -149,7 +149,7 @@ open class CommonmarkRenderer( platforms.joinToString( prefix = " [", postfix = "] $text " - ) { it.sourceSetID.toString() }) + ) { "${it.moduleDisplayName}/${it.displayName}" }) buildNewLine() } } @@ -166,7 +166,7 @@ open class CommonmarkRenderer( ) { if (node.dci.kind == ContentKind.Sample || node.dci.kind == ContentKind.Parameters) { node.sourceSets.forEach { sourcesetData -> - append(sourcesetData.sourceSetID.toString()) + append("${sourcesetData.moduleDisplayName}/${sourcesetData.displayName}") buildNewLine() buildTable( node.copy( @@ -251,7 +251,7 @@ open class CommonmarkRenderer( distinct.values.forEach { entry -> val (instance, sourceSets) = entry.getInstanceAndSourceSets() - append(sourceSets.joinToString(prefix = "#### [", postfix = "]") { it.sourceSetID.toString() }) + append(sourceSets.joinToString(prefix = "#### [", postfix = "]") { "${it.moduleDisplayName}/${it.displayName}" }) buildNewLine() instance.before?.let { append("##### Brief description") @@ -266,7 +266,7 @@ open class CommonmarkRenderer( .values.forEach { innerEntry -> val (innerInstance, innerSourceSets) = innerEntry.getInstanceAndSourceSets() if(sourceSets.size > 1) { - append(innerSourceSets.joinToString(prefix = "###### [", postfix = "]") { it.sourceSetID.toString() }) + append(innerSourceSets.joinToString(prefix = "###### [", postfix = "]") { "${it.moduleDisplayName}/${it.displayName}" }) buildNewLine() } innerInstance.divergent.build(this@buildDivergent, pageContext) diff --git a/plugins/gfm/src/test/kotlin/renderers/gfm/DivergentTest.kt b/plugins/gfm/src/test/kotlin/renderers/gfm/DivergentTest.kt index 035a9264..634f427a 100644 --- a/plugins/gfm/src/test/kotlin/renderers/gfm/DivergentTest.kt +++ b/plugins/gfm/src/test/kotlin/renderers/gfm/DivergentTest.kt @@ -13,21 +13,21 @@ import renderers.TestPage class DivergentTest : GfmRenderingOnlyTestBase() { private val js = defaultSourceSet.copy( "root", - "JS", + "js", DokkaSourceSetID("root", "js"), analysisPlatform = Platform.js, sourceRoots = listOf(SourceRootImpl("pl1")) ) private val jvm = defaultSourceSet.copy( "root", - "JVM", + "jvm", DokkaSourceSetID("root", "jvm"), analysisPlatform = Platform.jvm, sourceRoots = listOf(SourceRootImpl("pl1")) ) private val native = defaultSourceSet.copy( "root", - "NATIVE", + "native", DokkaSourceSetID("root", "native"), analysisPlatform = Platform.native, sourceRoots = listOf(SourceRootImpl("pl1")) |