Merge branch 'master' into #6336/enhancement/ComparisionLogicStandardization

Author: DenizAltunkapan

src/main/java/com/thealgorithms/sorts/SimpleSort.java

@@ -6,7 +6,10 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.thealgorithms.datastructures.bags.Bag;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 import org.junit.jupiter.api.Test;
 
 class BagTest {
@@ -156,4 +159,116 @@ void testIteratorWithDuplicates() {
         }
         assertEquals(3, count, "Iterator should traverse all 3 items including duplicates");
     }
+
+    @Test
+    void testCollectionElements() {
+        Bag<List<String>> bag = new Bag<>();
+        List<String> list1 = new ArrayList<>();
+        list1.add("a");
+        list1.add("b");
+
+        List<String> list2 = new ArrayList<>();
+        list2.add("c");
+
+        List<String> emptyList = new ArrayList<>();
+
+        bag.add(list1);
+        bag.add(list2);
+        bag.add(emptyList);
+        bag.add(list1); // Duplicate
+
+        assertEquals(4, bag.size(), "Bag should contain 4 list elements");
+        assertTrue(bag.contains(list1), "Bag should contain list1");
+        assertTrue(bag.contains(list2), "Bag should contain list2");
+        assertTrue(bag.contains(emptyList), "Bag should contain empty list");
+    }
+
+    @Test
+    void testIteratorConsistency() {
+        Bag<String> bag = new Bag<>();
+        bag.add("first");
+        bag.add("second");
+        bag.add("third");
+
+        // Multiple iterations should return same elements
+        List<String> firstIteration = new ArrayList<>();
+        for (String item : bag) {
+            firstIteration.add(item);
+        }
+
+        List<String> secondIteration = new ArrayList<>();
+        for (String item : bag) {
+            secondIteration.add(item);
+        }
+
+        assertEquals(firstIteration.size(), secondIteration.size(), "Both iterations should have same size");
+        assertEquals(3, firstIteration.size(), "First iteration should have 3 elements");
+        assertEquals(3, secondIteration.size(), "Second iteration should have 3 elements");
+    }
+
+    @Test
+    void testMultipleIterators() {
+        Bag<String> bag = new Bag<>();
+        bag.add("item1");
+        bag.add("item2");
+
+        Iterator<String> iter1 = bag.iterator();
+        Iterator<String> iter2 = bag.iterator();
+
+        assertTrue(iter1.hasNext(), "First iterator should have next element");
+        assertTrue(iter2.hasNext(), "Second iterator should have next element");
+
+        String first1 = iter1.next();
+        String first2 = iter2.next();
+
+        org.junit.jupiter.api.Assertions.assertNotNull(first1, "First iterator should return non-null element");
+        org.junit.jupiter.api.Assertions.assertNotNull(first2, "Second iterator should return non-null element");
+    }
+
+    @Test
+    void testIteratorHasNextConsistency() {
+        Bag<String> bag = new Bag<>();
+        bag.add("single");
+
+        Iterator<String> iter = bag.iterator();
+        assertTrue(iter.hasNext(), "hasNext should return true");
+        assertTrue(iter.hasNext(), "hasNext should still return true after multiple calls");
+
+        String item = iter.next();
+        assertEquals("single", item, "Next should return the single item");
+
+        assertFalse(iter.hasNext(), "hasNext should return false after consuming element");
+        assertFalse(iter.hasNext(), "hasNext should still return false");
+    }
+
+    @Test
+    void testIteratorNextOnEmptyBag() {
+        Bag<String> bag = new Bag<>();
+        Iterator<String> iter = bag.iterator();
+
+        assertFalse(iter.hasNext(), "hasNext should return false for empty bag");
+        assertThrows(NoSuchElementException.class, iter::next, "next() should throw NoSuchElementException on empty bag");
+    }
+
+    @Test
+    void testBagOrderIndependence() {
+        Bag<String> bag1 = new Bag<>();
+        Bag<String> bag2 = new Bag<>();
+
+        // Add same elements in different order
+        bag1.add("first");
+        bag1.add("second");
+        bag1.add("third");
+
+        bag2.add("third");
+        bag2.add("first");
+        bag2.add("second");
+
+        assertEquals(bag1.size(), bag2.size(), "Bags should have same size");
+
+        // Both bags should contain all elements
+        assertTrue(bag1.contains("first") && bag2.contains("first"));
+        assertTrue(bag1.contains("second") && bag2.contains("second"));
+        assertTrue(bag1.contains("third") && bag2.contains("third"));
+    }
 }

src/test/java/com/thealgorithms/datastructures/bag/BagTest.java

@@ -122,4 +122,109 @@ public void testPathCompression() {
         assertEquals(root, node1);
         assertEquals(node1, node3.parent);
     }
+
+    @Test
+    public void testUnionByRankSmallerToLarger() {
+        DisjointSetUnion<Integer> dsu = new DisjointSetUnion<>();
+        Node<Integer> node1 = dsu.makeSet(1);
+        Node<Integer> node2 = dsu.makeSet(2);
+        Node<Integer> node3 = dsu.makeSet(3);
+
+        // Create tree with node1 as root and rank 1
+        dsu.unionSets(node1, node2);
+        assertEquals(1, node1.rank);
+        assertEquals(0, node2.rank);
+
+        // Union single node (rank 0) with tree (rank 1)
+        // Smaller rank tree should attach to larger rank tree
+        dsu.unionSets(node3, node1);
+        assertEquals(node1, dsu.findSet(node3));
+        assertEquals(1, node1.rank); // Rank should not increase
+    }
+
+    @Test
+    public void testUnionByRankEqualRanks() {
+        DisjointSetUnion<Integer> dsu = new DisjointSetUnion<>();
+        Node<Integer> node1 = dsu.makeSet(1);
+        Node<Integer> node2 = dsu.makeSet(2);
+        Node<Integer> node3 = dsu.makeSet(3);
+        Node<Integer> node4 = dsu.makeSet(4);
+
+        // Create two trees of equal rank (1)
+        dsu.unionSets(node1, node2);
+        dsu.unionSets(node3, node4);
+        assertEquals(1, node1.rank);
+        assertEquals(1, node3.rank);
+
+        // Union two trees of equal rank
+        dsu.unionSets(node1, node3);
+        Node<Integer> root = dsu.findSet(node1);
+        assertEquals(2, root.rank); // Rank should increase by 1
+    }
+
+    @Test
+    public void testLargeChainPathCompression() {
+        DisjointSetUnion<Integer> dsu = new DisjointSetUnion<>();
+        Node<Integer> node1 = dsu.makeSet(1);
+        Node<Integer> node2 = dsu.makeSet(2);
+        Node<Integer> node3 = dsu.makeSet(3);
+        Node<Integer> node4 = dsu.makeSet(4);
+        Node<Integer> node5 = dsu.makeSet(5);
+
+        // Create a long chain: 1 -> 2 -> 3 -> 4 -> 5
+        dsu.unionSets(node1, node2);
+        dsu.unionSets(node2, node3);
+        dsu.unionSets(node3, node4);
+        dsu.unionSets(node4, node5);
+
+        // Find from the deepest node
+        Node<Integer> root = dsu.findSet(node5);
+
+        // Path compression should make all nodes point directly to root
+        assertEquals(root, node5.parent);
+        assertEquals(root, node4.parent);
+        assertEquals(root, node3.parent);
+        assertEquals(root, node2.parent);
+        assertEquals(root, node1.parent);
+    }
+
+    @Test
+    public void testMultipleDisjointSets() {
+        DisjointSetUnion<Integer> dsu = new DisjointSetUnion<>();
+        Node<Integer> node1 = dsu.makeSet(1);
+        Node<Integer> node2 = dsu.makeSet(2);
+        Node<Integer> node3 = dsu.makeSet(3);
+        Node<Integer> node4 = dsu.makeSet(4);
+        Node<Integer> node5 = dsu.makeSet(5);
+        Node<Integer> node6 = dsu.makeSet(6);
+
+        // Create two separate components
+        dsu.unionSets(node1, node2);
+        dsu.unionSets(node2, node3);
+
+        dsu.unionSets(node4, node5);
+        dsu.unionSets(node5, node6);
+
+        // Verify they are separate
+        assertEquals(dsu.findSet(node1), dsu.findSet(node2));
+        assertEquals(dsu.findSet(node2), dsu.findSet(node3));
+        assertEquals(dsu.findSet(node4), dsu.findSet(node5));
+        assertEquals(dsu.findSet(node5), dsu.findSet(node6));
+
+        assertNotEquals(dsu.findSet(node1), dsu.findSet(node4));
+        assertNotEquals(dsu.findSet(node3), dsu.findSet(node6));
+    }
+
+    @Test
+    public void testEmptyValues() {
+        DisjointSetUnion<String> dsu = new DisjointSetUnion<>();
+        Node<String> emptyNode = dsu.makeSet("");
+        Node<String> nullNode = dsu.makeSet(null);
+
+        assertEquals(emptyNode, dsu.findSet(emptyNode));
+        assertEquals(nullNode, dsu.findSet(nullNode));
+
+        dsu.unionSets(emptyNode, nullNode);
+        assertEquals(dsu.findSet(emptyNode), dsu.findSet(nullNode));
+    }
 }