fix RedBlackTree

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/collections/sort/RedBlackTreeInteger.java

@@ -472,11 +472,13 @@ private Node<T> remove(Node<T> h, Node<T> node) {
                 return null;
             if (h.right == null || (!h.right.red && (h.right.left == null || !h.right.left.red)))
                 h = moveRedRight(h);
-            if (node.value == h.value) {
+            if (node.value == h.value && ObjectUtil.equalsOrNull(node.element, h.element)) {
                 Node<T> x = min(h.right);
                 h.value = x.value;
                 h.element = x.element;
                 h.right = removeMin(h.right, false);
+                if (h.right == null && last == x)
+                	last = h;
             } else {
             	h.right = remove(h.right, node);
             }

net.lecousin.core/src/main/java/net/lecousin/framework/collections/sort/RedBlackTreeLong.java

@@ -473,11 +473,13 @@ private Node<T> remove(Node<T> h, Node<T> node) {
                 return null;
             if (h.right == null || (!h.right.red && (h.right.left == null || !h.right.left.red)))
                 h = moveRedRight(h);
-            if (node.value == h.value) {
+            if (node.value == h.value && ObjectUtil.equalsOrNull(node.element, h.element)) {
                 Node<T> x = min(h.right);
                 h.value = x.value;
                 h.element = x.element;
                 h.right = removeMin(h.right, false);
+                if (h.right == null && last == x)
+                	last = h;
             } else {
             	h.right = remove(h.right, node);
             }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/collections/sort/TestRedBlackTreeInteger.java

@@ -199,13 +199,41 @@ public void testAddAndRemoveWithCommonValues() {
 		Assert.assertTrue(tree.contains(10, o3));
 		Assert.assertFalse(tree.contains(10, o4));
 
+		tree.add(10, o2);
+		Assert.assertEquals(3, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+		
 		tree.remove(getNode(tree, o1));
-		Assert.assertEquals(1, tree.size());
+		Assert.assertEquals(2, tree.size());
 		Assert.assertFalse(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+
+		tree.add(10, o1);
+		Assert.assertEquals(3, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+
+		tree.remove(getNode(tree, o2));
+		Assert.assertEquals(2, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
 		Assert.assertFalse(tree.contains(10, o2));
 		Assert.assertTrue(tree.contains(10, o3));
 		Assert.assertFalse(tree.contains(10, o4));
 
+		tree.remove(getNode(tree, o1));
+		Assert.assertEquals(1, tree.size());
+		Assert.assertFalse(tree.contains(10, o1));
+		Assert.assertFalse(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+		
 		tree.remove(getNode(tree, o3));
 		Assert.assertEquals(0, tree.size());
 	}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/collections/sort/TestRedBlackTreeLong.java

@@ -208,13 +208,41 @@ public void testAddAndRemoveWithCommonValues() {
 		Assert.assertTrue(tree.contains(10, o3));
 		Assert.assertFalse(tree.contains(10, o4));
 
+		tree.add(10, o2);
+		Assert.assertEquals(3, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+		
 		tree.remove(getNode(tree, o1));
-		Assert.assertEquals(1, tree.size());
+		Assert.assertEquals(2, tree.size());
 		Assert.assertFalse(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+
+		tree.add(10, o1);
+		Assert.assertEquals(3, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
+		Assert.assertTrue(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+
+		tree.remove(getNode(tree, o2));
+		Assert.assertEquals(2, tree.size());
+		Assert.assertTrue(tree.contains(10, o1));
 		Assert.assertFalse(tree.contains(10, o2));
 		Assert.assertTrue(tree.contains(10, o3));
 		Assert.assertFalse(tree.contains(10, o4));
 
+		tree.remove(getNode(tree, o1));
+		Assert.assertEquals(1, tree.size());
+		Assert.assertFalse(tree.contains(10, o1));
+		Assert.assertFalse(tree.contains(10, o2));
+		Assert.assertTrue(tree.contains(10, o3));
+		Assert.assertFalse(tree.contains(10, o4));
+		
 		tree.remove(getNode(tree, o3));
 		Assert.assertEquals(0, tree.size());
 	}