bodewig 2003/03/27 08:54:00
Modified: src/etc/testcases/filters build.xml
Added: src/etc/testcases/filters/expected stripjavacomments.test
src/etc/testcases/filters/input stripjavacomments.test
src/testcases/org/apache/tools/ant/filters
StripJavaCommentsTest.java
Log:
demonstrate bug 17441
Revision Changes Path
1.3 +9 -0 ant/src/etc/testcases/filters/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/filters/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 14 Mar 2003 13:45:16 -0000 1.2
+++ build.xml 27 Mar 2003 16:54:00 -0000 1.3
@@ -39,4 +39,13 @@
</fixcrlf>
</target>
+ <target name="testStripJavaComments" depends="init">
+ <copy todir="result">
+ <fileset dir="input" includes="stripjavacomments.test" />
+ <filterchain>
+ <filterreader
classname="org.apache.tools.ant.filters.StripJavaComments" />
+ </filterchain>
+ </copy>
+ </target>
+
</project>
1.1
ant/src/etc/testcases/filters/expected/stripjavacomments.test
Index: stripjavacomments.test
===================================================================
public class NormalLine {
private String withComment;
public void doNothing() {
int i;
int j;
}
private String url = "http://ant.apache.org/";;
private String url2 = "\"http://ant.apache.org/\"";;
}
1.1
ant/src/etc/testcases/filters/input/stripjavacomments.test
Index: stripjavacomments.test
===================================================================
/*
* Copyright text
* has to be removed
*/
/**
* JavaDoc text about the class.
* has to be removed
*/
public class NormalLine {
private String withComment; // this comment should be removed
/* this comment
* should be
* removed
*/
public void doNothing() {
// this comment should be removed
int i;
/* this comment
should be removed
*/
int j;
}
private String url = "http://ant.apache.org/";; // very difficult!
private String url2 = "\"http://ant.apache.org/\"";; // even worse
}
1.1
ant/src/testcases/org/apache/tools/ant/filters/StripJavaCommentsTest.java
Index: StripJavaCommentsTest.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 [EMAIL PROTECTED]
*
* 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:[EMAIL PROTECTED]">Jan Materne</a>
*/
public class StripJavaCommentsTest extends BuildFileTest {
public StripJavaCommentsTest(String name) {
super(name);
}
public void setUp() {
configureProject("src/etc/testcases/filters/build.xml");
}
public void tearDown() {
executeTarget("cleanup");
}
public void testStripJavaComments() throws IOException {
executeTarget("testStripJavaComments");
File expected =
getProject().resolveFile("expected/stripjavacomments.test");
File result =
getProject().resolveFile("result/stripjavacomments.test");
FileUtils fu = FileUtils.newFileUtils();
assertTrue(fu.contentEquals(expected, result));
}
}
