Move EquivalentTrees class into tree.equivalent package

Move Node class to upper level for readability

Author: andrei-punko

…/andd3dfx/tree/test/EquivalentTrees.java …dfx/tree/equivalent/EquivalentTrees.javasrc/main/java/by/andd3dfx/tree/test/EquivalentTrees.java renamed to src/main/java/by/andd3dfx/tree/equivalent/EquivalentTrees.java src/main/java/by/andd3dfx/tree/test/EquivalentTrees.java renamed to src/main/java/by/andd3dfx/tree/equivalent/EquivalentTrees.java

@@ -1,11 +1,10 @@
-package by.andd3dfx.tree.test;
+package by.andd3dfx.tree.equivalent;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -23,44 +22,6 @@
  */
 public class EquivalentTrees {
 
-    public static class Node {
-        char value;  // [A-Z]
-        Node left;
-        Node right;
-
-        public Node(char value) {
-            this.value = value;
-        }
-
-        public Node(char value, Node left, Node right) {
-            this.value = value;
-            this.left = left;
-            this.right = right;
-        }
-
-        @Override
-        public String toString() {
-            return "{" +
-                    value +
-                    ((left != null) ? (", l=" + left) : "") +
-                    ((right != null) ? (", r=" + right) : "") +
-                    '}';
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Node node = (Node) o;
-            return value == node.value && Objects.equals(left, node.left) && Objects.equals(right, node.right);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(value, left, right);
-        }
-    }
-
     public List<Node> findEquivalentSubtrees(Node root) {
         if (root == null) {
             return null;

src/main/java/by/andd3dfx/tree/equivalent/Node.java

@@ -0,0 +1,41 @@
+package by.andd3dfx.tree.equivalent;
+
+import java.util.Objects;
+
+public class Node {
+    char value;  // [A-Z]
+    Node left;
+    Node right;
+
+    public Node(char value) {
+        this.value = value;
+    }
+
+    public Node(char value, Node left, Node right) {
+        this.value = value;
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                value +
+                ((left != null) ? (", l=" + left) : "") +
+                ((right != null) ? (", r=" + right) : "") +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Node node = (Node) o;
+        return value == node.value && Objects.equals(left, node.left) && Objects.equals(right, node.right);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(value, left, right);
+    }
+}

…d3dfx/tree/test/EquivalentTreesTest.java …tree/equivalent/EquivalentTreesTest.javasrc/test/java/by/andd3dfx/tree/test/EquivalentTreesTest.java renamed to src/test/java/by/andd3dfx/tree/equivalent/EquivalentTreesTest.java src/test/java/by/andd3dfx/tree/test/EquivalentTreesTest.java renamed to src/test/java/by/andd3dfx/tree/equivalent/EquivalentTreesTest.java

@@ -1,4 +1,4 @@
-package by.andd3dfx.tree.test;
+package by.andd3dfx.tree.equivalent;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,7 +32,7 @@ public void findEquivalentSubtreesForNull() {
      */
     @Test
     public void findEquivalentSubtreesForRootNodeOnly() {
-        EquivalentTrees.Node node = new EquivalentTrees.Node('A');
+        Node node = new Node('A');
         assertThat(equivalentTrees.findEquivalentSubtrees(node), is(nullValue()));
     }
 
@@ -45,8 +45,8 @@ public void findEquivalentSubtreesForRootNodeOnly() {
      */
     @Test
     public void findEquivalentSubtreesWhenNoCandidates() {
-        EquivalentTrees.Node node = new EquivalentTrees.Node('A');
-        node.left = new EquivalentTrees.Node('B');
+        Node node = new Node('A');
+        node.left = new Node('B');
         assertThat(equivalentTrees.findEquivalentSubtrees(node), is(nullValue()));
     }
 
@@ -59,11 +59,11 @@ public void findEquivalentSubtreesWhenNoCandidates() {
      */
     @Test
     public void findEquivalentSubtreesWhenOneCandidate() {
-        EquivalentTrees.Node node = new EquivalentTrees.Node('A');
-        node.left = new EquivalentTrees.Node('B');
-        node.right = new EquivalentTrees.Node('C');
+        Node node = new Node('A');
+        node.left = new Node('B');
+        node.right = new Node('C');
 
-        List<EquivalentTrees.Node> result = equivalentTrees.findEquivalentSubtrees(node);
+        List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
 
         assertThat(result.size(), is(2));
         assertThat(result, hasItems(node.left, node.right));
@@ -80,13 +80,13 @@ public void findEquivalentSubtreesWhenOneCandidate() {
      */
     @Test
     public void findEquivalentSubtreesWhenTwoCandidate() {
-        EquivalentTrees.Node node = new EquivalentTrees.Node('A');
-        node.left = new EquivalentTrees.Node('B');
-        node.left.left = new EquivalentTrees.Node('X');
-        node.right = new EquivalentTrees.Node('B');
-        node.right.right = new EquivalentTrees.Node('X');
+        Node node = new Node('A');
+        node.left = new Node('B');
+        node.left.left = new Node('X');
+        node.right = new Node('B');
+        node.right.right = new Node('X');
 
-        List<EquivalentTrees.Node> result = equivalentTrees.findEquivalentSubtrees(node);
+        List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
 
         assertThat(result.size(), is(2));
         assertThat(result, hasItems(node.left, node.right));
@@ -105,19 +105,19 @@ public void findEquivalentSubtreesWhenTwoCandidate() {
      */
     @Test
     public void findEquivalentSubtreesComplexCase() {
-        EquivalentTrees.Node root = new EquivalentTrees.Node('A');
-        root.left = new EquivalentTrees.Node('B');
-        root.right = new EquivalentTrees.Node('C');
+        Node root = new Node('A');
+        root.left = new Node('B');
+        root.right = new Node('C');
 
-        root.left.left = new EquivalentTrees.Node('E');
-        root.left.left.left = new EquivalentTrees.Node('D');
+        root.left.left = new Node('E');
+        root.left.left.left = new Node('D');
 
-        root.right.left = new EquivalentTrees.Node('B');
-        root.right.right = new EquivalentTrees.Node('E');
-        root.right.right.left = new EquivalentTrees.Node('E');
-        root.right.right.right = new EquivalentTrees.Node('D');
+        root.right.left = new Node('B');
+        root.right.right = new Node('E');
+        root.right.right.left = new Node('E');
+        root.right.right.right = new Node('D');
 
-        List<EquivalentTrees.Node> result = equivalentTrees.findEquivalentSubtrees(root);
+        List<Node> result = equivalentTrees.findEquivalentSubtrees(root);
 
         assertThat("Two nodes expected", result.size(), is(2));
         assertThat("Left node is absent", result, hasItem(root.left));