Update test data

Nikita Nazarov · nikita-nazarov · commit 560f48b70812 · 2022-08-04T01:18:14.000+03:00
diff --git a/test_data/outs/size.WithHeldObjects1.out b/test_data/outs/size.WithHeldObjects1.out
@@ -9,4 +9,5 @@ Held objects:
 Shallow size: 24, Retained size: 48
 Held objects:
 [common.TestTreeNode$Impl1: node 2]
-[common.TestTreeNode$Impl2: node 1]
+[common.TestTreeNode$Impl2: node 1]
+[[common.TestTreeNode$Impl2: node 1], [common.TestTreeNode$Impl3: node 3], [common.TestTreeNode$Impl1: node 5]] -> [48, 48, 72]
diff --git a/test_data/outs/size.WithHeldObjects2.out b/test_data/outs/size.WithHeldObjects2.out
@@ -6,7 +6,9 @@ Held objects:
 [common.TestTreeNode$Impl1: node 4]
 [common.TestTreeNode$Impl1: node 5]
 [common.TestTreeNode$Impl2: node 1]
+[[common.TestTreeNode$Impl2: node 1], [common.TestTreeNode$Impl3: node 6], [common.TestTreeNode$Impl1: node 5]] -> [120, 24, 24]
 Shallow size: 24, Retained size: 48
 Held objects:
 [common.TestTreeNode$Impl1: node 5]
 [common.TestTreeNode$Impl2: node 1]
+[[common.TestTreeNode$Impl2: node 1], [common.TestTreeNode$Impl3: node 6], [common.TestTreeNode$Impl1: node 5]] -> [48, 24, 24]
diff --git a/test_data/outs/size.WithHeldObjects3.out b/test_data/outs/size.WithHeldObjects3.out
@@ -6,6 +6,7 @@ Held objects:
 [common.TestTreeNode$Impl1: node 6]
 [common.TestTreeNode$Impl1: node 7]
 [common.TestTreeNode$Impl1: node 8]
+[[common.TestTreeNode$Impl1: node 1], [common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl3: node 5]] -> [120, 48, 24]
 Shallow size: 24, Retained size: 48
 Held objects:
 [common.TestTreeNode$Impl1: node 1]
@@ -17,9 +18,11 @@ Held objects:
 Shallow size: 24, Retained size: 24
 Held objects:
 [common.TestTreeNode$Impl3: node 5]
+[[common.TestTreeNode$Impl1: node 1], [common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl3: node 5]] -> [48, 48, 24]
 Shallow size: 24, Retained size: 96
 Held objects:
 [common.TestTreeNode$Impl1: node 6]
 [common.TestTreeNode$Impl1: node 7]
 [common.TestTreeNode$Impl1: node 8]
 [common.TestTreeNode$Impl3: node 5]
+[[common.TestTreeNode$Impl1: node 1], [common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl3: node 5]] -> [48, 48, 96]
diff --git a/test_data/outs/size.WithHeldObjects4.out b/test_data/outs/size.WithHeldObjects4.out
@@ -10,6 +10,8 @@ Held objects:
 [common.TestTreeNode$Impl1: node 8]
 [common.TestTreeNode$Impl1: node 9]
 [common.TestTreeNode$Impl2: node 3]
+[[common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl1: node 4], [common.TestTreeNode$Impl1: node 5], [common.TestTreeNode$Impl1: node 9], [common.TestTreeNode$Impl1: node 11]] -> [216, 24, 72, 72, 24]
+[[common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl3: node 1], [common.TestTreeNode$Impl4: node 2]] -> [216, 24, 24]
 Shallow size: 24, Retained size: 48
 Held objects:
 [common.TestTreeNode$Impl1: node 4]
@@ -20,10 +22,13 @@ Held objects:
 Shallow size: 24, Retained size: 24
 Held objects:
 [common.TestTreeNode$Impl4: node 2]
+[[common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl1: node 4], [common.TestTreeNode$Impl1: node 5], [common.TestTreeNode$Impl1: node 9], [common.TestTreeNode$Impl1: node 11]] -> [48, 24, 72, 24, 24]
+[[common.TestTreeNode$Impl2: node 3], [common.TestTreeNode$Impl3: node 1], [common.TestTreeNode$Impl4: node 2]] -> [48, 24, 24]
 Shallow size: 24, Retained size: 48
 Held objects:
 [common.TestTreeNode$Impl1: node 9]
 [common.TestTreeNode$Impl3: node 1]
+[[common.TestTreeNode$Impl3: node 1], [common.TestTreeNode$Impl4: node 2]] -> [48, 24]
 Shallow size: 24, Retained size: 168
 Held objects:
 [common.TestTreeNode$Impl1: node 10]
diff --git a/test_data/outs/size.WithHeldObjects5.out b/test_data/outs/size.WithHeldObjects5.out
@@ -9,6 +9,7 @@ Held objects:
 Shallow size: 24, Retained size: 24
 Held objects:
 [common.TestTreeNode$Impl2: node 1]
+[[common.TestTreeNode$Impl2: node 1], [common.TestTreeNode$Impl1: node 2], [common.TestTreeNode$Impl3: node 6]] -> [24, 72, 24]
 Shallow size: 24, Retained size: 144
 Held objects:
 [common.TestTreeNode$Impl1: node 2]
diff --git a/test_data/outs/size.many.ObjectsWithCommonSubtree.out b/test_data/outs/size.many.ObjectsWithCommonSubtree.out
diff --git a/test_data/outs32/size.many.ObjectsWithCommonSubtree.out b/test_data/outs32/size.many.ObjectsWithCommonSubtree.out
diff --git a/test_data/src/size/WithHeldObjects1.java b/test_data/src/size/WithHeldObjects1.java
@@ -18,5 +18,6 @@ public static void main(String[] args) {
         printSizeAndHeldObjects(root2);
         root3.left = root2.right;
         printSizeAndHeldObjects(root2);
+        printSizes(root2, root3, root2.right);
     }
 }
diff --git a/test_data/src/size/WithHeldObjects2.java b/test_data/src/size/WithHeldObjects2.java
@@ -9,7 +9,7 @@ public static void main(String[] args) {
                   2
                 /   \
                1 <-- 1
-             /   \
+             /  \\
             1 --> 1 <-- 3
         */
         TestTreeNode root2 = TestTreeNode.createTreeFromString("2 1 1 0 0 1 0 0 1 0 0");
@@ -18,8 +18,9 @@ public static void main(String[] args) {
         root2.left.left.right = root2.left.right;
         root2.left.right.left = root2.left;
         printSizeAndHeldObjects(root2);
+        printSizes(root2, root3, root2.right);
         root3.left = root2.left.right;
         printSizeAndHeldObjects(root2);
+        printSizes(root2, root3, root2.right);
     }
 }
-
diff --git a/test_data/src/size/WithHeldObjects3.java b/test_data/src/size/WithHeldObjects3.java
@@ -17,14 +17,17 @@ public static void main(String[] args) {
         TestTreeNode root3 = new TestTreeNode.Impl3();
         root1.right = TestTreeNode.createTreeFromString("1 1 0 0 1 0 0");
         printSizeAndHeldObjects(root1);
+        printSizes(root1, root2, root3);
         root2.left = root1.right;
         root3.left = root1.right;
         printSizeAndHeldObjects(root1);
         printSizeAndHeldObjects(root2);
         printSizeAndHeldObjects(root3);
+        printSizes(root1, root2, root3);
         root1.right = null;
         root2.left = null;
         printSizeAndHeldObjects(root3);
+        printSizes(root1, root2, root3);
     }
 }
 
diff --git a/test_data/src/size/WithHeldObjects4.java b/test_data/src/size/WithHeldObjects4.java
@@ -21,13 +21,18 @@ public static void main(String[] args) {
         root2.right.left.left = root2.left.right;
         root2.right.right.left = root2.right.left;
         printSizeAndHeldObjects(root2);
+        printSizes(root2, root2.left, root2.left.left, root2.right, root2.right.right);
+        printSizes(root2, root3, root4);
         root3.left = root2.right;
         root4.left = root2.right.right;
         printSizeAndHeldObjects(root2);
         printSizeAndHeldObjects(root3);
         printSizeAndHeldObjects(root4);
+        printSizes(root2, root2.left, root2.left.left, root2.right, root2.right.right);
+        printSizes(root2, root3, root4);
         root2 = null;
         printSizeAndHeldObjects(root3);
+        printSizes(root3, root4);
         root3 = null;
         printSizeAndHeldObjects(root4);
     }
diff --git a/test_data/src/size/WithHeldObjects5.java b/test_data/src/size/WithHeldObjects5.java
@@ -19,6 +19,7 @@ public static void main(String[] args) {
         root3.right = root2.right;
         root3.left = root2;
         printSizeAndHeldObjects(root2);
+        printSizes(root2, root2.left, root3);
         root2 = null;
         printSizeAndHeldObjects(root3);
     }
diff --git a/test_data/src/size/many/ObjectsWithCommonSubtree.java b/test_data/src/size/many/ObjectsWithCommonSubtree.java

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ public static void main(String[] args) {`
`18`	`18`	`printSizeAndHeldObjects(root2);`
`19`	`19`	`root3.left = root2.right;`
`20`	`20`	`printSizeAndHeldObjects(root2);`
	`21`	`+ printSizes(root2, root3, root2.right);`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public static void main(String[] args) {`
`9`	`9`	`2`
`10`	`10`	`/ \`
`11`	`11`	`1 <-- 1`
`12`		`- / \`
	`12`	`+ / \\`
`13`	`13`	`1 --> 1 <-- 3`
`14`	`14`	`*/`
`15`	`15`	`TestTreeNode root2 = TestTreeNode.createTreeFromString("2 1 1 0 0 1 0 0 1 0 0");`
`@@ -18,8 +18,9 @@ public static void main(String[] args) {`
`18`	`18`	`root2.left.left.right = root2.left.right;`
`19`	`19`	`root2.left.right.left = root2.left;`
`20`	`20`	`printSizeAndHeldObjects(root2);`
	`21`	`+ printSizes(root2, root3, root2.right);`
`21`	`22`	`root3.left = root2.left.right;`
`22`	`23`	`printSizeAndHeldObjects(root2);`
	`24`	`+ printSizes(root2, root3, root2.right);`
`23`	`25`	`}`
`24`	`26`	`}`
`25`		`-`