Repository: ant Updated Branches: refs/heads/master 5d167c2f4 -> 3b2587d76
BZ-62147 Add a test case to make sure 1.9.x isn't affected by the issue reported in 62147 where StringResource value was being property replaced when used within a Token Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/cd32b65a Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/cd32b65a Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/cd32b65a Branch: refs/heads/master Commit: cd32b65ace69e25cd5a775e21ea978fc84a4519f Parents: 6c97661 Author: Jaikiran Pai <jaiki...@apache.org> Authored: Thu Mar 1 16:53:00 2018 +0530 Committer: Jaikiran Pai <jaiki...@apache.org> Committed: Thu Mar 1 16:53:00 2018 +0530 ---------------------------------------------------------------------- src/tests/antunit/types/resources/tokens-test.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/cd32b65a/src/tests/antunit/types/resources/tokens-test.xml ---------------------------------------------------------------------- diff --git a/src/tests/antunit/types/resources/tokens-test.xml b/src/tests/antunit/types/resources/tokens-test.xml index c09d604..26a300d 100644 --- a/src/tests/antunit/types/resources/tokens-test.xml +++ b/src/tests/antunit/types/resources/tokens-test.xml @@ -44,6 +44,22 @@ </au:assertTrue> </target> + <target name="testPropReplacement" description="bz-62147 - tests that string resource tokens aren't replaced with property values"> + <property name="bz-62147-four" value="four"/> + <au:assertTrue> + <resourcecount count="0"> + <difference> + <tokens> + <string>one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}</string> + </tokens> + <resources> + <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}" /> + </resources> + </difference> + </resourcecount> + </au:assertTrue> + </target> + <target name="testExplicitLines"> <au:assertTrue> <resourcecount count="0">
