diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java index 629731037..5137f8e44 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java @@ -76,26 +76,21 @@ public class JakartaRegexpMatcherTest extends RegexpMatcherTest { } 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) { } } + /** + * Fails for the same reason as "default" mode in doEndTest2. + */ public void testUnixLineSeparator() throws IOException { - if ( Os.isFamily("windows") ){ - try { - super.testUnixLineSeparator(); - fail("Windows issue. Should trigger once this bug is fixed. {@since 1.2}"); - } catch (AssertionFailedError e){ - } - } else { + try { super.testUnixLineSeparator(); + fail("Should trigger once this bug is fixed. {@since 1.2}"); + } catch (AssertionFailedError e) { } } diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java index 52574dd76..09ab83f42 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java @@ -87,15 +87,14 @@ public class JakartaRegexpRegexpTest extends RegexpTest { } } + /** + * Fails for the same reason as "default" mode in doEndTest2. + */ public void testUnixLineSeparator() throws IOException { - if ( Os.isFamily("windows") ){ - try { - super.testUnixLineSeparator(); - fail("Windows issue. Should trigger once this bug is fixed. {@since 1.2}"); - } catch (AssertionFailedError e){ - } - } else { + try { super.testUnixLineSeparator(); + fail("Should trigger once this bug is fixed. {@since 1.2}"); + } catch (AssertionFailedError e){ } } diff --git a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java index 18166d198..47835d2b0 100644 --- a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java +++ b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java @@ -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 {