diff options
| author | Szymon Brandys | 2009-03-04 15:45:42 +0000 |
|---|---|---|
| committer | Szymon Brandys | 2009-03-04 15:45:42 +0000 |
| commit | e6467254256b516d676c269500b0f9881a8acd44 (patch) | |
| tree | 7a9e395ef7025ccaaf40dcf7c06f6ad6286a179e /tests | |
| parent | 3e8e9d75895a0532ce6d765b140f68480b38cca4 (diff) | |
| download | eclipse.platform.team-e6467254256b516d676c269500b0f9881a8acd44.tar.gz eclipse.platform.team-e6467254256b516d676c269500b0f9881a8acd44.tar.xz eclipse.platform.team-e6467254256b516d676c269500b0f9881a8acd44.zip | |
Bug 267020 - [Apply Patch] Rename FileDiffWrapper to FilePatch and FileDiff to FilePatch2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java | 4 | ||||
| -rw-r--r-- | tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java index aba379831..e0d2db849 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/FileDiffResultTest.java @@ -18,7 +18,7 @@ import java.io.InputStream; import java.util.ArrayList; import org.eclipse.compare.internal.Utilities; -import org.eclipse.compare.internal.core.patch.FileDiff; +import org.eclipse.compare.internal.core.patch.FilePatch2; import org.eclipse.compare.internal.core.patch.FileDiffResult; import org.eclipse.compare.internal.core.patch.Hunk; import org.eclipse.compare.internal.patch.Patcher; @@ -216,7 +216,7 @@ public class FileDiffResultTest extends WorkspaceTest { /** * A mock FileDiff class. */ - private class MyFileDiff extends FileDiff { + private class MyFileDiff extends FilePatch2 { protected MyFileDiff() { super(null, 0, null, 0); add(Hunk.createHunk(this, new int[] { 0, 0 }, new int[] { 0, 0 }, diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java index db17b2189..615df7752 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java @@ -36,7 +36,7 @@ import junit.framework.Assert; import junit.framework.AssertionFailedError; import junit.framework.TestCase; -import org.eclipse.compare.internal.core.patch.FileDiff; +import org.eclipse.compare.internal.core.patch.FilePatch2; import org.eclipse.compare.internal.core.patch.FileDiffResult; import org.eclipse.compare.internal.core.patch.LineReader; import org.eclipse.compare.internal.patch.WorkspacePatcher; @@ -456,7 +456,7 @@ public class PatchTest extends TestCase { e.printStackTrace(); } - FileDiff[] diffs= patcher.getDiffs(); + FilePatch2[] diffs= patcher.getDiffs(); Assert.assertEquals(diffs.length, 1); FileDiffResult diffResult = patcher.getDiffResult(diffs[0]); @@ -513,7 +513,7 @@ public class PatchTest extends TestCase { } //Sort the diffs by project - FileDiff[] diffs= patcher.getDiffs(); + FilePatch2[] diffs= patcher.getDiffs(); //Iterate through all of the original files, apply the diffs that belong to the file and compare //with the corresponding outcome file |