Bug 558781 - TextPresentation iterator catches wrong exception

Change-Id: Ie50c2216c58656079ad00fd8938d03818e5a385b
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>

1 files changed, 25 insertions, 0 deletions

diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java
index 41289bb46f2..8e70ca0c028 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/TextPresentationTest.java
@@ -16,10 +16,12 @@ package org.eclipse.jface.text.tests;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 import org.junit.After;
 import org.junit.Before;
@@ -1250,6 +1252,29 @@ public class TextPresentationTest {
 			shell.dispose();
 		}
 	}
+	
+	@Test
+	public void testIterator() {
+		// Test read over iterator end
+		Iterator<StyleRange> e= fTextPresentation.getAllStyleRangeIterator();
+		try {
+			for (int i= 0; i < 1000; i++) {
+				e.next();
+			}
+			fail("Iterator has no end.");
+		} catch (NoSuchElementException ex) {
+			// expected
+		}
+		e= fTextPresentation.getNonDefaultStyleRangeIterator();
+		try {
+			for (int i= 0; i < 1000; i++) {
+				e.next();
+			}
+			fail("Iterator has no end.");
+		} catch (NoSuchElementException ex) {
+			// expected
+		}
+	}
 
 	// helper method required as long as TextPresentation methods manipulate given arguments
 	private static StyleRange[] deepClone(StyleRange[] original) {