diff options
| author | Andre Weinand | 2004-04-19 17:33:28 +0000 |
|---|---|---|
| committer | Andre Weinand | 2004-04-19 17:33:28 +0000 |
| commit | 190b45ceec65a7971686966ab12e7df31f4e1d87 (patch) | |
| tree | 122886a2053eca4e97f146d0a0996c5448c8a951 /tests/org.eclipse.compare.tests | |
| parent | ce86164934d392b2ec8efed0318cc2d4d4aa6207 (diff) | |
| download | eclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.tar.gz eclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.tar.xz eclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.zip | |
more work on #54091
Diffstat (limited to 'tests/org.eclipse.compare.tests')
| -rw-r--r-- | tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java b/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java index 94b661ae1..3e3884e09 100644 --- a/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java +++ b/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java @@ -14,7 +14,7 @@ import java.io.UnsupportedEncodingException; import junit.framework.TestCase; import org.eclipse.compare.IStreamMerger; -import org.eclipse.compare.internal.merge.TextMerger; +import org.eclipse.compare.internal.merge.TextStreamMerger; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -138,7 +138,7 @@ public class StreamMergerTest extends TestCase { ByteArrayOutputStream os= new ByteArrayOutputStream(); - IStreamMerger merger= new TextMerger(); + IStreamMerger merger= new TextStreamMerger(); IStatus status= merger.merge(os, encoding, ancestor, encoding, target, encoding, other, encoding, (IProgressMonitor)null); output.append(new String(os.toByteArray(), encoding)); |