Browse Source

JDK 1.1 doesn't grok UTF16 8-(

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270122 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
e8f24b5abb
2 changed files with 7 additions and 1 deletions
  1. +2
    -1
      build.xml
  2. +5
    -0
      src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java

+ 2
- 1
build.xml View File

@@ -841,7 +841,8 @@
<target name="run-tests" depends="dump-info,compile-tests" if="junit.present"> <target name="run-tests" depends="dump-info,compile-tests" if="junit.present">




<junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
<junit printsummary="no" haltonfailure="yes"
fork="${junit.fork}">
<!-- <jvmarg value="-classic"/> --> <!-- <jvmarg value="-classic"/> -->
<classpath refid="tests-classpath"/> <classpath refid="tests-classpath"/>




+ 5
- 0
src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java View File

@@ -58,6 +58,7 @@ import java.io.*;


import junit.framework.AssertionFailedError; import junit.framework.AssertionFailedError;
import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project;


/** /**
* @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a> * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
@@ -161,6 +162,10 @@ public class FixCrLfTest extends BuildFileTest {
} }


public void testEncoding() throws IOException { public void testEncoding() throws IOException {
if (project.getJavaVersion() == Project.JAVA_1_1) {
// UTF16 is not supported in JDK 1.1
return;
}
executeTarget("testEncoding"); executeTarget("testEncoding");
assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/input.lf.utf16"), assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/input.lf.utf16"),
new File("src/etc/testcases/taskdefs/fixcrlf/result/input.crlf.utf16")); new File("src/etc/testcases/taskdefs/fixcrlf/result/input.crlf.utf16"));


Loading…
Cancel
Save