Use more structural approach to testing using with(node) { ... }

1 files changed, 24 insertions, 21 deletions

diff --git a/test/src/PackageTest.kt b/test/src/PackageTest.kt
index 46e25c9f..6ab40ba6 100644
--- a/test/src/PackageTest.kt
+++ b/test/src/PackageTest.kt
@@ -7,37 +7,40 @@ import com.jetbrains.dokka.*
 public class PackageTest {
     Test fun rootPackage() {
         verifyModel("test/data/packages/rootPackage.kt") { model ->
-            val item = model.nodes.single()
-            assertEquals(DocumentationNodeKind.Package, item.kind)
-            assertEquals("", item.name)
-            assertEquals("", item.doc)
-            assertTrue(item.details.none())
-            assertTrue(item.members.none())
-            assertTrue(item.links.none())
+            with(model.nodes.single()) {
+                assertEquals(DocumentationNodeKind.Package, kind)
+                assertEquals("", name)
+                assertEquals("", doc)
+                assertTrue(details.none())
+                assertTrue(members.none())
+                assertTrue(links.none())
+            }
         }
     }
 
     Test fun simpleNamePackage() {
         verifyModel("test/data/packages/simpleNamePackage.kt") { model ->
-            val item = model.nodes.single()
-            assertEquals(DocumentationNodeKind.Package, item.kind)
-            assertEquals("simple", item.name)
-            assertEquals("", item.doc)
-            assertTrue(item.details.none())
-            assertTrue(item.members.none())
-            assertTrue(item.links.none())
+            with(model.nodes.single()) {
+                assertEquals(DocumentationNodeKind.Package, kind)
+                assertEquals("simple", name)
+                assertEquals("", doc)
+                assertTrue(details.none())
+                assertTrue(members.none())
+                assertTrue(links.none())
+            }
         }
     }
 
     Test fun dottedNamePackage() {
         verifyModel("test/data/packages/dottedNamePackage.kt") { model ->
-            val item = model.nodes.single()
-            assertEquals(DocumentationNodeKind.Package, item.kind)
-            assertEquals("dot.name", item.name)
-            assertEquals("", item.doc)
-            assertTrue(item.details.none())
-            assertTrue(item.members.none())
-            assertTrue(item.links.none())
+            with(model.nodes.single()) {
+                assertEquals(DocumentationNodeKind.Package, kind)
+                assertEquals("dot.name", name)
+                assertEquals("", doc)
+                assertTrue(details.none())
+                assertTrue(members.none())
+                assertTrue(links.none())
+            }
         }
     }
 }
\ No newline at end of file