bodewig 2003/01/23 08:58:13
Modified: src/main/org/apache/tools/ant/util SourceSelector.java
Added: src/testcases/org/apache/tools/ant/util
SourceSelectorTest.java
Log:
Don't out-of-date sources more than once.
PR: 16371
Revision Changes Path
1.3 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/util/SourceSelector.java
Index: SourceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/SourceSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceSelector.java 22 Jan 2003 13:27:13 -0000 1.2
+++ SourceSelector.java 23 Jan 2003 16:58:13 -0000 1.3
@@ -115,7 +115,8 @@
if (targetnames != null) {
boolean added = false;
targetList.setLength(0);
- for (int ctarget = 0; ctarget < targetnames.length;
ctarget++) {
+ for (int ctarget = 0; !added && ctarget <
targetnames.length;
+ ctarget++) {
Resource atarget =
targets.getResource(targetnames[ctarget]);
// if the target does not exist, or exists and
1.1
jakarta-ant/src/testcases/org/apache/tools/ant/util/SourceSelectorTest.java
Index: SourceSelectorTest.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 "The Jakarta Project", "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.util;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Echo;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceFactory;
import java.io.File;
import junit.framework.TestCase;
/**
* Tests for org.apache.tools.ant.util.SourceSelector.
*/
public class SourceSelectorTest extends TestCase
implements ResourceFactory, FileNameMapper {
private Echo taskINeedForLogging = new Echo();
public SourceSelectorTest(String name) {
super(name);
taskINeedForLogging.setProject(new Project());
}
public void testNoDuplicates() {
Resource r = new Resource("samual vimes", true, 1, false);
Resource[] toNew =
SourceSelector.selectOutOfDateSources(taskINeedForLogging,
new Resource[] {r},
this, this);
assertEquals(1, toNew.length);
}
/* ============ ResourceFactory interface ====================== */
public Resource getResource(String name) {
return new Resource(name); // implies lastModified == 0
}
/* ============ FileNameMapper interface ======================= */
public void setFrom(String s) {}
public void setTo(String s) {}
public String[] mapFileName(String s) {
return new String[] {"fred colon", "carot"};
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
