Assume the filename is absolute if project is null.
+ */
private static String resolveFile(Project project, String relativeName) {
if (project != null) {
return project.resolveFile(relativeName).getAbsolutePath();
@@ -427,21 +435,13 @@ public class Path implements Cloneable {
return relativeName;
}
+ /**
+ * Adds a String to the Vector if it isn't already included.
+ */
private static void addUnlessPresent(Vector v, String s) {
if (v.indexOf(s) == -1) {
v.addElement(s);
}
}
- private BuildException tooManyAttributes() {
- return new BuildException("You must not specify more than one attribute when using refid");
- }
-
- private BuildException noChildrenAllowed() {
- return new BuildException("You must not specify nested elements when using refid");
- }
-
- private BuildException circularReference() {
- return new BuildException("This path contains a circular reference.");
- }
}
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index b76aa923d..ddf325118 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -59,6 +59,7 @@ import org.apache.tools.ant.BuildException;
import java.io.*;
import java.util.Enumeration;
+import java.util.Stack;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -74,7 +75,7 @@ import java.util.Vector;
* @author Jon S. Stevens jon@clearink.com
* @author Stefan Bodewig
*/
-public class PatternSet {
+public class PatternSet extends DataType {
private Vector includeList = new Vector();
private Vector excludeList = new Vector();
@@ -122,10 +123,27 @@ public class PatternSet {
super();
}
+ /**
+ * Makes this instance in effect a reference to another PatternSet
+ * instance.
+ *
+ * You must not set another attribute or nest elements inside
+ * this element if you make it a reference.
+ */
+ public void setRefid(Reference r) throws BuildException {
+ if (!includeList.isEmpty() || !excludeList.isEmpty()) {
+ throw tooManyAttributes();
+ }
+ super.setRefid(r);
+ }
+
/**
* add a name entry on the include list
*/
public NameEntry createInclude() {
+ if (isReference()) {
+ throw noChildrenAllowed();
+ }
return addPatternToList(includeList);
}
@@ -133,6 +151,9 @@ public class PatternSet {
* add a name entry on the exclude list
*/
public NameEntry createExclude() {
+ if (isReference()) {
+ throw noChildrenAllowed();
+ }
return addPatternToList(excludeList);
}
@@ -143,6 +164,9 @@ public class PatternSet {
* @param includes the string containing the include patterns
*/
public void setIncludes(String includes) {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
if (includes != null && includes.length() > 0) {
StringTokenizer tok = new StringTokenizer(includes, ", ", false);
while (tok.hasMoreTokens()) {
@@ -158,6 +182,9 @@ public class PatternSet {
* @param excludes the string containing the exclude patterns
*/
public void setExcludes(String excludes) {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
if (excludes != null && excludes.length() > 0) {
StringTokenizer tok = new StringTokenizer(excludes, ", ", false);
while (tok.hasMoreTokens()) {
@@ -181,6 +208,9 @@ public class PatternSet {
* @param incl The file to fetch the include patterns from.
*/
public void setIncludesfile(File incl) throws BuildException {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
if (!incl.exists()) {
throw new BuildException("Includesfile "+incl.getAbsolutePath()
+" not found.");
@@ -195,6 +225,9 @@ public class PatternSet {
* @param excl The file to fetch the exclude patterns from.
*/
public void setExcludesfile(File excl) throws BuildException {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
if (!excl.exists()) {
throw new BuildException("Excludesfile "+excl.getAbsolutePath()
+" not found.");
@@ -234,12 +267,23 @@ public class PatternSet {
/**
* Adds the patterns of the other instance to this set.
*/
- public void append(PatternSet other) {
- for (int i=0; i.
+ */
+
+package org.apache.tools.ant.types;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+import java.io.File;
+
+/**
+ * JUnit 3 testcases for org.apache.tools.ant.types.FileSet.
+ *
+ * This doesn't actually test much, mainly reference handling.
+ *
+ * @author Stefan Bodewig
+ */
+
+public class FileSetTest extends TestCase {
+
+ private Project project;
+
+ public FileSetTest(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ project = new Project();
+ project.setBasedir(".");
+ }
+
+ public void testEmptyElementIfIsReference() {
+ FileSet f = new FileSet();
+ f.setIncludes("**/*.java");
+ try {
+ f.setRefid(new Reference("dummyref"));
+ fail("Can add reference to FileSet with elements from setIncludes");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+
+ f = new FileSet();
+ f.createPatternSet();
+ try {
+ f.setRefid(new Reference("dummyref"));
+ fail("Can add reference to FileSet with nested patternset element.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+
+ f = new FileSet();
+ f.createInclude();
+ try {
+ f.setRefid(new Reference("dummyref"));
+ fail("Can add reference to FileSet with nested include element.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+
+ f = new FileSet();
+ f.setRefid(new Reference("dummyref"));
+ try {
+ f.setIncludes("**/*.java");
+ fail("Can set includes in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ f.setIncludesfile(new File("/a"));
+ fail("Can set includesfile in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ f.setExcludes("**/*.java");
+ fail("Can set excludes in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ f.setExcludesfile(new File("/a"));
+ fail("Can set excludesfile in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ f.setDir(project.resolveFile("."));
+ fail("Can set dir in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ f.createInclude();
+ fail("Can add nested include in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+ try {
+ f.createExclude();
+ fail("Can add nested exclude in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+ try {
+ f.createPatternSet();
+ fail("Can add nested patternset in FileSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+ }
+
+ public void testCircularReferenceCheck() {
+ FileSet f = new FileSet();
+ project.addReference("dummy", f);
+ f.setRefid(new Reference("dummy"));
+ try {
+ f.getDir(project);
+ fail("Can make FileSet a Reference to itself.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+ try {
+ f.getDirectoryScanner(project);
+ fail("Can make FileSet a Reference to itself.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+
+ // dummy1 --> dummy2 --> dummy3 --> dummy1
+ FileSet f1 = new FileSet();
+ project.addReference("dummy1", f1);
+ f1.setRefid(new Reference("dummy2"));
+ FileSet f2 = new FileSet();
+ project.addReference("dummy2", f2);
+ f2.setRefid(new Reference("dummy3"));
+ FileSet f3 = new FileSet();
+ project.addReference("dummy3", f3);
+ f3.setRefid(new Reference("dummy1"));
+ try {
+ f1.getDir(project);
+ fail("Can make circular reference.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+ try {
+ f1.getDirectoryScanner(project);
+ fail("Can make circular reference.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+
+ // dummy1 --> dummy2 --> dummy3
+ // (which has the Project's basedir as root).
+ f1 = new FileSet();
+ project.addReference("dummy1", f1);
+ f1.setRefid(new Reference("dummy2"));
+ f2 = new FileSet();
+ project.addReference("dummy2", f2);
+ f2.setRefid(new Reference("dummy3"));
+ f3 = new FileSet();
+ project.addReference("dummy3", f3);
+ f3.setDir(project.resolveFile("."));
+ File dir = f1.getDir(project);
+ assertEquals("Die is basedir", dir, project.getBaseDir());
+ }
+}
diff --git a/src/testcases/org/apache/tools/ant/types/PathTest.java b/src/testcases/org/apache/tools/ant/types/PathTest.java
index d7665360d..1524fd5ec 100644
--- a/src/testcases/org/apache/tools/ant/types/PathTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PathTest.java
@@ -63,9 +63,9 @@ import junit.framework.AssertionFailedError;
import java.io.File;
/**
- * JUnit 3 testcases for org.apache.tools.ant.Path
+ * JUnit 3 testcases for org.apache.tools.ant.types.Path
*
- * @author Stefan Bodewig stefan.bodewig@megabit.net
+ * @author Stefan Bodewig
*/
public class PathTest extends TestCase {
@@ -270,15 +270,6 @@ public class PathTest extends TestCase {
assertEquals("You must not specify nested elements when using refid",
be.getMessage());
}
-
- try {
- p.addFilesetRef(new Reference("dummy2"));
- fail("Can add nested FileSetRef in Path that is a reference.");
- } catch (BuildException be) {
- assertEquals("You must not specify nested elements when using refid",
- be.getMessage());
- }
-
}
public void testCircularReferenceCheck() {
@@ -289,7 +280,7 @@ public class PathTest extends TestCase {
p.list();
fail("Can make Path a Reference to itself.");
} catch (BuildException be) {
- assertEquals("This path contains a circular reference.",
+ assertEquals("This data type contains a circular reference.",
be.getMessage());
}
@@ -305,7 +296,7 @@ public class PathTest extends TestCase {
p1.list();
fail("Can make circular reference.");
} catch (BuildException be) {
- assertEquals("This path contains a circular reference.",
+ assertEquals("This data type contains a circular reference.",
be.getMessage());
}
@@ -318,7 +309,7 @@ public class PathTest extends TestCase {
project.addReference("dummy3", p3);
p3.setLocation(new File("/a"));
String[] l = p1.list();
- assertEquals("One element burried deep inside a nested path structure",
+ assertEquals("One element buried deep inside a nested path structure",
1, l.length);
if (isUnixStyle) {
assertEquals("/a", l[0]);
diff --git a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
new file mode 100644
index 000000000..f68d4c326
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
@@ -0,0 +1,211 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 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", "Tomcat", 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
+ * .
+ */
+
+package org.apache.tools.ant.types;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
+import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
+
+import java.io.File;
+
+/**
+ * JUnit 3 testcases for org.apache.tools.ant.types.PatternSet.
+ *
+ *
This doesn't actually test much, mainly reference handling.
+ *
+ * @author Stefan Bodewig
+ */
+
+public class PatternSetTest extends TestCase {
+
+ private Project project;
+
+ public PatternSetTest(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ project = new Project();
+ project.setBasedir(".");
+ }
+
+ public void testEmptyElementIfIsReference() {
+ PatternSet p = new PatternSet();
+ p.setIncludes("**/*.java");
+ try {
+ p.setRefid(new Reference("dummyref"));
+ fail("Can add reference to PatternSet with elements from setIncludes");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+
+ p = new PatternSet();
+ p.setRefid(new Reference("dummyref"));
+ try {
+ p.setIncludes("**/*.java");
+ fail("Can set includes in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+
+ p = new PatternSet();
+ p.setRefid(new Reference("dummyref"));
+ try {
+ p.setIncludesfile(new File("/a"));
+ fail("Can set includesfile in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ p.setExcludes("**/*.java");
+ fail("Can set excludes in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ p.setExcludesfile(new File("/a"));
+ fail("Can set excludesfile in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify more than one attribute when using refid",
+ be.getMessage());
+ }
+ try {
+ p.createInclude();
+ fail("Can add nested include in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+ try {
+ p.createExclude();
+ fail("Can add nested exclude in PatternSet that is a reference.");
+ } catch (BuildException be) {
+ assertEquals("You must not specify nested elements when using refid",
+ be.getMessage());
+ }
+ }
+
+ public void testCircularReferenceCheck() {
+ PatternSet p = new PatternSet();
+ project.addReference("dummy", p);
+ p.setRefid(new Reference("dummy"));
+ try {
+ p.getIncludePatterns(project);
+ fail("Can make PatternSet a Reference to itself.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+ try {
+ p.getExcludePatterns(project);
+ fail("Can make PatternSet a Reference to itself.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+
+ // dummy1 --> dummy2 --> dummy3 --> dummy1
+ PatternSet p1 = new PatternSet();
+ project.addReference("dummy1", p1);
+ p1.setRefid(new Reference("dummy2"));
+ PatternSet p2 = new PatternSet();
+ project.addReference("dummy2", p2);
+ p2.setRefid(new Reference("dummy3"));
+ PatternSet p3 = new PatternSet();
+ project.addReference("dummy3", p3);
+ p3.setRefid(new Reference("dummy1"));
+ try {
+ p1.getIncludePatterns(project);
+ fail("Can make circular reference.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+ try {
+ p1.getExcludePatterns(project);
+ fail("Can make circular reference.");
+ } catch (BuildException be) {
+ assertEquals("This data type contains a circular reference.",
+ be.getMessage());
+ }
+
+ // dummy1 --> dummy2 --> dummy3
+ // (which holds patterns "include" and "exclude")
+ p1 = new PatternSet();
+ project.addReference("dummy1", p1);
+ p1.setRefid(new Reference("dummy2"));
+ p2 = new PatternSet();
+ project.addReference("dummy2", p2);
+ p2.setRefid(new Reference("dummy3"));
+ p3 = new PatternSet();
+ project.addReference("dummy3", p3);
+ p3.setIncludes("include");
+ p3.createExclude().setName("exclude");
+ String[] i = p1.getIncludePatterns(project);
+ assertEquals("One include pattern buried deep inside a nested patternset structure",
+ 1, i.length);
+ assertEquals("include", i[0]);
+ i = p3.getExcludePatterns(project);
+ assertEquals("One exclude pattern buried deep inside a nested patternset structure",
+ 1, i.length);
+ assertEquals("exclude", i[0]);
+ }
+}