From 30635812387f51399c6703caedc5c8bfb09b4e2c Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Wed, 20 Sep 2006 17:05:25 +0000 Subject: [PATCH] Differentiate between no RCs specified and no matching Resources. git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/antunit/trunk@448264 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/ant/antunit/AntUnit.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/ant/antunit/AntUnit.java b/src/main/org/apache/ant/antunit/AntUnit.java index 3b3699e..c4f4425 100644 --- a/src/main/org/apache/ant/antunit/AntUnit.java +++ b/src/main/org/apache/ant/antunit/AntUnit.java @@ -68,7 +68,7 @@ public class AntUnit extends Task { /** * The build files to process. */ - private Union buildFiles = new Union(); + private Union buildFiles; /** * project instance for the build file currently under test. @@ -123,6 +123,9 @@ public class AntUnit extends Task { * adds build files to run as tests. */ public void add(ResourceCollection rc) { + if (buildFiles == null) { + buildFiles = new Union(); + } buildFiles.add(rc); } @@ -156,7 +159,7 @@ public class AntUnit extends Task { } public void execute() { - if (buildFiles.size() == 0) { + if (buildFiles == null) { throw new BuildException(ERROR_NO_TESTS); } doResourceCollection(buildFiles); @@ -179,12 +182,13 @@ public class AntUnit extends Task { * Processes a ResourceCollection. */ private void doResourceCollection(ResourceCollection rc) { + //should relax this restriction if/when Ant core allows non-files if (!rc.isFilesystemOnly()) { throw new BuildException(ERROR_NON_FILES); } Iterator i = rc.iterator(); - while(i.hasNext()) { + while (i.hasNext()) { FileResource r = (FileResource) i.next(); if (r.isExists()) { doFile(r.getFile()); @@ -439,4 +443,4 @@ public class AntUnit extends Task { public void messageLogged(BuildEvent event) {} } -} \ No newline at end of file +}