Let root package be represented as [root] to the user

2 files changed, 12 insertions, 10 deletions

diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt
index 188ee2c6..1adf7626 100644
--- a/plugins/base/src/test/kotlin/model/PackagesTest.kt
+++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt
@@ -22,8 +22,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
                 }
             }
         ) {
-            with((this / "").cast<DPackage>()) {
-                name equals ""
+            with((this / "[root]").cast<DPackage>()) {
+                packageName equals ""
                 children counts 0
             }
         }
@@ -38,7 +38,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             prependPackage = false
         ) {
             with((this / "simple").cast<DPackage>()) {
-                name equals "simple"
+                packageName equals "simple"
                 children counts 0
             }
         }
@@ -53,7 +53,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             prependPackage = false
         ) {
             with((this / "dot.name").cast<DPackage>()) {
-                name equals "dot.name"
+                packageName equals "dot.name"
                 children counts 0
             }
         }
@@ -72,11 +72,11 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
         ) {
             children counts 2
             with((this / "dot.name").cast<DPackage>()) {
-                name equals "dot.name"
+                packageName equals "dot.name"
                 children counts 0
             }
             with((this / "simple").cast<DPackage>()) {
-                name equals "simple"
+                packageName equals "simple"
                 children counts 0
             }
         }
@@ -94,7 +94,7 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
         ) {
             children counts 1
             with((this / "simple").cast<DPackage>()) {
-                name equals "simple"
+                packageName equals "simple"
                 children counts 0
             }
         }
@@ -111,12 +111,14 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             prependPackage = false
         ) {
             with((this / "simple.name").cast<DPackage>()) {
-                name equals "simple.name"
+                packageName equals "simple.name"
                 children counts 1
             }
         }
     }
 
+    // TODO NOW test displayName
+
     // todo
 //    @Test fun suppressAtPackageLevel() {
 //        verifyModel(
diff --git a/plugins/base/src/test/kotlin/translators/utils.kt b/plugins/base/src/test/kotlin/translators/utils.kt
index 71b4a28b..cbb6efa7 100644
--- a/plugins/base/src/test/kotlin/translators/utils.kt
+++ b/plugins/base/src/test/kotlin/translators/utils.kt
@@ -20,7 +20,7 @@ fun DModule.descriptionOf(className: String, functionName: String? = null): Desc
 }
 
 fun DModule.findPackage(packageName: String? = null) =
-    packageName?.let { packages.firstOrNull { pkg -> pkg.name == packageName }
+    packageName?.let { packages.firstOrNull { pkg -> pkg.packageName == packageName }
         ?: throw NoSuchElementException("No packageName with name $packageName") } ?: packages.single()
 
 fun DModule.findClasslike(packageName: String? = null, className: String? = null): DClasslike {
@@ -37,4 +37,4 @@ fun DModule.findFunction(packageName: String? = null, className: String, functio
         classlike.functions.firstOrNull { fn -> fn.name == functionName }
             ?: throw NoSuchElementException("No classlike with name $functionName")
     } ?: classlike.functions.single()
-}
\ No newline at end of file
+}