From 8cd28416817dfd7d28bb66b28e849d97cc09012b Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Thu, 27 Aug 2020 15:50:40 +0200
Subject: Let module name be configurable withing `AbstractDokkaTask` and
 remove concept of `moduleDisplayName`

---
 core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt')

diff --git a/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt b/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
index 8efc84c6..ba33ab92 100644
--- a/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
+++ b/core/src/test/kotlin/utilities/DokkaConfigurationJsonTest.kt
@@ -9,11 +9,11 @@ class DokkaConfigurationJsonTest {
     @Test
     fun `simple configuration toJsonString then parseJson`() {
         val configuration = DokkaConfigurationImpl(
+            moduleName = "moduleName",
             outputDir = File("customOutputDir"),
             pluginsClasspath = listOf(File("plugins/customPlugin.jar")),
             sourceSets = listOf(
                 DokkaSourceSetImpl(
-                    moduleDisplayName = "customModuleDisplayName",
                     sourceRoots = setOf(File("customSourceRoot")),
                     sourceSetID = DokkaSourceSetID("customModuleName", "customSourceSetName")
                 )
@@ -29,13 +29,13 @@ class DokkaConfigurationJsonTest {
     fun `parse simple configuration json`() {
         val json = """
             {
+              "moduleName": "moduleName",
               "outputDir": "customOutputDir",
               "pluginsClasspath": [ "plugins/customPlugin.jar" ],
               "sourceSets": [
                 {
-                  "moduleDisplayName": "customModuleDisplayName",
                   "sourceSetID": {
-                    "moduleName": "customModuleName",
+                    "scopeId": "customModuleName",
                     "sourceSetName": "customSourceSetName"
                   },
                   "sourceRoots": [ "customSourceRoot" ], 
@@ -48,11 +48,11 @@ class DokkaConfigurationJsonTest {
         val parsedConfiguration = DokkaConfigurationImpl(json)
         assertEquals(
             DokkaConfigurationImpl(
+                moduleName = "moduleName",
                 outputDir = File("customOutputDir"),
                 pluginsClasspath = listOf(File("plugins/customPlugin.jar")),
                 sourceSets = listOf(
                     DokkaSourceSetImpl(
-                        moduleDisplayName = "customModuleDisplayName",
                         sourceRoots = setOf(File("customSourceRoot")),
                         sourceSetID = DokkaSourceSetID("customModuleName", "customSourceSetName"),
                         classpath = listOf(File("classpath/custom1.jar"), File("classpath/custom2.jar"))
-- 
cgit