combined port of bug fixes for 192477, 202684, 202811, and 202959 - adding artifact edit functionality

1 files changed, 18 insertions, 0 deletions

diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/CollectionToolsTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/CollectionToolsTests.java
index 7bd0a7d3f8..4f1d9494af 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/CollectionToolsTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/CollectionToolsTests.java
@@ -29,6 +29,7 @@ import org.eclipse.jpt.utility.internal.HashBag;
 import org.eclipse.jpt.utility.internal.Range;
 import org.eclipse.jpt.utility.internal.ReverseComparator;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
+import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
 
 public class CollectionToolsTests extends TestCase {
 
@@ -1249,6 +1250,23 @@ public class CollectionToolsTests extends TestCase {
 		assertEquals(6, CollectionTools.insertionIndexOf(a, "A", c));
 	}
 
+	public void testIterableIterator() {
+		Iterator<Object> emptyIterator = EmptyIterator.instance();
+		Iterable<Object> emptyIterable = CollectionTools.iterable(emptyIterator);
+		
+		assertEquals(emptyIterator, emptyIterable.iterator());
+		
+		boolean exceptionThrown = false;
+		try {
+			emptyIterable.iterator();
+		}
+		catch (IllegalStateException ise) {
+			exceptionThrown = true;
+		}
+		assertTrue("IllegalStateException not thrown.", exceptionThrown);
+		
+	}
+
 	public void testIterableObjectArray() {
 		String[] strings = this.buildStringArray1();
 		int i = 0;