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/filters LineContainsTest.java
Date Mon, 30 Sep 2002 12:08:20 GMT
bodewig     2002/09/30 05:08:20

  Modified:    src/main/org/apache/tools/ant/filters LineContains.java
  Added:       src/etc/testcases/filters build.xml
               src/etc/testcases/filters/expected linecontains.test
               src/etc/testcases/filters/input linecontains.test
               src/testcases/org/apache/tools/ant/filters
                        LineContainsTest.java
  Log:
  Fix <linecontains> filter.
  
  PR: 13048
  Submitted by:	Eric Pugh <epugh at upstate.com>
  
  Revision  Changes    Path
  1.1                  jakarta-ant/src/etc/testcases/filters/build.xml
  
  Index: build.xml
  ===================================================================
  <?xml version="1.0"?>
  <project default="cleanup" basedir=".">
  
    <target name="init">
      <mkdir dir="result" />
    </target>
  
    <target name="cleanup">
      <delete dir="result" />
    </target>
  
    <target name="testLineContains" depends="init">
      <copy todir="result">
        <fileset dir="input"/>
        <filterchain>
          <filterreader classname="org.apache.tools.ant.filters.LineContains">
            <param type="contains" value="beta"/>
          </filterreader>
        </filterchain>
      </copy>
    </target>
  
  </project>
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/filters/expected/linecontains.test
  
  Index: linecontains.test
  ===================================================================
  This is line 2 with beta.
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/filters/input/linecontains.test
  
  Index: linecontains.test
  ===================================================================
  This is line 1 with alpha.
  This is line 2 with beta.
  This is line 3 with gamma.
  
  
  
  1.8       +7 -6      jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java
  
  Index: LineContains.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/filters/LineContains.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LineContains.java	25 Jul 2002 15:21:02 -0000	1.7
  +++ LineContains.java	30 Sep 2002 12:08:20 -0000	1.8
  @@ -142,20 +142,21 @@
                   line = line.substring(1);
               }
           } else {
  -            String goodLine = null;
               line = readLine();
  -            while((line != null) && (goodLine == null)) {
  -                goodLine = line;
  -                int containsSize = contains.size();
  +            if (line == null) {
  +                ch = -1;
  +            } else {
  +                final int containsSize = contains.size();
                   for (int i = 0; i < containsSize; i++) {
                       String containsStr = (String) contains.elementAt(i);
                       if (line.indexOf(containsStr) == -1) {
  -                        goodLine = null;
  +                        line = null;
                           break;
                       }
                   }
  +
                   return read();
  -            };
  +            }
           }
   
           return ch;
  
  
  
  1.1                  jakarta-ant/src/testcases/org/apache/tools/ant/filters/LineContainsTest.java
  
  Index: LineContainsTest.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.filters;
  
  import java.io.File;
  import java.io.IOException;
  
  import org.apache.tools.ant.BuildFileTest;
  import org.apache.tools.ant.util.FileUtils;
  
  /**
   * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
   */
  public class LineContainsTest extends BuildFileTest {
  
      public LineContainsTest(String name) {
          super(name);
      }
  
      public void setUp() { 
          configureProject("src/etc/testcases/filters/build.xml");
      }
      
      public void tearDown() { 
          executeTarget("cleanup");
      }
      
      public void testLineContains() throws IOException { 
          executeTarget("testLineContains");
          File expected = getProject().resolveFile("expected/linecontains.test");
          File result = getProject().resolveFile("result/linecontains.test");
          assertTrue(FileUtils.newFileUtils().contentEquals(expected, result));
      }
      
  }
  
  
  

--
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