mbenson 2004/03/27 13:33:49
Modified: src/main/org/apache/tools/ant/types defaults.properties
Added: src/testcases/org/apache/tools/ant/types
RedirectorElementTest.java
src/etc/testcases/types redirector.xml
Log:
Forgot the default typedef and type unit tests initially. ;)
Revision Changes Path
1.1
ant/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java
Index: RedirectorElementTest.java
===================================================================
/*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.tools.ant.types;
import org.apache.tools.ant.BuildFileTest;
public class RedirectorElementTest extends BuildFileTest {
public RedirectorElementTest(String name) {
super(name);
}
public void setUp() {
configureProject("src/etc/testcases/types/redirector.xml");
}
public void test1() {
executeTarget("test1");
assertTrue((getProject().getReference("test1")
instanceof RedirectorElement));
}
public void test2() {
expectBuildException("test2", "You must not specify more than one "
+ "attribute when using refid");
}
public void test3() {
expectBuildException("test3", "You must not specify nested elements "
+ "when using refid");
}
public void test4() {
executeTarget("test4");
}
}
1.1 ant/src/etc/testcases/types/redirector.xml
Index: redirector.xml
===================================================================
<!-- Copyright 2004 The Apache Software Foundation. -->
<project name="redirector" basedir=".">
<target name="test1" description="create ref">
<redirector id="test1" output="out" />
</target>
<target name="test2" depends="test1" description="fail">
<redirector refid="test1" output="out" />
</target>
<target name="test3" depends="test1" description="fail">
<redirector refid="test1">
<outputmapper type="flatten" />
</redirector>
</target>
<target name="test4" depends="test1" description="pass">
<redirector>
<outputmapper type="flatten" />
</redirector>
</target>
</project>
1.23 +1 -0
ant/src/main/org/apache/tools/ant/types/defaults.properties
Index: defaults.properties
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- defaults.properties 11 Mar 2004 19:25:48 -0000 1.22
+++ defaults.properties 27 Mar 2004 21:33:49 -0000 1.23
@@ -7,6 +7,7 @@
filterreader=org.apache.tools.ant.types.AntFilterReader
filterset=org.apache.tools.ant.types.FilterSet
mapper=org.apache.tools.ant.types.Mapper
+redirector=org.apache.tools.ant.types.RedirectorElement
# different filename mappers
identitymapper=org.apache.tools.ant.util.IdentityMapper
flattenmapper=org.apache.tools.ant.util.FlatFileNameMapper
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]