jvanzyl 02/02/20 12:08:37
Modified: . build-test.xml
src/java/org/apache/maven/jrcs jdiff.java rcsp.java
src/test/org/apache/maven/jrcs/rcs ArchiveTest.java
Log:
- adding tests for importscrubber
- correcting package statements in jrcs tests
Revision Changes Path
1.2 +5 -3 jakarta-turbine-maven/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-test.xml 19 Feb 2002 18:09:58 -0000 1.1
+++ build-test.xml 20 Feb 2002 20:08:37 -0000 1.2
@@ -23,6 +23,8 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-graph.jar}"/>
<pathelement location="${oro.jar}"/>
+ <pathelement location="${bcel.jar}"/>
+ <pathelement location="${gnu.regex.jar}"/>
</path>
<!-- ================================================================== -->
@@ -31,7 +33,7 @@
<target
name="test"
- depends="compile-test"
+ depends="compile"
description="runs (junit) unit tests">
<delete dir="${test.reportDirectory}"/>
@@ -57,7 +59,7 @@
<target
name="test-build"
- depends="compile-test">
+ depends="compile">
<taskdef
name="maven"
@@ -77,7 +79,7 @@
<!-- ================================================================== -->
<target
- name="compile-test"
+ name="compile"
description="==> compiles the test source code">
<mkdir dir="${build.dest}"/>
1.2 +54 -0 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java
Index: jdiff.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/jdiff.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jdiff.java 20 Feb 2002 16:20:02 -0000 1.1
+++ jdiff.java 20 Feb 2002 20:08:37 -0000 1.2
@@ -1,5 +1,59 @@
package org.apache.maven.jrcs;
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 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 acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" 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",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * 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/>.
+ */
+
import java.util.*;
import java.io.*;
import org.apache.maven.jrcs.diff.*;
1.3 +54 -0 jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java
Index: rcsp.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcsp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rcsp.java 20 Feb 2002 17:04:45 -0000 1.2
+++ rcsp.java 20 Feb 2002 20:08:37 -0000 1.3
@@ -1,5 +1,59 @@
package org.apache.maven.jrcs;
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 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 acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Maven" 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",
+ * "Apache Maven", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * 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/>.
+ */
+
import org.apache.maven.jrcs.rcs.*;
import org.apache.maven.jrcs.diff.*;
1.2 +12 -12
jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java
Index: ArchiveTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchiveTest.java 20 Feb 2002 16:20:04 -0000 1.1
+++ ArchiveTest.java 20 Feb 2002 20:08:37 -0000 1.2
@@ -109,8 +109,8 @@
}
public void testAdd1_1()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
Object[] rev = archive.getRevision();
assertTrue(Diff.compare(v1_1, rev));
@@ -124,8 +124,8 @@
}
public void testAdd1_2()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
testAdd1_1();
archive.addRevision(v1_2, "Added 3.1, deleted 6\n");
@@ -142,8 +142,8 @@
}
public void testAdd1_3()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
testAdd1_2();
archive.addRevision(v1_3, "Changed 1\n");
@@ -159,8 +159,8 @@
}
public void testAdd1_2_1()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
testAdd1_3();
archive.addRevision(v1_2_1_1, "1.2.1", "Added 2.1, changed 4, added 5.1\n");
@@ -187,8 +187,8 @@
}
public void testBranch()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
testAdd1_3();
archive.setBranch("1.2.0");
@@ -226,8 +226,8 @@
}
public void testInvalidBranch()
- throws org.suigeneris.diff.DiffException,
- org.suigeneris.rcs.RCSException
+ throws org.apache.maven.jrcs.diff.DiffException,
+ org.apache.maven.jrcs.rcs.RCSException
{
testAdd1_1();
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
