Return-Path: 
 <notifications-return-10389-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 47476 invoked from network); 17 Oct 2009 10:41:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Oct 2009 10:41:27 -0000
Received: (qmail 88170 invoked by uid 500); 17 Oct 2009 10:41:27 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 88133 invoked by uid 500); 17 Oct 2009 10:41:27 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 88124 invoked by uid 99); 17 Oct 2009 10:41:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Oct 2009 10:41:27 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Oct 2009 10:41:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 939B323888D8; Sat, 17 Oct 2009 10:41:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r826221 - in /ant/antlibs/antunit/trunk: changes.xml
 src/etc/testcases/assert.xml src/main/org/apache/ant/antunit/antlib.xml
 src/tests/junit/org/apache/ant/antunit/AssertTest.java
Date: Sat, 17 Oct 2009 10:41:04 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091017104104.939B323888D8@eris.apache.org>

Author: hibou
Date: Sat Oct 17 10:41:04 2009
New Revision: 826221

URL: http://svn.apache.org/viewvc?rev=826221&view=rev
Log:
fix: assertPropertyContains was not checking the value of the property but the name of the property.

Modified:
    ant/antlibs/antunit/trunk/changes.xml
    ant/antlibs/antunit/trunk/src/etc/testcases/assert.xml
    ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/antlib.xml
    ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/AssertTest.java

Modified: ant/antlibs/antunit/trunk/changes.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=826221&r1=826220&r2=826221&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/changes.xml (original)
+++ ant/antlibs/antunit/trunk/changes.xml Sat Oct 17 10:41:04 2009
@@ -48,6 +48,10 @@
       Default XSLT stylesheets now properly escape XML in exception
       stack traces.
     </action>
+    <action type="fix">
+      assertPropertyContains was not checking the value of the property but
+      the name of the property.
+    </action>
   </release>
   
   <release version="1.1" date="2008-09-26">

Modified: ant/antlibs/antunit/trunk/src/etc/testcases/assert.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/assert.xml?rev=826221&r1=826220&r2=826221&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/assert.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/assert.xml Sat Oct 17 10:41:04 2009
@@ -102,6 +102,16 @@
     <au:assertPropertyEquals name="foo" value="BAR"/>
   </target>
 
+  <target name="assertPropertyContains">
+    <property name="foo" value="bar"/>
+    <au:assertPropertyContains name="foo" value="ba"/>
+  </target>
+
+  <target name="assertPropertyContainsFail">
+    <property name="foo" value="bar"/>
+    <au:assertPropertyContains name="foo" value="foo"/>
+  </target>
+
   <target name="assertFileExistsPass">
     <au:assertFileExists file="assert.xml"/>
   </target>

Modified: ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/antlib.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/antlib.xml?rev=826221&r1=826220&r2=826221&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/antlib.xml (original)
+++ ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/antlib.xml Sat Oct 17 10:41:04 2009
@@ -104,7 +104,7 @@
     <sequential>
       <au:assertPropertySet message="@{message}" name="@{name}"/>
       <au:assertTrue message="@{message}">
-        <contains string="@{name}" substring="@{value}"
+        <contains string="${@{name}}" substring="@{value}"
                   casesensitive="@{casesensitive}"/>
       </au:assertTrue>
     </sequential>

Modified: ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/AssertTest.java
URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/AssertTest.java?rev=826221&r1=826220&r2=826221&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/AssertTest.java (original)
+++ ant/antlibs/antunit/trunk/src/tests/junit/org/apache/ant/antunit/AssertTest.java Sat Oct 17 10:41:04 2009
@@ -101,6 +101,12 @@
     public void testPropertyEqualsFail3() {
         testFail("assertPropertyEqualsFail3", "Expected property 'foo' to have value 'BAR' but was 'bar'");
     }
+    public void testPropertyContains() {
+        testPass("assertPropertyContains");
+    }
+    public void testPropertyContainsFail() {
+        testFail("assertPropertyContainsFail", "Expected property 'foo' to contain value 'foo' but was 'bar'");
+    }
     public void testFileExistsFail() {
         testFail("assertFileExistsFail",
                  "Expected file 'assert.txt' to exist");