svn commit: r1366419 - in /incubator/easyant/plugins/trunk/ivy-repo-management: module.ivy src/test/antunit/ivy-repo-management-test.xml

[jl...@apache.org]

Author: jlboudart
Date: Fri Jul 27 15:32:44 2012
New Revision: 1366419

URL: http://svn.apache.org/viewvc?rev=1366419&view=rev
Log:
Removes logContains workaround in ivy-repo-management

Modified:
    incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy
    incubator/easyant/plugins/trunk/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml

Modified: incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy?rev=1366419&r1=1366418&r2=1366419&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy (original)
+++ incubator/easyant/plugins/trunk/ivy-repo-management/module.ivy Fri Jul 27 15:32:44 2012
@@ -39,6 +39,7 @@
            </p>
            </description>
            <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+<ea:plugin module="antunit" revision="0.9"/>
         </info>
         <configurations>
                 <conf name="default" description="runtime dependencies artifact can be used with this conf"/>

Modified: incubator/easyant/plugins/trunk/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml?rev=1366419&r1=1366418&r2=1366419&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml (original)
+++ incubator/easyant/plugins/trunk/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml Fri Jul 27 15:32:44 2012
@@ -72,27 +72,25 @@
     </target>
 
     <target name="prepare-install-artifact">
-        <property name="org" value="junit"/>
-        <property name="module" value="junit"/>
-        <property name="rev" value="4.4"/>
-        <property name="artifact" value="../../../module.ivy"/>
+        <property name="org" value="org.foobar"/>
+        <property name="module" value="foobar-core"/>
+        <property name="rev" value="1.0"/>
+        <echo file="myartifact"/>
+        <property name="artifact" value="myartifact"/>
          
     </target>
 
 
     <target name="test-ivy-repo-management:install-artifact" depends="prepare-install-artifact, ivy-repo-management:install-artifact">
-        <!-- workaround since assertLogContains doesn't seems to support text containing properties -->
-        <property name="antunit.log" value="${target}/antunit.log"/>
-        <copy tofile="${target}/antunit.log" outputencoding="UTF-8">
-            <au:logcontent/>
-        </copy>
-        <au:assertResourceContains resource="${antunit.log}" value="Creating ivy temp directory in ${install.temp.directory}"/>
+       <au:assertLogContains text="Creating ivy temp directory in ${install.temp.directory}"/>
         <au:assertFileExists file="${install.temp.directory}"/>
-        <au:assertResourceContains resource="${antunit.log}" value="Copying ${artifact} in the ivy temp directory"/>
-        <au:assertResourceContains resource="${antunit.log}" value="Generating ivy file for ${artifact}"/>
-        <au:assertResourceContains resource="${antunit.log}" value="Publishing artifact in ${to.resolver} repository"/>
-        <au:assertResourceContains resource="${antunit.log}" value="Cleaning ${install.temp.directory}"/>
-        <au:assertResourceContains resource="${antunit.log}" value="${artifact.to.install.file} succefully installed in your ${to.resolver} repository"/>
+        <au:assertLogContains text="Copying ${artifact} in the ivy temp directory"/>
+        <au:assertLogContains text="Generating ivy file for ${artifact}"/>
+        <au:assertLogContains text="Publishing artifact in ${to.resolver} repository"/>
+        <au:assertLogContains text="Cleaning ${install.temp.directory}"/>
+        <au:assertLogContains text="${artifact.to.install.file} succefully installed in your ${to.resolver} repository"/>
+        <au:assertLogContains text=":: publishing :: org.foobar#foobar-core"/>
+        <au:assertLogContains text="publish commited"/>
 
     </target>
 </project>