From 536c872b8b1fa07b604b529a3ab21ad86264528a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 31 Jan 2002 09:52:15 +0000
Subject: [PATCH] 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
---
 .../tools/ant/util/regexp/JakartaRegexpRegexpTest.java | 10 +++-------
 .../tools/ant/util/regexp/RegexpMatcherTest.java       |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

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 09ab83f42..c78188395 100644
--- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
+++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
@@ -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){
         }
     }
 
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 47835d2b0..18166d198 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 {