diff --git a/src/etc/testcases/types/redirector.xml b/src/etc/testcases/types/redirector.xml new file mode 100755 index 000000000..0432c1a43 --- /dev/null +++ b/src/etc/testcases/types/redirector.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties index bceacab51..bd1006d6f 100644 --- a/src/main/org/apache/tools/ant/types/defaults.properties +++ b/src/main/org/apache/tools/ant/types/defaults.properties @@ -7,6 +7,7 @@ filterchain=org.apache.tools.ant.types.FilterChain 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 diff --git a/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java b/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java new file mode 100755 index 000000000..d57eacc87 --- /dev/null +++ b/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java @@ -0,0 +1,51 @@ +/* + * 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"); + } + +}