ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp JakartaRegexpRegexpTest.java RegexpMatcherTest.java
Date Thu, 31 Jan 2002 09:52:15 GMT
bodewig     02/01/31 01:52:15

  Modified:    src/testcases/org/apache/tools/ant/util/regexp
                        JakartaRegexpRegexpTest.java RegexpMatcherTest.java
  Log:
  part two of the patch to make Jakarta-Regexp tests pass
  
  Revision  Changes    Path
  1.7       +3 -7      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JakartaRegexpRegexpTest.java	31 Jan 2002 09:39:24 -0000	1.6
  +++ JakartaRegexpRegexpTest.java	31 Jan 2002 09:52:15 -0000	1.7
  @@ -76,14 +76,10 @@
       }
   
       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.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- RegexpMatcherTest.java	31 Jan 2002 09:39:24 -0000	1.11
  +++ RegexpMatcherTest.java	31 Jan 2002 09:52:15 -0000	1.12
  @@ -171,7 +171,7 @@
   
       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 {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message