update logging to include a current page marker even when diagnostics…

…=false
erdo · Apr 6, 2024 · 1166639 · 1166639
1 parent fc15c7b
commit 1166639
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 7 deletions.
diff --git a/n8-core/src/main/kotlin/co/early/n8/NavigationState.kt b/n8-core/src/main/kotlin/co/early/n8/NavigationState.kt
@@ -147,7 +147,7 @@ sealed class Navigation<L, T> {
             return "\n" + render(
                 builder = StringBuilder(),
                 incDiagnostics = diagnostics,
-                current = diagnostics
+                current = true
             ).toString()
         }
 
@@ -220,7 +220,7 @@ sealed class Navigation<L, T> {
             return "\n" + render(
                 builder = StringBuilder(),
                 incDiagnostics = diagnostics,
-                current = diagnostics
+                current = true
             ).toString()
         }
 
@@ -298,7 +298,7 @@ sealed class Navigation<L, T> {
             return "\n" + render(
                 builder = StringBuilder(),
                 incDiagnostics = diagnostics,
-                current = diagnostics
+                current = true
             ).toString()
         }
 

diff --git a/n8-core/src/main/kotlin/co/early/n8/NavigationStateExt.kt b/n8-core/src/main/kotlin/co/early/n8/NavigationStateExt.kt
@@ -277,6 +277,10 @@ private fun <L, T> EndNode<L, T>.render(
             if (current) {
                 append("     <--- Current Item")
             }
+        } else {
+            if (current) {
+                append(" <---")
+            }
         }
         return this
     }
@@ -311,7 +315,7 @@ private fun <L, T> TabHost<L, T>.render(
             if (index == selectedTabHistory.last()) {
                 tab.render(pad, builder, incDiagnostics, current)
             } else {
-                tab.render(pad, builder, incDiagnostics)
+                tab.render(pad, builder, incDiagnostics, false)
             }
             append(",\n")
         }
@@ -344,7 +348,7 @@ private fun <L, T> BackStack<L, T>.render(
             if (index == lastIndex) {
                 stackItem.render(pad, builder, incDiagnostics, current)
             } else {
-                stackItem.render(pad, builder, incDiagnostics)
+                stackItem.render(pad, builder, incDiagnostics, false)
             }
             append(",\n")
         }

diff --git a/n8-core/src/test/kotlin/co/early/n8/NavigationExtensionsTest.kt b/n8-core/src/test/kotlin/co/early/n8/NavigationExtensionsTest.kt
@@ -97,6 +97,80 @@ class NavigationExtensionsTest {
         )
     }
 
+    @Test
+    fun `when logging nav graph without diagnostics, output is correct`() {
+
+        // arrange
+        val nav = backStackOf(
+            endNodeOf(A) ,
+            endNodeOf(B) ,
+            tabsOf(
+                selectedTabHistory = listOf(0),
+                tabHostId = "TABS_01",
+                backStackOf(
+                    endNodeOf(X1) ,
+                    endNodeOf(C) ,
+                    endNodeOf(D) ,
+                    tabsOf(
+                        selectedTabHistory = listOf(0,1),
+                        tabHostId = "TABS_02",
+                        backStackOf(
+                            endNodeOf(Y1) ,
+                            endNodeOf(E)
+                        ),
+                        backStackOf(
+                            endNodeOf(Y2)
+                        )
+                    )
+                ),
+                backStackOf(
+                    endNodeOf(X1)
+                ),
+                backStackOf(
+                    endNodeOf(X2)
+                )
+            )
+        )
+
+        Fore.i(nav.toString(false))
+
+        // assert
+        assertEquals(
+            "\n" +
+                    "backStackOf( \n" +
+                    "    endNodeOf(A),\n" +
+                    "    endNodeOf(B),\n" +
+                    "    tabsOf( \n" +
+                    "        tabHostId = TABS_01\n" +
+                    "        selectedTabHistory = listOf(0),\n" +
+                    "        backStackOf( \n" +
+                    "            endNodeOf(X1),\n" +
+                    "            endNodeOf(C),\n" +
+                    "            endNodeOf(D),\n" +
+                    "            tabsOf( \n" +
+                    "                tabHostId = TABS_02\n" +
+                    "                selectedTabHistory = listOf(0,1),\n" +
+                    "                backStackOf( \n" +
+                    "                    endNodeOf(Y1),\n" +
+                    "                    endNodeOf(E)\n" +
+                    "                ),\n" +
+                    "                backStackOf( \n" +
+                    "                    endNodeOf(Y2) <---\n" +
+                    "                )\n" +
+                    "            )\n" +
+                    "        ),\n" +
+                    "        backStackOf( \n" +
+                    "            endNodeOf(X1)\n" +
+                    "        ),\n" +
+                    "        backStackOf( \n" +
+                    "            endNodeOf(X2)\n" +
+                    "        )\n" +
+                    "    )\n" +
+                    ")",
+            nav.toString(false)
+        )
+    }
+
     @Test
     fun `given a BackStack, createdBackCopy is correct`() {
 

diff --git a/n8-core/src/test/kotlin/co/early/n8/TestLocationsNested.kt b/n8-core/src/test/kotlin/co/early/n8/TestLocationsNested.kt
@@ -20,11 +20,9 @@ class NestedExample {
         @Serializable
         data object TabAbc : TabHost()
 
-
         @Serializable
         data object TabAbcStructural : TabHost()
 
-
         @Serializable
         data object TabX12 : TabHost()