diff options
Diffstat (limited to 'tests/org.eclipse.compare.tests/src/org/eclipse')
4 files changed, 16 insertions, 21 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java index 8afde80d0..50123fb89 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/DocLineComparatorTest.java @@ -261,13 +261,12 @@ public class DocLineComparatorTest extends TestCase { IRangeComparator l, r; for (int i=0;i<docs.length;i++) for (int j=i+1;j<docs.length;j++) - for (int k=0;k<filters.length;k++) { - l = new DocLineComparator(docs[i], null, false, filters[k], 'L'); - r = new DocLineComparator(docs[j], null, false, filters[k], 'R'); + for (ICompareFilter[] filter : filters) { + l = new DocLineComparator(docs[i], null, false, filter, 'L'); + r = new DocLineComparator(docs[j], null, false, filter, 'R'); Assert.assertFalse(l.rangesEqual(0, r, 0)); - - l = new DocLineComparator(docs[i], null, true, filters[k], 'L'); - r = new DocLineComparator(docs[j], null, true, filters[k], 'R'); + l = new DocLineComparator(docs[i], null, true, filter, 'L'); + r = new DocLineComparator(docs[j], null, true, filter, 'R'); Assert.assertTrue(l.rangesEqual(0, r, 0)); } } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java index 3dea82a77..2f08d7731 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchLinesTest.java @@ -113,11 +113,9 @@ public class PatchLinesTest extends TestCase { int fileDiffSum = 0; FilePatch2[] diffs = patcher.getDiffs(); - for (int i = 0; i < diffs.length; i++) { - FilePatch2 fileDiff = diffs[i]; + for (FilePatch2 fileDiff : diffs) { IHunk[] hunks = fileDiff.getHunks(); - for (int j = 0; j < hunks.length; j++) { - IHunk hunk = hunks[j]; + for (IHunk hunk : hunks) { hunksLengthSum += getNewLength(hunk); hunksLengthSum -= getOldLength(hunk); } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java index 3f0a4de80..09b049059 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StructureCreatorTest.java @@ -168,17 +168,14 @@ public class StructureCreatorTest extends TestCase { DocumentRangeNode l, r; for (int i = 0; i < docs.length; i++) for (int j = i + 1; j < docs.length; j++) - for (int k = 0; k < filters.length; k++) { - + for (ICompareFilter[] filter : filters) { l = new DocumentRangeNode(1, "ID", docs[i], 0, docs[i].getLength()); r = new DocumentRangeNode(1, "ID", docs[j], 0, docs[j].getLength()); - creator.contentsEquals(l, 'L', r, 'R', true, filters[k]); - Assert.assertFalse(creator.contentsEquals(l, 'L', r, 'R', - false, filters[k])); - Assert.assertTrue(creator.contentsEquals(l, 'L', r, 'R', - true, filters[k])); - } + creator.contentsEquals(l, 'L', r, 'R', true, filter); + Assert.assertFalse(creator.contentsEquals(l, 'L', r, 'R', false, filter)); + Assert.assertTrue(creator.contentsEquals(l, 'L', r, 'R', true, filter)); + } } }
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 0452e6085..8b5f16e11 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -99,9 +99,10 @@ public class WorkspaceTest extends ResourceTest { resources.addAll(Arrays.asList(buildResources(container, hierarchy))); IResource[] result = resources.toArray(new IResource[resources.size()]); ensureExistsInWorkspace(result, true); - for (int i = 0; i < result.length; i++) { - if (result[i].getType() == IResource.FILE) // 3786 bytes is the average size of Eclipse Java files! - ((IFile) result[i]).setContents(getRandomContents(100), true, false, null); + for (IResource r : result) { + if (r.getType() == IResource.FILE) { + ((IFile) r).setContents(getRandomContents(100), true, false, null); + } } return result; } |