ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/util UnPackageNameMapperTest.java
Date Mon, 16 Jun 2003 09:28:29 GMT
peterreilly    2003/06/16 02:28:29

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/types Mapper.java
               docs/manual/CoreTypes mapper.html
  Added:       src/main/org/apache/tools/ant/util UnPackageNameMapper.java
               src/testcases/org/apache/tools/ant/util
                        UnPackageNameMapperTest.java
  Log:
  Added the mapper unpackage
  PR: 18908
  Obtained from: Brad Clark
  Submitted by:  Peter Reilly
  
  Revision  Changes    Path
  1.437     +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.436
  retrieving revision 1.437
  diff -u -r1.436 -r1.437
  --- WHATSNEW	15 Jun 2003 20:26:57 -0000	1.436
  +++ WHATSNEW	16 Jun 2003 09:28:28 -0000	1.437
  @@ -410,6 +410,9 @@
   * <pvcs> config attribute added to set the location of a specific PVCS .cfg file
     Bugzilla Report 9752
   
  +* <mapper> has an "unpackage" mapper
  +  Bugzilla Report 18908
  +
   Changes from Ant 1.5.2 to Ant 1.5.3
   ===================================
   
  
  
  
  1.19      +3 -1      ant/src/main/org/apache/tools/ant/types/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Mapper.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Mapper.java	15 Apr 2003 17:23:16 -0000	1.18
  +++ Mapper.java	16 Jun 2003 09:28:28 -0000	1.19
  @@ -262,11 +262,13 @@
                                   "org.apache.tools.ant.util.RegexpPatternMapper");
               implementations.put("package",
                                   "org.apache.tools.ant.util.PackageNameMapper");
  +            implementations.put("unpackage",
  +                                "org.apache.tools.ant.util.UnPackageNameMapper");
           }
   
           public String[] getValues() {
               return new String[] {"identity", "flatten", "glob",
  -                                 "merge", "regexp", "package"};
  +                                 "merge", "regexp", "package", "unpackage"};
           }
   
           public String getImplementation() {
  
  
  
  1.1                  ant/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java
  
  Index: UnPackageNameMapper.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 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 "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.util;
  
  import java.io.File;
  import org.apache.tools.ant.util.GlobPatternMapper;
  /**
   * Maps dotted package name matches to a directory name.
   * This is the inverse of the package mapper.
   * This is useful for matching XML formatter results against their JUnit test 
   * cases.
   * <pre>
   * &lt;mapper classname="org.apache.tools.ant.util.UnPackageNameMapper"
   *         from="${test.data.dir}/TEST-*Test.xml" to="*Test.java"&gt;
   * </pre>
   *
   *@author     Brad Clark
   *
   */
  public class UnPackageNameMapper extends GlobPatternMapper {
      /**
       *  Returns the part of the given string that matches the * in the
       *  &quot;from&quot; pattern replacing dots with file separators
       *
       *@param  name  Source filename
       *@return       Replaced variable part
       */
      protected String extractVariablePart(String name) {
          String var = name.substring(prefixLength,
                  name.length() - postfixLength);
          return var.replace('.', File.separatorChar);
      }
  }
  
  
  
  
  1.13      +23 -1     ant/docs/manual/CoreTypes/mapper.html
  
  Index: mapper.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mapper.html	1 Jun 2002 12:26:35 -0000	1.12
  +++ mapper.html	16 Jun 2003 09:28:28 -0000	1.13
  @@ -365,9 +365,31 @@
       <td valign="top">ignored</td>
     </tr>
   </table>
  +<h4><a name="unpackage-mapper">unpackage (since ant 1.6)</a></h4>
  +  <p>This mapper is the inverse of the <a href="#package-mapper">package</a>
mapper.
  +    It replaces the dots in a package name with directory separators. This
  +    is useful for matching XML formatter results against their JUnit test
  +    test cases. The mapper shares the sample syntax
  +    as the <a href="#glob-mapper">glob mapper</a>.
  +  </p>
  +<b>Example:</b>
  +<blockquote><pre>
  +&lt;mapper type="unpackage"
  +        from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"&gt;
  +</pre></blockquote>
  +<table border="1" cellpadding="2" cellspacing="0">
  +  <tr>
  +    <td valign="top"><b>Source file name</b></td>
  +    <td valign="top"><b>Target file name</b></td>
  +  </tr>
  +  <tr>
  +    <td valign="top"><code>TEST-org.acme.AcmeTest.xml</code></td>
  +    <td valign="top"><code>${test.src.dir}/org/acme/AcmeTest.java</code></td>
  +  </tr>
  +</table>
   
   <hr>
  -<p align="center">Copyright &copy; 2000-2001 Apache Software Foundation. All
rights
  +<p align="center">Copyright &copy; 2000-2003 Apache Software Foundation. All
rights
   Reserved.</p>
   
   </body>
  
  
  
  1.1                  ant/src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java
  
  Index: UnPackageNameMapperTest.java
  ===================================================================
  /*
   *  The Apache Software License, Version 1.1
   *
   *  Copyright (c) 2003 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 "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.util;
  
  import java.io.File;
  import junit.framework.TestCase;
  
  public class UnPackageNameMapperTest extends TestCase {
      public UnPackageNameMapperTest(String name) { super(name); }
      
      public void testMapping() {
          UnPackageNameMapper mapper = new UnPackageNameMapper();
          mapper.setFrom("TEST-*.xml");
          mapper.setTo("*.java");
          String file ="TEST-org.apache.tools.ant.util.UnPackageNameMapperTest.xml";
          String result = mapper.mapFileName(file)[0];
          String expected = fixupPath("org/apache/tools/ant/util/UnPackageNameMapperTest.java");
          
          assertEquals(expected, result);
      }
      
      private String fixupPath(String file) {
          return file.replace('/', File.separatorChar);
      }
  }
  
  
  

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


Mime
View raw message