kenhuuu commented on code in PR #3448: URL: https://github.com/apache/tinkerpop/pull/3448#discussion_r3365586031
########## gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/TreeTest.java: ########## @@ -24,85 +24,233 @@ import org.hamcrest.Matchers; import org.junit.Test; -import java.util.AbstractMap; import java.util.Arrays; import java.util.List; -import java.util.Map; +import java.util.Optional; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; /** * @author Marko A. Rodriguez (http://markorodriguez.com) * @author Daniel Kuppitz (http://gremlin.guru) */ public class TreeTest extends StepTest { + /** + * Helper that builds a subtree shaped like {@code key -> subtree}. + */ + private static <T> Tree<T> branch(final T key, final Tree<T> subtree) { + final Tree<T> wrapper = new Tree<>(); + wrapper.getOrCreateChild(key).addTree(subtree); + return wrapper; + } + @Test public void shouldProvideValidDepths() { - Tree<String> tree = new Tree<String>(); - tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3")))); - tree.put("josh", new Tree<String>("1", "2")); + final Tree<String> tree = new Tree<>(); + final Tree<String> markoSubtree = new Tree<>(); + markoSubtree.addTree(branch("a", new Tree<>("a1", "a2"))); + markoSubtree.addTree(branch("b", new Tree<>("b1", "b2", "b3"))); + tree.getOrCreateChild("marko").addTree(markoSubtree); + tree.getOrCreateChild("josh").addTree(new Tree<>("1", "2")); + + assertEquals(2, tree.getNodesAtDepth(0).size()); + assertTrue(tree.getNodesAtDepth(0).containsAll(Arrays.asList("marko", "josh"))); + assertEquals(4, tree.getNodesAtDepth(1).size()); + assertEquals(5, tree.getNodesAtDepth(2).size()); + assertEquals(0, tree.getNodesAtDepth(3).size()); + assertEquals(0, tree.getNodesAtDepth(4).size()); + assertEquals(0, tree.getNodesAtDepth(5).size()); - assertEquals(0, tree.getObjectsAtDepth(0).size()); - assertEquals(2, tree.getObjectsAtDepth(1).size()); - assertEquals(4, tree.getObjectsAtDepth(2).size()); - assertEquals(5, tree.getObjectsAtDepth(3).size()); - assertEquals(0, tree.getObjectsAtDepth(4).size()); - assertEquals(0, tree.getObjectsAtDepth(5).size()); + assertEquals(1, tree.getTreesAtDepth(0).size()); + assertEquals(tree, tree.getTreesAtDepth(0).get(0)); - assertEquals(2, tree.get("josh").size()); - assertEquals(0, tree.get("marko").get("b").get("b1").size()); - assertEquals(3, tree.get("marko").get("b").size()); - assertNull(tree.get("marko").get("c")); + assertEquals(2, tree.childAt("josh").rootNodes().size()); + assertTrue(tree.childAt("marko").childAt("b").childAt("b1").isLeaf()); + assertEquals(3, tree.childAt("marko").childAt("b").rootNodes().size()); + assertFalse(tree.childAt("marko").hasChild("c")); } @Test public void shouldProvideValidLeaves() { - Tree<String> tree = new Tree<String>(); - tree.put("marko", new Tree<String>(TreeTest.createTree("a", new Tree<String>("a1", "a2")), TreeTest.createTree("b", new Tree<String>("b1", "b2", "b3")))); - tree.put("josh", new Tree<String>("1", "2")); + final Tree<String> tree = new Tree<>(); + final Tree<String> markoSubtree = new Tree<>(); + markoSubtree.addTree(branch("a", new Tree<>("a1", "a2"))); + markoSubtree.addTree(branch("b", new Tree<>("b1", "b2", "b3"))); + tree.getOrCreateChild("marko").addTree(markoSubtree); + tree.getOrCreateChild("josh").addTree(new Tree<>("1", "2")); assertEquals(7, tree.getLeafTrees().size()); - for (Tree<String> t : tree.getLeafTrees()) { - assertEquals(1, t.keySet().size()); - final String key = t.keySet().iterator().next(); + for (final Tree<String> t : tree.getLeafTrees()) { + assertEquals(1, t.rootNodes().size()); + final String key = t.rootNodes().iterator().next(); assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(key)); } - assertEquals(7, tree.getLeafObjects().size()); - for (String s : tree.getLeafObjects()) { + assertEquals(7, tree.getLeafNodes().size()); + for (final String s : tree.getLeafNodes()) { assertTrue(Arrays.asList("a1", "a2", "b1", "b2", "b3", "1", "2").contains(s)); } } @Test public void shouldMergeTreesCorrectly() { - Tree<String> tree1 = new Tree<>(); - tree1.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_1")))); - Tree<String> tree2 = new Tree<>(); - tree2.put("1", new Tree<String>(TreeTest.createTree("1_1", new Tree<String>("1_1_1")), TreeTest.createTree("1_2", new Tree<String>("1_2_2")))); + final Tree<String> tree1 = new Tree<>(); + final Tree<String> tree1OneSubtree = new Tree<>(); + tree1OneSubtree.addTree(branch("1_1", new Tree<>("1_1_1"))); + tree1OneSubtree.addTree(branch("1_2", new Tree<>("1_2_1"))); + tree1.getOrCreateChild("1").addTree(tree1OneSubtree); + + final Tree<String> tree2 = new Tree<>(); + final Tree<String> tree2OneSubtree = new Tree<>(); + tree2OneSubtree.addTree(branch("1_1", new Tree<>("1_1_1"))); + tree2OneSubtree.addTree(branch("1_2", new Tree<>("1_2_2"))); + tree2.getOrCreateChild("1").addTree(tree2OneSubtree); - Tree<String> mergeTree = new Tree<>(); + final Tree<String> mergeTree = new Tree<>(); mergeTree.addTree(tree1); mergeTree.addTree(tree2); - assertEquals(1, mergeTree.size()); - assertEquals(0, mergeTree.getObjectsAtDepth(0).size()); - assertEquals(1, mergeTree.getObjectsAtDepth(1).size()); - assertEquals(2, mergeTree.getObjectsAtDepth(2).size()); - assertEquals(3, mergeTree.getObjectsAtDepth(3).size()); - assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_1_1")); - assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_1")); - assertTrue(mergeTree.getObjectsAtDepth(3).contains("1_2_2")); + assertEquals(1, mergeTree.rootNodes().size()); + assertEquals(1, mergeTree.getNodesAtDepth(0).size()); + assertEquals(2, mergeTree.getNodesAtDepth(1).size()); + assertEquals(3, mergeTree.getNodesAtDepth(2).size()); + assertEquals(0, mergeTree.getNodesAtDepth(3).size()); + assertTrue(mergeTree.getNodesAtDepth(2).contains("1_1_1")); + assertTrue(mergeTree.getNodesAtDepth(2).contains("1_2_1")); + assertTrue(mergeTree.getNodesAtDepth(2).contains("1_2_2")); + } + + @Test + public void shouldGetOrCreateChild() { + final Tree<String> tree = new Tree<>(); + final Tree<String> child = tree.getOrCreateChild("a"); + assertNotNull(child); + assertTrue(child.isLeaf()); + // calling again returns the same instance + assertSame(child, tree.getOrCreateChild("a")); + + // mutating the returned subtree is observable through the parent + child.getOrCreateChild("a1"); + assertTrue(tree.childAt("a").hasChild("a1")); + } + + @Test + public void shouldAllowNullKeys() { Review Comment: You might want to rethink this. If you are going to implement this using maps in the other GLVs, null is not a valid key in a lot of languages. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
