adjust region tests to different equality definitionv20051025-0800

2 files changed, 19 insertions, 8 deletions

diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
index 97cd2a7f400..2dc179925fc 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/ChangeRegionTest.java
@@ -91,28 +91,28 @@ public class ChangeRegionTest extends TestCase {
 		ChangeRegion r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		List before= RangeUtil.deepClone(r.getAdjustedRanges());
 		r.adjustTo(new Hunk(16, 3, 2));
-		assertEquals(before, r.getAdjustedRanges());
-		assertEquals(before.get(0), r.getAdjustedCoverage());
+		RangeUtil.assertEqualRanges(before, r.getAdjustedRanges());
+		RangeUtil.assertEqualRange((ILineRange) before.get(0), r.getAdjustedCoverage());
 		
 		r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		before= RangeUtil.deepClone(r.getAdjustedRanges());
 		r.adjustTo(new Hunk(16, -33, 2));
-		assertEquals(before, r.getAdjustedRanges());
-		assertEquals(before.get(0), r.getAdjustedCoverage());
+		RangeUtil.assertEqualRanges(before, r.getAdjustedRanges());
+		RangeUtil.assertEqualRange((ILineRange) before.get(0), r.getAdjustedCoverage());
 	}
 
 	public void testHunkRightAfter() throws Exception {
 		ChangeRegion r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		List before= RangeUtil.deepClone(r.getAdjustedRanges());
 		r.adjustTo(new Hunk(15, 3, 2));
-		assertEquals(before, r.getAdjustedRanges());
-		assertEquals(before.get(0), r.getAdjustedCoverage());
+		RangeUtil.assertEqualRanges(before, r.getAdjustedRanges());
+		RangeUtil.assertEqualRange((ILineRange) before.get(0), r.getAdjustedCoverage());
 		
 		r= new ChangeRegion(fRevision, new LineRange(12, 3));
 		before= RangeUtil.deepClone(r.getAdjustedRanges());
 		r.adjustTo(new Hunk(15, -3, 2));
-		assertEquals(before, r.getAdjustedRanges());
-		assertEquals(before.get(0), r.getAdjustedCoverage());
+		RangeUtil.assertEqualRanges(before, r.getAdjustedRanges());
+		RangeUtil.assertEqualRange((ILineRange) before.get(0), r.getAdjustedCoverage());
 	}
 	
 	public void testHunkBefore() throws Exception {
diff --git a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeUtil.java b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeUtil.java
index fc32559527f..f04f7f7c2b6 100644
--- a/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeUtil.java
+++ b/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/revisions/RangeUtil.java
@@ -47,4 +47,15 @@ class RangeUtil extends Assert {
 		assertEquals(1, actual.size());
 		RangeUtil.assertEqualRange(expected, (ILineRange) actual.get(0));
 	}
+
+	static void assertEqualRanges(List expected, List actual) {
+		assertEquals(expected.size(), actual.size());
+		Iterator it1= expected.iterator();
+		Iterator it2= actual.iterator();
+		while (it1.hasNext()) {
+			ILineRange r1= (ILineRange) it1.next();
+			ILineRange r2= (ILineRange) it2.next();
+			assertEqualRange(r1, r2);
+		}
+	}
 }