From cd32b65ace69e25cd5a775e21ea978fc84a4519f Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Thu, 1 Mar 2018 16:53:00 +0530
Subject: [PATCH] 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

---
 .../antunit/types/resources/tokens-test.xml      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/tests/antunit/types/resources/tokens-test.xml b/src/tests/antunit/types/resources/tokens-test.xml
index c09d604cb..26a300d4c 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">