logic tree test update

src/test/java/gov/usgs/earthquake/nshmp/tree/LogicTreeTests.java

@@ -41,7 +41,7 @@ class LogicTreeTests {
     assertEquals(id[1], branch.id());
     assertEquals(value[1], branch.value());
     assertEquals(weight[1], branch.weight());
-    assertEquals(branchString(id[1], weight[1]), branch.toString());
+    assertEquals(branchString(id[1], weight[1], value[1]), branch.toString());
     assertEquals(tree.get(0), tree.iterator().next()); // iterator
 
     /* StringValueTree */
@@ -57,7 +57,7 @@ class LogicTreeTests {
     assertEquals(id[2], branch.id());
     assertEquals(id[2], branch.value());
     assertEquals(0.1, branch.weight());
-    assertEquals(branchString(id[2], weight[2]), branch.toString());
+    assertEquals(branchString(id[2], weight[2], id[2]), branch.toString());
 
     /* EnumTree */
     LogicTree.EnumBuilder<EnumKey, String> enumTreeBuilder =
@@ -72,7 +72,7 @@ class LogicTreeTests {
     assertEquals(EnumKey.ID_2.name(), branch.id());
     assertEquals(value[2], branch.value());
     assertEquals(0.1, branch.weight());
-    assertEquals(branchString(EnumKey.ID_2.name(), weight[2]), branch.toString());
+    assertEquals(branchString(EnumKey.ID_2.name(), weight[2], value[2]), branch.toString());
 
     /* EnumValueTree */
     LogicTree.EnumValueBuilder<EnumKey> enumValueTreeBuilder =
@@ -87,7 +87,9 @@ class LogicTreeTests {
     assertEquals(EnumKey.ID_2.name(), enumBranch.id());
     assertEquals(EnumKey.ID_2, enumBranch.value());
     assertEquals(0.1, enumBranch.weight());
-    assertEquals(branchString(EnumKey.ID_2.name(), weight[2]), enumBranch.toString());
+    assertEquals(
+        branchString(EnumKey.ID_2.name(), weight[2], EnumKey.ID_2.name()),
+        enumBranch.toString());
 
     /* LogicGroup */
     LogicGroup.Builder<String> groupBuilder = LogicGroup.builder();
@@ -101,14 +103,14 @@ class LogicTreeTests {
     assertEquals(id[0], branch.id());
     assertEquals(value[0], branch.value());
     assertEquals(weight[0], branch.weight());
-    assertEquals(branchString(id[0], weight[0]), branch.toString());
+    assertEquals(branchString(id[0], weight[0], value[0]), branch.toString());
     assertEquals(2, group.size());
     assertEquals(group.get(0), group.iterator().next()); // iterator
 
   }
 
-  private static String branchString(String id, double weight) {
-    return id + " [" + weight + "]";
+  private static String branchString(String id, double weight, String value) {
+    return id + " [" + weight + "] " + value;
   }
 
   final static String TEST_TREE = "test-tree";
@@ -126,17 +128,17 @@ class LogicTreeTests {
         .addBranch(id[2], value[2], weight[2])
         .build();
     String treeString = new StringBuilder()
-        .append(TEST_TREE).append(" ┬ ").append(branchString(id[0], weight[0]))
+        .append(TEST_TREE).append(" ┬ ").append(branchString(id[0], weight[0], value[0]))
         .append(Text.NEWLINE)
-        .append("          ├ ").append(branchString(id[1], weight[1]))
+        .append("          ├ ").append(branchString(id[1], weight[1], value[1]))
         .append(Text.NEWLINE)
-        .append("          └ ").append(branchString(id[2], weight[2]))
+        .append("          └ ").append(branchString(id[2], weight[2], value[2]))
         .toString();
     assertEquals(treeString, tree.toString());
 
     LogicTree<String> singletonTree = LogicTree.singleton(TEST_TREE, id[0], value[0]);
     String singletonTreeString = new StringBuilder()
-        .append(TEST_TREE).append(" ─ ").append(branchString(id[0], 1.0))
+        .append(TEST_TREE).append(" ─ ").append(branchString(id[0], 1.0, value[0]))
         .toString();
     assertEquals(singletonTreeString, singletonTree.toString());
 
@@ -146,9 +148,9 @@ class LogicTreeTests {
         .addBranch(id[1], value[1], 1.0)
         .build();
     String groupString = new StringBuilder()
-        .append("logic-group").append(" ┬ ").append(branchString(id[0], 1.0))
+        .append("logic-group").append(" ┬ ").append(branchString(id[0], 1.0, value[0]))
         .append(Text.NEWLINE)
-        .append("            └ ").append(branchString(id[1], 1.0))
+        .append("            └ ").append(branchString(id[1], 1.0, value[1]))
         .toString();
     assertEquals(groupString, group.toString());
   }