update 572

Author: fishercoder1534

src/main/java/com/fishercoder/solutions/firstthousand/_572.java

@@ -5,43 +5,6 @@
 public class _572 {
 
     public static class Solution1 {
-        public boolean isSubtree(TreeNode s, TreeNode t) {
-            if (s == null && t == null) {
-                return true;
-            }
-            boolean isSubTree = false;
-            if (s != null && t != null && s.val == t.val) {
-                isSubTree = isSameTree(s, t);
-            }
-            if (isSubTree) {
-                return true;
-            }
-            boolean isSubTreeLeft = false;
-            if (s.left != null) {
-                isSubTreeLeft = isSubtree(s.left, t);
-            }
-            if (isSubTreeLeft) {
-                return true;
-            }
-            boolean isSubTreeRight = false;
-            if (s.right != null) {
-                isSubTreeRight = isSubtree(s.right, t);
-            }
-            if (isSubTreeRight) {
-                return true;
-            }
-            return false;
-        }
-
-        private boolean isSameTree(TreeNode p, TreeNode q) {
-            if (p == null || q == null) {
-                return p == q;
-            }
-            return p.val == q.val && isSameTree(p.left, q.left) && isSameTree(p.right, q.right);
-        }
-    }
-
-    public static class Solution2 {
         public boolean isSubtree(TreeNode root, TreeNode subRoot) {
             if (root == null) {
                 return false;

src/test/java/com/fishercoder/firstthousand/_572Test.java

@@ -3,24 +3,22 @@
 import com.fishercoder.common.classes.TreeNode;
 import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions.firstthousand._572;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class _572Test {
     private static _572.Solution1 solution1;
-    private static _572.Solution2 solution2;
     private static boolean expected;
     private static TreeNode root;
     private static TreeNode subRoot;
 
-    @BeforeClass
-    public static void setup() {
+    @BeforeEach
+    public void setup() {
         solution1 = new _572.Solution1();
-        solution2 = new _572.Solution2();
     }
 
     @Test
@@ -30,7 +28,6 @@ public void test1() {
         subRoot = TreeUtils.constructBinaryTree(Arrays.asList(4, 1, 2));
         expected = true;
         assertEquals(expected, solution1.isSubtree(root, subRoot));
-        assertEquals(expected, solution2.isSubtree(root, subRoot));
     }
 
     @Test
@@ -40,7 +37,6 @@ public void test2() {
         subRoot = TreeUtils.constructBinaryTree(Arrays.asList(4, 1, 2));
         expected = false;
         assertEquals(expected, solution1.isSubtree(root, subRoot));
-        assertEquals(expected, solution2.isSubtree(root, subRoot));
     }
 
 }