merged in my tests. Added a new one verifying that properties we havent heard of get included as literals.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272482 13f79535-47bb-0310-9956-ffa450edef68

src/testcases/org/apache/tools/ant/PropertyExpansionTest.java

@@ -84,12 +84,34 @@ public class PropertyExpansionTest extends BuildFileTest {
         project.setProperty("expanded","EXPANDED");
         assertExpandsTo("a${expanded}b","aEXPANDEDb");
         assertExpandsTo("${expanded}${expanded}","EXPANDEDEXPANDED");
-        assertExpandsTo("a$b","a$b");
-        assertExpandsTo("$}}","$}}");
-        assertExpandsTo("$$$-","$$-");
         assertExpandsTo("$$$","$$");
         assertExpandsTo("$$$$-","$$-");
         assertExpandsTo("","");
+        assertExpandsTo("Class$$subclass","Class$subclass");    
+    }
+    
+    /**
+     * new things we want
+     */
+    public void testDollarPassthru() {
+        assertExpandsTo("$-","$-");    
+        assertExpandsTo("Class$subclass","Class$subclass");    
+        assertExpandsTo("$$$-","$$-");
+        assertExpandsTo("$$$$$","$$$");
+        assertExpandsTo("${unassigned.property}","${unassigned.property}");
+        assertExpandsTo("a$b","a$b");
+        assertExpandsTo("$}}","$}}");
+    }
+
+    
+    /**
+     * old things we dont want; not a test no more
+     */
+    public void oldtestQuirkyLegacyBehavior() {
+        assertExpandsTo("Class$subclass","Classsubclass");    
+        assertExpandsTo("$$$-","$-");
+        assertExpandsTo("a$b","ab");
+        assertExpandsTo("$}}","}}");
     }
 
     /**