From 54c9660145bf63094590e7c4c3266100f7ab7037 Mon Sep 17 00:00:00 2001
From: Speiger <speiger@gmx.net>
Date: Wed, 6 Oct 2021 20:23:40 +0200
Subject: [PATCH] New Tests & BugFixes

-Added: Tests for the Copying of Collections.
-Fixed: PriorityQueues didn't have hashCode/equals/toString implemented
---
 .../speiger/src/builder/GlobalVariables.java  |  1 +
 .../builder/PrimitiveCollectionsBuilder.java  |  1 +
 .../queues/AbstractPriorityQueue.template     | 46 +++++++++++++++++++
 .../templates/queues/ArrayFIFOQueue.template  |  2 +-
 .../queues/ArrayPriorityQueue.template        |  2 +-
 .../queues/HeapPriorityQueue.template         |  2 +-
 .../sets/LinkedOpenCustomHashSet.template     |  1 +
 .../templates/sets/LinkedOpenHashSet.template |  1 +
 .../ints/base/BaseInt2IntMapTest.java         | 10 ++++
 .../ints/base/BaseIntCollectionTest.java      |  9 ++++
 .../ints/base/BaseIntPriorityQueueTest.java   |  9 ++++
 .../src/collections/tests/CollectionTest.java |  3 +-
 .../src/collections/tests/MapTests.java       |  3 +-
 .../collections/tests/PriorityQueueTest.java  |  1 +
 14 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 src/builder/resources/speiger/assets/collections/templates/queues/AbstractPriorityQueue.template

diff --git a/src/builder/java/speiger/src/builder/GlobalVariables.java b/src/builder/java/speiger/src/builder/GlobalVariables.java
index 80e14ae3..40e69571 100644
--- a/src/builder/java/speiger/src/builder/GlobalVariables.java
+++ b/src/builder/java/speiger/src/builder/GlobalVariables.java
@@ -184,6 +184,7 @@ public class GlobalVariables
 		
 		//Abstract Classes
 		addAbstractMapper("ABSTRACT_COLLECTION", "Abstract%sCollection");
+		addAbstractMapper("ABSTRACT_PRIORITY_QUEUE", "Abstract%sPriorityQueue");
 		addAbstractMapper("ABSTRACT_SET", "Abstract%sSet");
 		addAbstractMapper("ABSTRACT_LIST", "Abstract%sList");
 		addAbstractBiMapper("ABSTRACT_MAP", "Abstract%sMap", "2");
diff --git a/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java b/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
index 59c56762..20d60088 100644
--- a/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
+++ b/src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java
@@ -78,6 +78,7 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 		nameRemapper.put("IArray", "I%sArray");
 		nameRemapper.put("AbstractMap", "Abstract%sMap");
 		nameRemapper.put("AbstractCollection", "Abstract%sCollection");
+		nameRemapper.put("AbstractPriorityQueue", "Abstract%sPriorityQueue");
 		nameRemapper.put("AbstractSet", "Abstract%sSet");
 		nameRemapper.put("AbstractList", "Abstract%sList");
 		nameRemapper.put("EnumMap", "Enum2%sMap");
diff --git a/src/builder/resources/speiger/assets/collections/templates/queues/AbstractPriorityQueue.template b/src/builder/resources/speiger/assets/collections/templates/queues/AbstractPriorityQueue.template
new file mode 100644
index 00000000..3667f7b2
--- /dev/null
+++ b/src/builder/resources/speiger/assets/collections/templates/queues/AbstractPriorityQueue.template
@@ -0,0 +1,46 @@
+package speiger.src.collections.PACKAGE.queues;
+
+#if TYPE_OBJECT
+import java.util.Objects;
+#endif
+import java.util.StringJoiner;
+
+/**
+ * Helper class that implements all the essential methods for the PriorityQueues
+ * @Type(T)
+ */
+public abstract class ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
+{
+	@Override
+	public boolean equals(Object obj) {
+		if(obj instanceof PRIORITY_QUEUE) {
+			PRIORITY_QUEUE KEY_GENERIC_TYPE queue = (PRIORITY_QUEUE KEY_GENERIC_TYPE)obj;
+			if(queue.size() != size()) return false;
+			for(int i = 0,m=size();i<m;i++) {
+				if(KEY_EQUALS_NOT(queue.peek(i), peek(i))) return false;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+        int result = 1;
+        for (int i = 0,m=size();i<m;i++) {
+            result = 31 * result + KEY_TO_HASH(peek(i));
+        }
+		return result;
+	}
+	
+	@Override
+	public String toString()
+	{
+		if(isEmpty()) return "[]";
+		StringJoiner joiner = new StringJoiner(", ", "[", "]");
+        for (int i = 0,m=size();i<m;i++) {
+        	joiner.add(KEY_TO_STRING(peek(i)));
+        }
+        return joiner.toString();
+	}
+}
diff --git a/src/builder/resources/speiger/assets/collections/templates/queues/ArrayFIFOQueue.template b/src/builder/resources/speiger/assets/collections/templates/queues/ArrayFIFOQueue.template
index ba0a607f..d6fbd980 100644
--- a/src/builder/resources/speiger/assets/collections/templates/queues/ArrayFIFOQueue.template
+++ b/src/builder/resources/speiger/assets/collections/templates/queues/ArrayFIFOQueue.template
@@ -22,7 +22,7 @@ import speiger.src.collections.utils.ITrimmable;
  * Its specific implementation uses a backing array that grows and shrinks as it is needed.
  * @Type(T)
  */
-public class ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE implements PRIORITY_DEQUEUE KEY_GENERIC_TYPE, ITrimmable
+public class ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_DEQUEUE KEY_GENERIC_TYPE, ITrimmable
 {
 	/** Max Possible ArraySize without the JVM Crashing */
 	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
diff --git a/src/builder/resources/speiger/assets/collections/templates/queues/ArrayPriorityQueue.template b/src/builder/resources/speiger/assets/collections/templates/queues/ArrayPriorityQueue.template
index b0326fca..852bd979 100644
--- a/src/builder/resources/speiger/assets/collections/templates/queues/ArrayPriorityQueue.template
+++ b/src/builder/resources/speiger/assets/collections/templates/queues/ArrayPriorityQueue.template
@@ -24,7 +24,7 @@ import speiger.src.collections.PACKAGE.utils.ARRAYS;
  * It is highly suggested to use HeapPriorityQueue otherwise, unless you know why you need this specific implementation
  * @Type(T)
  */
-public class ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
+public class ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE
 {
 	/** The Backing Array */
 	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
diff --git a/src/builder/resources/speiger/assets/collections/templates/queues/HeapPriorityQueue.template b/src/builder/resources/speiger/assets/collections/templates/queues/HeapPriorityQueue.template
index 662195c7..4bbe9f61 100644
--- a/src/builder/resources/speiger/assets/collections/templates/queues/HeapPriorityQueue.template
+++ b/src/builder/resources/speiger/assets/collections/templates/queues/HeapPriorityQueue.template
@@ -23,7 +23,7 @@ import speiger.src.collections.PACKAGE.utils.ARRAYS;
  * It is a ArrayBased Alternative to TreeSets that has less object allocations
  * @Type(T)
  */
-public class HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
+public class HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE
 {
 	/** The Backing Array */
 	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
diff --git a/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenCustomHashSet.template b/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenCustomHashSet.template
index 5a2f5406..add03e96 100644
--- a/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenCustomHashSet.template
+++ b/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenCustomHashSet.template
@@ -620,6 +620,7 @@ public class LINKED_CUSTOM_HASH_SET KEY_GENERIC_TYPE extends CUSTOM_HASH_SET KEY
 		set.containsNull = containsNull;
 		set.size = size;
 		set.keys = Arrays.copyOf(keys, keys.length);
+		set.links = Arrays.copyOf(links, links.length);
 		set.firstIndex = firstIndex;
 		set.lastIndex = lastIndex;
 		return set;
diff --git a/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenHashSet.template b/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenHashSet.template
index b1a7bb4e..4c4ccb7b 100644
--- a/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenHashSet.template
+++ b/src/builder/resources/speiger/assets/collections/templates/sets/LinkedOpenHashSet.template
@@ -591,6 +591,7 @@ public class LINKED_HASH_SET KEY_GENERIC_TYPE extends HASH_SET KEY_GENERIC_TYPE
 		set.containsNull = containsNull;
 		set.size = size;
 		set.keys = Arrays.copyOf(keys, keys.length);
+		set.links = Arrays.copyOf(links, links.length);
 		set.firstIndex = firstIndex;
 		set.lastIndex = lastIndex;
 		return set;
diff --git a/src/test/java/speiger/src/collections/ints/base/BaseInt2IntMapTest.java b/src/test/java/speiger/src/collections/ints/base/BaseInt2IntMapTest.java
index 09729e2b..df9bc64c 100644
--- a/src/test/java/speiger/src/collections/ints/base/BaseInt2IntMapTest.java
+++ b/src/test/java/speiger/src/collections/ints/base/BaseInt2IntMapTest.java
@@ -135,6 +135,16 @@ public abstract class BaseInt2IntMapTest
 		Assert.assertTrue(map.remove(PUT_VALUE_ARRAY[51], PUT_ARRAY[51]));
 	}
 	
+	@Test
+	public void testSort()
+	{
+		if(!getValidMapTests().contains(MapTests.COPY)) return;
+		Int2IntMap map = createMap(TEST_ARRAY, TEST_ARRAY);
+		Int2IntMap copy = map.copy();
+		Assert.assertFalse(map == copy);
+		Assert.assertEquals(map, copy);
+	}
+	
 	public static class Strategy implements IntStrategy
 	{
 		@Override
diff --git a/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java b/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
index a64232df..c9f0cc97 100644
--- a/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
+++ b/src/test/java/speiger/src/collections/ints/base/BaseIntCollectionTest.java
@@ -178,4 +178,13 @@ public abstract class BaseIntCollectionTest extends BaseIntIterableTest
 		Assert.assertEquals(base, IntCollections.synchronize(collection).toString());
 		Assert.assertEquals(base, IntCollections.unmodifiable(collection).toString());
 	}
+	
+	@Test
+	public void testCopy() {
+		if(!getValidCollectionTests().contains(CollectionTest.COPY)) return;
+		IntCollection collection = create(BULK_ADD_ARRAY);
+		IntCollection copy = collection.copy();
+		Assert.assertFalse(collection == copy);
+		Assert.assertEquals(collection, copy);
+	}
 }
\ No newline at end of file
diff --git a/src/test/java/speiger/src/collections/ints/base/BaseIntPriorityQueueTest.java b/src/test/java/speiger/src/collections/ints/base/BaseIntPriorityQueueTest.java
index fb6ed973..ec65be31 100644
--- a/src/test/java/speiger/src/collections/ints/base/BaseIntPriorityQueueTest.java
+++ b/src/test/java/speiger/src/collections/ints/base/BaseIntPriorityQueueTest.java
@@ -120,4 +120,13 @@ public abstract class BaseIntPriorityQueueTest extends BaseIntIterableTest
 			}
 		}
 	}
+	
+	@Test
+	public void testCopy() {
+		if(!getValidPriorityQueueTests().contains(PriorityQueueTest.COPY)) return;
+		IntPriorityQueue queue = create(TEST_ARRAY);
+		IntPriorityQueue copy = queue.copy();
+		Assert.assertFalse(queue == copy);
+		Assert.assertEquals(queue, copy);
+	}
 }
diff --git a/src/test/java/speiger/src/collections/tests/CollectionTest.java b/src/test/java/speiger/src/collections/tests/CollectionTest.java
index aa128f25..6d1a4af2 100644
--- a/src/test/java/speiger/src/collections/tests/CollectionTest.java
+++ b/src/test/java/speiger/src/collections/tests/CollectionTest.java
@@ -15,5 +15,6 @@ public enum CollectionTest
 	TO_ARRAY,
 	CLEAR,
 	WRAPPER,
-	TO_STRING;
+	TO_STRING,
+	COPY;
 }
diff --git a/src/test/java/speiger/src/collections/tests/MapTests.java b/src/test/java/speiger/src/collections/tests/MapTests.java
index ca397e4d..72d5e60c 100644
--- a/src/test/java/speiger/src/collections/tests/MapTests.java
+++ b/src/test/java/speiger/src/collections/tests/MapTests.java
@@ -11,5 +11,6 @@ public enum MapTests
 	MERGE,
 	GET,
 	ITERATORS,
-	REMOVE;
+	REMOVE,
+	COPY;
 }
diff --git a/src/test/java/speiger/src/collections/tests/PriorityQueueTest.java b/src/test/java/speiger/src/collections/tests/PriorityQueueTest.java
index db894828..963c2e0d 100644
--- a/src/test/java/speiger/src/collections/tests/PriorityQueueTest.java
+++ b/src/test/java/speiger/src/collections/tests/PriorityQueueTest.java
@@ -7,4 +7,5 @@ public enum PriorityQueueTest
 	PEEK,
 	REMOVE,
 	TO_ARRAY,
+	COPY;
 }
\ No newline at end of file