dion 2004/06/29 04:52:49
Modified: artifact/xdocs changes.xml
artifact/src/plugin-test maven.xml
Log:
Use assert taglib in plugin test
Revision Changes Path
1.23 +1 -0 maven-plugins/artifact/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/xdocs/changes.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- changes.xml 28 Jun 2004 09:40:14 -0000 1.22
+++ changes.xml 29 Jun 2004 11:52:49 -0000 1.23
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="update">Use assertFileExists in tests</action>
<action dev="brett" type="add">Allow use of distributionSite POM attribute in
artifact method</action>
</release>
<release version="1.3" date="2004-06-25">
1.2 +6 -25 maven-plugins/artifact/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/artifact/src/plugin-test/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 14 Jun 2004 13:36:48 -0000 1.1
+++ maven.xml 29 Jun 2004 11:52:49 -0000 1.2
@@ -17,7 +17,8 @@
-->
<project xmlns:j="jelly:core"
xmlns:u="jelly:util"
- xmlns:deploy="deploy">
+ xmlns:deploy="deploy"
+ xmlns:assert="assert">
<goal name="testPlugin" prereqs="clean,test-deploy">
<attainGoal name="clean"/>
@@ -29,18 +30,8 @@
excludes="commons-logging" />
<!-- check that an exclude with just id works -->
- <j:set var="unExpectedFile"
- value="${maven.build.dir}/commons-logging-1.0.3.jar"/>
- <u:file var="file" name="${unExpectedFile}" />
- <j:if test="${(file.exists())}">
- <fail>${unExpectedFile} should not have been copied</fail>
- </j:if>
- <j:set var="expectedFile"
- value="${maven.build.dir}/commons-lang-2.0.jar"/>
- <u:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} should have been copied</fail>
- </j:if>
+ <assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
+ <assert:assertFileExists file="${maven.build.dir}/commons-lang-2.0.jar"/>
<attainGoal name="clean"/>
@@ -48,18 +39,8 @@
<deploy:copy-deps
todir="${maven.build.dir}"
excludes="commons-lang:commons-lang" />
- <j:set var="unExpectedFile"
- value="${maven.build.dir}/commons-lang-2.0.jar"/>
- <u:file var="file" name="${unExpectedFile}" />
- <j:if test="${(file.exists())}">
- <fail>${unExpectedFile} should not have been copied</fail>
- </j:if>
- <j:set var="expectedFile"
- value="${maven.build.dir}/commons-logging-1.0.3.jar"/>
- <u:file var="file" name="${expectedFile}" />
- <j:if test="${!(file.exists())}">
- <fail>${expectedFile} should have been copied</fail>
- </j:if>
+ <assert:assertFileNotFound file="${maven.build.dir}/commons-lang-2.0.jar"/>
+ <assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
</goal>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
