fix a couple of bugs in ArrayQueue (Collection constructor,

serialization)

2 files changed, 51 insertions, 3 deletions

diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/ArrayQueueTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/ArrayQueueTests.java
index 4fc931c934..0a3eeb1893 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/ArrayQueueTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/ArrayQueueTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2015 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,8 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.utility.tests.internal.collection;
 
+import java.util.ArrayList;
 import org.eclipse.jpt.common.utility.collection.Queue;
 import org.eclipse.jpt.common.utility.internal.collection.ArrayQueue;
+import org.eclipse.jpt.common.utility.tests.internal.TestTools;
 
 @SuppressWarnings("nls")
 public class ArrayQueueTests
@@ -25,6 +27,43 @@ public class ArrayQueueTests
 		return new ArrayQueue<String>();
 	}
 
+	public void testCollectionConstructor() {
+		ArrayList<String> c = new ArrayList<String>();
+		c.add("first");
+		c.add("second");
+		c.add("third");
+		c.add("fourth");
+		c.add("fifth");
+		c.add("sixth");
+		c.add("seventh");
+		c.add("eighth");
+		c.add("ninth");
+		c.add("tenth"); // force some free space
+		Queue<String> queue = new ArrayQueue<String>(c);
+
+		assertFalse(queue.isEmpty());
+		assertEquals("first", queue.peek());
+		queue.enqueue("eleventh");
+		queue.enqueue("twelfth");
+
+		assertEquals("first", queue.peek());
+		assertEquals("first", queue.dequeue());
+		assertEquals("second", queue.dequeue());
+		assertFalse(queue.isEmpty());
+		assertEquals("third", queue.peek());
+		assertEquals("third", queue.dequeue());
+		assertEquals("fourth", queue.dequeue());
+		assertEquals("fifth", queue.dequeue());
+		assertEquals("sixth", queue.dequeue());
+		assertEquals("seventh", queue.dequeue());
+		assertEquals("eighth", queue.dequeue());
+		assertEquals("ninth", queue.dequeue());
+		assertEquals("tenth", queue.dequeue());
+		assertEquals("eleventh", queue.dequeue());
+		assertEquals("twelfth", queue.dequeue());
+		assertTrue(queue.isEmpty());
+	}
+
 	public void testWrappedElements() {
 		Queue<String> queue = this.buildQueue();
 		assertTrue(queue.isEmpty());
@@ -140,4 +179,13 @@ public class ArrayQueueTests
 		assertEquals("fifteenth", queue.dequeue());
 		assertTrue(queue.isEmpty());
 	}
+
+	public void testSerialization_fullArray() throws Exception {
+		Queue<String> queue = new ArrayQueue<String>(3);
+		queue.enqueue("first");
+		queue.enqueue("second");
+		queue.enqueue("third");
+
+		this.verifyClone(queue, TestTools.serialize(queue));
+	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/QueueTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/QueueTests.java
index 2dc9f7cf47..9cd09a4f30 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/QueueTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/collection/QueueTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -129,7 +129,7 @@ public abstract class QueueTests
 		this.verifyClone(queue, TestTools.serialize(queue));
 	}
 
-	private void verifyClone(Queue<String> original, Queue<String> clone) {
+	protected void verifyClone(Queue<String> original, Queue<String> clone) {
 		assertNotSame(original, clone);
 		assertEquals(original.peek(), clone.peek());
 		assertEquals(original.dequeue(), clone.dequeue());