|
|
|
@ -43,6 +43,8 @@
|
|
|
|
|
|
|
|
|
|
package org.eclipse.jgit.patch; |
|
|
|
|
|
|
|
|
|
import static java.nio.charset.StandardCharsets.ISO_8859_1; |
|
|
|
|
import static java.nio.charset.StandardCharsets.UTF_8; |
|
|
|
|
import static org.junit.Assert.assertEquals; |
|
|
|
|
import static org.junit.Assert.assertTrue; |
|
|
|
|
import static org.junit.Assert.fail; |
|
|
|
@ -58,7 +60,7 @@ import org.junit.Test;
|
|
|
|
|
public class GetTextTest { |
|
|
|
|
@Test |
|
|
|
|
public void testGetText_BothISO88591() throws IOException { |
|
|
|
|
final Charset cs = Charset.forName("ISO-8859-1"); |
|
|
|
|
final Charset cs = ISO_8859_1; |
|
|
|
|
final Patch p = parseTestPatchFile(); |
|
|
|
|
assertTrue(p.getErrors().isEmpty()); |
|
|
|
|
assertEquals(1, p.getFiles().size()); |
|
|
|
@ -69,7 +71,7 @@ public class GetTextTest {
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testGetText_NoBinary() throws IOException { |
|
|
|
|
final Charset cs = Charset.forName("ISO-8859-1"); |
|
|
|
|
final Charset cs = ISO_8859_1; |
|
|
|
|
final Patch p = parseTestPatchFile(); |
|
|
|
|
assertTrue(p.getErrors().isEmpty()); |
|
|
|
|
assertEquals(1, p.getFiles().size()); |
|
|
|
@ -80,8 +82,8 @@ public class GetTextTest {
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testGetText_Convert() throws IOException { |
|
|
|
|
final Charset csOld = Charset.forName("ISO-8859-1"); |
|
|
|
|
final Charset csNew = Charset.forName("UTF-8"); |
|
|
|
|
final Charset csOld = ISO_8859_1; |
|
|
|
|
final Charset csNew = UTF_8; |
|
|
|
|
final Patch p = parseTestPatchFile(); |
|
|
|
|
assertTrue(p.getErrors().isEmpty()); |
|
|
|
|
assertEquals(1, p.getFiles().size()); |
|
|
|
@ -100,8 +102,8 @@ public class GetTextTest {
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testGetText_DiffCc() throws IOException { |
|
|
|
|
final Charset csOld = Charset.forName("ISO-8859-1"); |
|
|
|
|
final Charset csNew = Charset.forName("UTF-8"); |
|
|
|
|
final Charset csOld = ISO_8859_1; |
|
|
|
|
final Charset csNew = UTF_8; |
|
|
|
|
final Patch p = parseTestPatchFile(); |
|
|
|
|
assertTrue(p.getErrors().isEmpty()); |
|
|
|
|
assertEquals(1, p.getFiles().size()); |
|
|
|
|