Skip to content

Commit 46765cb

Browse files
committed
Fix unit tests
1 parent eceef59 commit 46765cb

File tree

2 files changed

+13
-11
lines changed
  • workflow-trace-viewer/src
    • jvmMain/kotlin/com/squareup/workflow1/traceviewer/model
    • jvmTest/kotlin/com/squareup/workflow1/traceviewer/util

2 files changed

+13
-11
lines changed

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/model/Node.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ internal data class Node(
5252
}
5353

5454
internal fun Node.addChild(child: Node): Node {
55-
return copy(children = (this.children.plus(child.id to child) as LinkedHashMap<String, Node>))
55+
return copy(children = LinkedHashMap(this.children.plus(child.id to child)))
5656
}
5757

5858
internal fun Node.replaceChild(child: Node): Node {
59-
return copy(children = (this.children.plus(child.id to child) as LinkedHashMap<String, Node>))
59+
return copy(children = LinkedHashMap(this.children.plus(child.id to child)))
6060
}

workflow-trace-viewer/src/jvmTest/kotlin/com/squareup/workflow1/traceviewer/util/JsonParserTest.kt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.squareup.workflow1.traceviewer.util
22

33
import com.squareup.workflow1.traceviewer.model.Node
4-
import com.squareup.workflow1.traceviewer.util.ROOT_ID
4+
import java.util.LinkedHashMap
55
import kotlin.test.Test
66
import kotlin.test.assertEquals
77
import kotlin.test.assertTrue
@@ -24,8 +24,8 @@ class JsonParserTest {
2424

2525
// Verify results
2626
assertEquals(2, mergedTree.children.size)
27-
assertTrue(mergedTree.children.any { it.id == "1" })
28-
assertTrue(mergedTree.children.any { it.id == "2" })
27+
assertTrue(mergedTree.children.containsKey("1"))
28+
assertTrue(mergedTree.children.containsKey("2"))
2929
}
3030

3131
@Test
@@ -46,10 +46,10 @@ class JsonParserTest {
4646

4747
// Verify results
4848
assertEquals(1, mergedTree.children.size)
49-
val updatedChild = mergedTree.children.first()
49+
val updatedChild = mergedTree.children["1"]!!
5050
assertEquals(2, updatedChild.children.size)
51-
assertTrue(updatedChild.children.any { it.id == "2" })
52-
assertTrue(updatedChild.children.any { it.id == "3" })
51+
assertTrue(updatedChild.children.containsKey("2"))
52+
assertTrue(updatedChild.children.containsKey("3"))
5353
}
5454

5555
@Test
@@ -66,7 +66,7 @@ class JsonParserTest {
6666

6767
// Verify results
6868
assertEquals(1, mergedTree.children.size)
69-
assertEquals("child1", mergedTree.children.first().name)
69+
assertEquals("child1", mergedTree.children["1"]?.name)
7070
}
7171

7272
@Test
@@ -83,7 +83,7 @@ class JsonParserTest {
8383

8484
// Verify results
8585
assertEquals(1, mainTree.children.size)
86-
assertEquals("child1", mainTree.children.first().name)
86+
assertEquals("child1", mainTree.children["1"]?.name)
8787
}
8888

8989
private fun createNode(
@@ -101,7 +101,9 @@ class JsonParserTest {
101101
props = "",
102102
state = "",
103103
rendering = "",
104-
children = children,
104+
children = LinkedHashMap<String, Node>().apply {
105+
children.forEach { put(it.id, it) }
106+
}
105107
)
106108
}
107109
}

0 commit comments

Comments
 (0)