refactor 235

fishercoder1534 · fishercoder1534 · commit 62d1504602ea · 2019-05-18T11:43:37.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_235.java b/src/main/java/com/fishercoder/solutions/_235.java
@@ -39,21 +39,4 @@ public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) {
         }
     }
 
-    public static class Solution2 {
-        public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) {
-            if (p == root || q == root || p == q) {
-                return root;
-            }
-            if (p.val < root.val && q.val > root.val) {
-                return root;
-            }
-            if (p.val < root.val && q.val < root.val) {
-                return lowestCommonAncestor(root.left, p, q);
-            }
-            if (p.val > root.val && q.val > root.val) {
-                return lowestCommonAncestor(root.right, p, q);
-            }
-            return root;
-        }
-    }
-}
+}
diff --git a/src/test/java/com/fishercoder/_235Test.java b/src/test/java/com/fishercoder/_235Test.java
@@ -3,52 +3,50 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions._235;
+
 import java.util.Arrays;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class _235Test {
-  private static _235.Solution1 solution1;
-  private static _235.Solution2 solution2;
-  private static TreeNode root;
-  private static TreeNode p;
-  private static TreeNode q;
-
-  @BeforeClass
-  public static void setup() {
-    solution1 = new _235.Solution1();
-    solution2 = new _235.Solution2();
-  }
-
-  @Test
-  public void test1() {
-    root = TreeUtils.constructBinaryTree(Arrays.asList(6, 2, 8, 0, 4, 7, 9, 3, 5));
-    TreeUtils.printBinaryTree(root);
-
-    p = TreeUtils.constructBinaryTree(Arrays.asList(2, 0, 4, 3, 5));
-    TreeUtils.printBinaryTree(p);
-
-    q = TreeUtils.constructBinaryTree(Arrays.asList(8, 7, 9));
-    TreeUtils.printBinaryTree(q);
-
-    assertEquals(root, solution1.lowestCommonAncestor(root, p, q));
-    assertEquals(root, solution2.lowestCommonAncestor(root, p, q));
-  }
-
-  @Test
-  public void test2() {
-    root = TreeUtils.constructBinaryTree(Arrays.asList(6, 2, 8, 0, 4, 7, 9, 3, 5));
-    TreeUtils.printBinaryTree(root);
-
-    p = TreeUtils.constructBinaryTree(Arrays.asList(2, 0, 4, 3, 5));
-    TreeUtils.printBinaryTree(p);
-
-    q = TreeUtils.constructBinaryTree(Arrays.asList(4));
-    TreeUtils.printBinaryTree(q);
-
-    assertEquals(p, solution1.lowestCommonAncestor(root, p, q));
-    assertEquals(p, solution2.lowestCommonAncestor(root, p, q));
-  }
+    private static _235.Solution1 solution1;
+    private static TreeNode root;
+    private static TreeNode p;
+    private static TreeNode q;
+
+    @BeforeClass
+    public static void setup() {
+        solution1 = new _235.Solution1();
+    }
+
+    @Test
+    public void test1() {
+        root = TreeUtils.constructBinaryTree(Arrays.asList(6, 2, 8, 0, 4, 7, 9, 3, 5));
+        TreeUtils.printBinaryTree(root);
+
+        p = TreeUtils.constructBinaryTree(Arrays.asList(2, 0, 4, 3, 5));
+        TreeUtils.printBinaryTree(p);
+
+        q = TreeUtils.constructBinaryTree(Arrays.asList(8, 7, 9));
+        TreeUtils.printBinaryTree(q);
+
+        assertEquals(root, solution1.lowestCommonAncestor(root, p, q));
+    }
+
+    @Test
+    public void test2() {
+        root = TreeUtils.constructBinaryTree(Arrays.asList(6, 2, 8, 0, 4, 7, 9, 3, 5));
+        TreeUtils.printBinaryTree(root);
+
+        p = TreeUtils.constructBinaryTree(Arrays.asList(2, 0, 4, 3, 5));
+        TreeUtils.printBinaryTree(p);
+
+        q = TreeUtils.constructBinaryTree(Arrays.asList(4));
+        TreeUtils.printBinaryTree(q);
+
+        assertEquals(p, solution1.lowestCommonAncestor(root, p, q));
+    }
 }
