refactor 617

fishercoder1534 · fishercoder1534 · commit 1325a936dec3 · 2019-05-18T09:42:26.000-07:00
diff --git a/src/main/java/com/fishercoder/solutions/_617.java b/src/main/java/com/fishercoder/solutions/_617.java
@@ -32,28 +32,6 @@
 public class _617 {
 
     public static class Solution1 {
-        public TreeNode mergeTrees(TreeNode t1, TreeNode t2) {
-            if (t1 == null) {
-                return t2;
-            }
-            if (t2 == null) {
-                return t1;
-            }
-            TreeNode mergedNode = null;
-            if (t1 != null && t2 != null) {
-                mergedNode = new TreeNode(t1.val + t2.val);
-            } else if (t1 != null) {
-                mergedNode = t1;
-            } else if (t2 != null) {
-                mergedNode = t2;
-            }
-            mergedNode.left = mergeTrees(t1.left, t2.left);
-            mergedNode.right = mergeTrees(t1.right, t2.right);
-            return mergedNode;
-        }
-    }
-
-    public static class Solution2 {
         public TreeNode mergeTrees(TreeNode t1, TreeNode t2) {
             if (t1 == null) {
                 return t2;
diff --git a/src/test/java/com/fishercoder/_617Test.java b/src/test/java/com/fishercoder/_617Test.java
@@ -15,7 +15,6 @@
  */
 public class _617Test {
     private static _617.Solution1 solution1;
-    private static _617.Solution2 solution2;
     private static TreeNode t1;
     private static TreeNode t2;
     private static TreeNode actual;
@@ -24,7 +23,6 @@ public class _617Test {
     @BeforeClass
     public static void setup() {
         solution1 = new _617.Solution1();
-        solution2 = new _617.Solution2();
     }
 
     @Test
@@ -40,16 +38,4 @@ public void test1() {
         assertEquals(expected, actual);
     }
 
-    @Test
-    public void test2() {
-        t1 = TreeUtils.constructBinaryTree(Arrays.asList(1, 3, 2, 5));
-
-        t2 = TreeUtils.constructBinaryTree(Arrays.asList(2, 1, 3, null, 4, null, 7));
-
-        expected = TreeUtils.constructBinaryTree(Arrays.asList(3, 4, 5, 5, 4, null, 7));
-
-        actual = solution2.mergeTrees(t1, t2);
-
-        assertEquals(expected, actual);
-    }
 }
