fix 572

fishercoder1534 · fishercoder1534 · commit 03208e2a5c7c · 2021-11-20T11:50:37.000-08:00
diff --git a/src/main/java/com/fishercoder/solutions/_572.java b/src/main/java/com/fishercoder/solutions/_572.java
@@ -42,14 +42,14 @@ private boolean isSameTree(TreeNode p, TreeNode q) {
     }
 
     public static class Solution2 {
-        public boolean isSubtree(TreeNode s, TreeNode t) {
-            if (s == null) {
+        public boolean isSubtree(TreeNode root, TreeNode subRoot) {
+            if (root == null) {
                 return false;
             }
-            if (same(s, t)) {
+            if (same(root, subRoot)) {
                 return true;
             }
-            return isSubtree(s.left, t) || isSubtree(s.right, t);
+            return isSubtree(root.left, subRoot) || isSubtree(root.right, subRoot);
         }
 
         private boolean same(TreeNode s, TreeNode t) {
diff --git a/src/test/java/com/fishercoder/_572Test.java b/src/test/java/com/fishercoder/_572Test.java
@@ -1,55 +1,46 @@
 package com.fishercoder;
 
 import com.fishercoder.common.classes.TreeNode;
+import com.fishercoder.common.utils.TreeUtils;
 import com.fishercoder.solutions._572;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.Arrays;
+
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by fishercoder on 5/6/17.
- */
 public class _572Test {
     private static _572.Solution1 solution1;
+    private static _572.Solution2 solution2;
     private static boolean expected;
-    private static boolean actual;
+    private static TreeNode root;
+    private static TreeNode subRoot;
 
     @BeforeClass
     public static void setup() {
         solution1 = new _572.Solution1();
+        solution2 = new _572.Solution2();
     }
 
     @Test
     public void test1() {
-        TreeNode s = new TreeNode(3);
-        s.left = new TreeNode(4);
-        s.right = new TreeNode(5);
-        s.left.left = new TreeNode(1);
-        s.left.right = new TreeNode(2);
-        s.left.right.left = new TreeNode(0);
-
-        TreeNode t = new TreeNode(4);
-        t.left = new TreeNode(1);
-        t.right = new TreeNode(2);
-        expected = false;
-        actual = solution1.isSubtree(s, t);
-        assertEquals(expected, actual);
+        root = TreeUtils.constructBinaryTree(Arrays.asList(3, 4, 5, 1, 2));
+        TreeUtils.printBinaryTree(root);
+        subRoot = TreeUtils.constructBinaryTree(Arrays.asList(4, 1, 2));
+        expected = true;
+        assertEquals(expected, solution1.isSubtree(root, subRoot));
+        assertEquals(expected, solution2.isSubtree(root, subRoot));
     }
 
     @Test
     public void test2() {
-        TreeNode s = new TreeNode(3);
-        s.left = new TreeNode(4);
-        s.right = new TreeNode(5);
-        s.left.left = new TreeNode(1);
-        s.left.right = new TreeNode(2);
-
-        TreeNode t = new TreeNode(4);
-        t.left = new TreeNode(1);
-        t.right = new TreeNode(2);
-        expected = true;
-        actual = solution1.isSubtree(s, t);
-        assertEquals(expected, actual);
+        root = TreeUtils.constructBinaryTree(Arrays.asList(3, 4, 5, 1, 2, null, null, null, null, 0));
+        TreeUtils.printBinaryTree(root);
+        subRoot = TreeUtils.constructBinaryTree(Arrays.asList(4, 1, 2));
+        expected = false;
+        assertEquals(expected, solution1.isSubtree(root, subRoot));
+        assertEquals(expected, solution2.isSubtree(root, subRoot));
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ private boolean isSameTree(TreeNode p, TreeNode q) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static class Solution2 {`
`45`		`- public boolean isSubtree(TreeNode s, TreeNode t) {`
`46`		`- if (s == null) {`
	`45`	`+ public boolean isSubtree(TreeNode root, TreeNode subRoot) {`
	`46`	`+ if (root == null) {`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`		`- if (same(s, t)) {`
	`49`	`+ if (same(root, subRoot)) {`
`50`	`50`	`return true;`
`51`	`51`	`}`
`52`		`- return isSubtree(s.left, t) \|\| isSubtree(s.right, t);`
	`52`	`+ return isSubtree(root.left, subRoot) \|\| isSubtree(root.right, subRoot);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private boolean same(TreeNode s, TreeNode t) {`