Author: bodewig
Date: Wed Dec 3 06:21:00 2008
New Revision: 722898
URL: http://svn.apache.org/viewvc?rev=722898&view=rev
Log:
tests for PR 45226
Added:
ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml (with props)
ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml (with props)
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml
Added: ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml?rev=722898&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml Wed Dec 3 06:21:00
2008
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+ <import file="../antunit-base.xml" />
+
+ <target name="testLastPropertyWins">
+ <ant antfile="antcall-test.xml" target="checkB">
+ <property name="b" value="1"/>
+ <property name="b" value="2"/>
+ <property name="expected" value="2"/>
+ </ant>
+ </target>
+
+ <target name="makePropertiesFile">
+ <ant antfile="antcall-test.xml" target="makePropertiesFile"/>
+ </target>
+
+ <target name="testPropertiesLoadedFromFile" depends="makePropertiesFile">
+ <ant antfile="antcall-test.xml" target="checkB">
+ <property name="expected" value="2"/>
+ <property file="${input}/ant.properties"/>
+ </ant>
+ </target>
+
+ <target name="testFileSeesExternalProperty" depends="makePropertiesFile">
+ <property name="a" value="x"/>
+ <ant antfile="antcall-test.xml" target="checkB">
+ <property name="expected" value="x"/>
+ <property file="${input}/ant.properties"/>
+ </ant>
+ </target>
+
+ <target name="testFileSeesInternalProperty" depends="makePropertiesFile">
+ <ant antfile="antcall-test.xml" target="checkB">
+ <property name="a" value="y"/>
+ <property name="expected" value="y"/>
+ <property file="${input}/ant.properties"/>
+ </ant>
+ </target>
+</project>
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/ant-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml?rev=722898&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml Wed Dec 3
06:21:00 2008
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+ <import file="../antunit-base.xml" />
+
+ <target name="checkB">
+ <au:assertPropertyEquals name="b" value="${expected}"/>
+ </target>
+
+ <target name="testLastParamWins">
+ <antcall target="checkB">
+ <param name="b" value="1"/>
+ <param name="b" value="2"/>
+ <param name="expected" value="2"/>
+ </antcall>
+ </target>
+
+ <target name="makePropertiesFile">
+ <mkdir dir="${input}"/>
+ <echo file="${input}/ant.properties"><![CDATA[
+a=2
+b=$${a}
+]]></echo>
+ </target>
+
+ <target name="testPropertiesLoadedFromFile" depends="makePropertiesFile">
+ <antcall target="checkB">
+ <param name="expected" value="2"/>
+ <param file="${input}/ant.properties"/>
+ </antcall>
+ </target>
+
+ <target name="testFileSeesExternalProperty" depends="makePropertiesFile">
+ <property name="a" value="x"/>
+ <antcall target="checkB">
+ <param name="expected" value="x"/>
+ <param file="${input}/ant.properties"/>
+ </antcall>
+ </target>
+
+ <target name="testFileSeesInternalParam" depends="makePropertiesFile">
+ <antcall target="checkB">
+ <param name="a" value="y"/>
+ <param name="expected" value="y"/>
+ <param file="${input}/ant.properties"/>
+ </antcall>
+ </target>
+</project>
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/antcall-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml?rev=722898&r1=722897&r2=722898&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/subant-test.xml Wed Dec 3
06:21:00 2008
@@ -60,4 +60,52 @@
useNativeBaseDir="true"/>
</target>
+ <target name="testLastPropertyWins">
+ <subant target="checkB">
+ <file file="antcall-test.xml"/>
+ <property name="b" value="1"/>
+ <property name="b" value="2"/>
+ <property name="expected" value="2"/>
+ </subant>
+ </target>
+
+ <target name="makePropertiesFile">
+ <ant antfile="antcall-test.xml" target="makePropertiesFile"/>
+ </target>
+
+ <target name="testPropertiesLoadedFromFile" depends="makePropertiesFile">
+ <subant target="checkB">
+ <file file="antcall-test.xml"/>
+ <property name="expected" value="2"/>
+ <property file="${input}/ant.properties"/>
+ </subant>
+ </target>
+
+ <target name="testFileDoesntSeeExternalProperty"
depends="makePropertiesFile">
+ <property name="a" value="x"/>
+ <subant target="checkB">
+ <file file="antcall-test.xml"/>
+ <property name="expected" value="2"/>
+ <property file="${input}/ant.properties"/>
+ </subant>
+ </target>
+
+ <target name="testFileSeesExternalPropertyWhenInheritAll"
+ depends="makePropertiesFile">
+ <property name="a" value="x"/>
+ <subant target="checkB" inheritall="true">
+ <file file="antcall-test.xml"/>
+ <property name="expected" value="x"/>
+ <property file="${input}/ant.properties"/>
+ </subant>
+ </target>
+
+ <target name="testFileSeesInternalProperty" depends="makePropertiesFile">
+ <subant target="checkB">
+ <file file="antcall-test.xml"/>
+ <property name="a" value="y"/>
+ <property name="expected" value="y"/>
+ <property file="${input}/ant.properties"/>
+ </subant>
+ </target>
</project>
