sbailliez 02/01/30 14:43:57
Modified: src/testcases/org/apache/tools/ant/util/regexp
JakartaRegexpMatcherTest.java
Jdk14RegexpRegexpTest.java RegexpMatcherTest.java
JakartaRegexpRegexpTest.java
Log:
Fixes should be in all related testcases now.
Revision Changes Path
1.5 +31 -0
jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
Index: JakartaRegexpMatcherTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JakartaRegexpMatcherTest.java 10 Jan 2002 10:13:13 -0000 1.4
+++ JakartaRegexpMatcherTest.java 30 Jan 2002 22:43:57 -0000 1.5
@@ -54,6 +54,12 @@
package org.apache.tools.ant.util.regexp;
+import java.io.IOException;
+
+import junit.framework.AssertionFailedError;
+
+import org.apache.tools.ant.taskdefs.condition.Os;
+
/**
* Tests for the jakarta-regexp implementation of the RegexpMatcher
interface.
*
@@ -68,6 +74,31 @@
public JakartaRegexpMatcherTest(String name) {
super(name);
}
+
+ public void testWindowsLineSeparator2() throws IOException {
+ if ( Os.isFamily("windows") ) {
+ try {
+ super.testWindowsLineSeparator2();
+ fail("Windows issue. Should trigger when this bug is fixed.
[EMAIL PROTECTED] 1.2}");
+ } catch (AssertionFailedError e){
+ }
+ } else {
+ super.testWindowsLineSeparator2();
+ }
+ }
+
+ public void testUnixLineSeparator() throws IOException {
+ if ( Os.isFamily("windows") ){
+ try {
+ super.testUnixLineSeparator();
+ fail("Windows issue. Should trigger once this bug is fixed.
[EMAIL PROTECTED] 1.2}");
+ } catch (AssertionFailedError e){
+ }
+ } else {
+ super.testUnixLineSeparator();
+ }
+ }
+
/**
* Fails for "default" mode.
1.2 +36 -0
jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java
Index: Jdk14RegexpRegexpTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexpTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Jdk14RegexpRegexpTest.java 26 Oct 2001 09:36:40 -0000 1.1
+++ Jdk14RegexpRegexpTest.java 30 Jan 2002 22:43:57 -0000 1.2
@@ -54,6 +54,10 @@
package org.apache.tools.ant.util.regexp;
+import java.io.IOException;
+
+import junit.framework.AssertionFailedError;
+
/**
* Tests for the JDK 1.4 implementation of the Regexp interface.
*
@@ -67,6 +71,38 @@
public Jdk14RegexpRegexpTest(String name) {
super(name);
+ }
+
+ public void testParagraphCharacter() throws IOException {
+ try {
+ super.testParagraphCharacter();
+ fail("Should trigger once fixed. [EMAIL PROTECTED] JDK 1.4RC1}");
+ } catch (AssertionFailedError e){
+ }
+ }
+
+ public void testLineSeparatorCharacter() throws IOException {
+ try {
+ super.testLineSeparatorCharacter();
+ fail("Should trigger once fixed. [EMAIL PROTECTED] JDK 1.4RC1}");
+ } catch (AssertionFailedError e){
+ }
+ }
+
+ public void testStandaloneCR() throws IOException {
+ try {
+ super.testStandaloneCR();
+ fail("Should trigger once fixed. [EMAIL PROTECTED] JDK 1.4RC1}");
+ } catch (AssertionFailedError e){
+ }
+ }
+
+ public void testWindowsLineSeparator() throws IOException {
+ try {
+ super.testWindowsLineSeparator();
+ fail("Should trigger once fixed. [EMAIL PROTECTED] JDK 1.4RC1}");
+ } catch (AssertionFailedError e){
+ }
}
}
1.9 +3 -0
jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
Index: RegexpMatcherTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RegexpMatcherTest.java 30 Jan 2002 22:05:38 -0000 1.8
+++ RegexpMatcherTest.java 30 Jan 2002 22:43:57 -0000 1.9
@@ -167,6 +167,9 @@
public void testWindowsLineSeparator() throws IOException {
reg.setPattern("end of text$");
assertTrue("Windows line separator", !reg.matches("end of
text\r\n"));
+ }
+
+ public void testWindowsLineSeparator2() throws IOException {
reg.setPattern("end of text\r$");
assertTrue("Windows line separator", reg.matches("end of text\r\n"));
}
1.4 +3 -3
jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
Index: JakartaRegexpRegexpTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JakartaRegexpRegexpTest.java 30 Jan 2002 22:05:38 -0000 1.3
+++ JakartaRegexpRegexpTest.java 30 Jan 2002 22:43:57 -0000 1.4
@@ -75,15 +75,15 @@
super(name);
}
- public void testWindowsLineSeparator() throws IOException {
+ public void testWindowsLineSeparator2() throws IOException {
if ( Os.isFamily("windows") ) {
try {
- super.testWindowsLineSeparator();
+ super.testWindowsLineSeparator2();
fail("Windows issue. Should trigger when this bug is fixed.
[EMAIL PROTECTED] 1.2}");
} catch (AssertionFailedError e){
}
} else {
- super.testWindowsLineSeparator();
+ super.testWindowsLineSeparator2();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
