From c30aceefbcc644f1bf8d0b5dfbd83685849b09e1 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Mon, 1 Mar 2010 16:44:48 +0000
Subject: [PATCH] Bug 48834 -  BuildFileTest.assertPropertyUnset() could fail
 with a slightly more meaningful error message

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@917583 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                | 6 +++++-
 src/tests/junit/org/apache/tools/ant/BuildFileTest.java | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 1886d2210..66612fc75 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -74,7 +74,11 @@ Other changes:
    of Object args as strings; previously only API-level usage of the
    equals condition allowed Object args, but Ant 1.8.x+ property
    evaluation may yield values of any type.
-
+   
+ * BuildFileTest.assertPropertyUnset() fails with a slightly more 
+   meaningful error message
+   Bugzilla Report 48834
+   
 Changes from Ant 1.8.0RC1 TO Ant 1.8.0
 ======================================
 
diff --git a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
index 1587721df..cca3c4ee1 100644
--- a/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/BuildFileTest.java
@@ -428,8 +428,12 @@ public abstract class BuildFileTest extends TestCase {
      *
      * @param property property name
      */
-    public  void assertPropertyUnset(String property) {
-        assertPropertyEquals(property, null);
+    public void assertPropertyUnset(String property) {
+        String result = project.getProperty(property);
+        if (result != null) {
+            fail("Expected property " + property
+                    + " to be unset, but it is set to the value: " + result);
+        }
     }
 
     /**