Browse Source

part two of the patch to make Jakarta-Regexp tests pass

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271020 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
536c872b8b
2 changed files with 4 additions and 8 deletions
  1. +3
    -7
      src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
  2. +1
    -1
      src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java

+ 3
- 7
src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java View File

@@ -76,14 +76,10 @@ public class JakartaRegexpRegexpTest extends RegexpTest {
}

public void testWindowsLineSeparator2() throws IOException {
if ( Os.isFamily("windows") ) {
try {
super.testWindowsLineSeparator2();
fail("Windows issue. Should trigger when this bug is fixed. {@since 1.2}");
} catch (AssertionFailedError e){
}
} else {
try {
super.testWindowsLineSeparator2();
fail("Should trigger when this bug is fixed. {@since 1.2}");
} catch (AssertionFailedError e){
}
}



+ 1
- 1
src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java View File

@@ -171,7 +171,7 @@ public abstract class RegexpMatcherTest extends TestCase {

public void testWindowsLineSeparator2() throws IOException {
reg.setPattern("end of text\r$");
// assertTrue("Windows line separator", reg.matches("end of text\r\n"));
assertTrue("Windows line separator", reg.matches("end of text\r\n"));
}

public void testUnixLineSeparator() throws IOException {


Loading…
Cancel
Save