You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/12/11 16:45:41 UTC
cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs FixCrLfTest.java
bodewig 01/12/11 07:45:41
Modified: . build.xml
src/testcases/org/apache/tools/ant/taskdefs FixCrLfTest.java
Log:
JDK 1.1 doesn't grok UTF16 8-(
Revision Changes Path
1.216 +2 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- build.xml 2001/12/11 14:45:13 1.215
+++ build.xml 2001/12/11 15:45:41 1.216
@@ -841,7 +841,8 @@
<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"/> -->
<classpath refid="tests-classpath"/>
1.6 +5 -0 jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
Index: FixCrLfTest.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FixCrLfTest.java 2001/11/14 12:25:30 1.5
+++ FixCrLfTest.java 2001/12/11 15:45:41 1.6
@@ -58,6 +58,7 @@
import junit.framework.AssertionFailedError;
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
/**
* @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
@@ -161,6 +162,10 @@
}
public void testEncoding() throws IOException {
+ if (project.getJavaVersion() == Project.JAVA_1_1) {
+ // UTF16 is not supported in JDK 1.1
+ return;
+ }
executeTarget("testEncoding");
assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/input.lf.utf16"),
new File("src/etc/testcases/taskdefs/fixcrlf/result/input.crlf.utf16"));
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>