brett 2003/12/09 15:33:22
Modified: src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
Log:
preGoal/postGoal count test
Revision Changes Path
No revision
No revision
1.43.4.2 +45 -7 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.1
retrieving revision 1.43.4.2
diff -u -r1.43.4.1 -r1.43.4.2
--- maven.xml 26 Nov 2003 11:45:17 -0000 1.43.4.1
+++ maven.xml 9 Dec 2003 23:33:22 -0000 1.43.4.2
@@ -5,7 +5,6 @@
xmlns:u="jelly:util"
xmlns:i="jelly:interaction"
xmlns:maven="jelly:maven"
- xmlns:test="jelly:junit"
xmlns:define="jelly:define"
xmlns:sea="sea"
xmlns:deploy="deploy">
@@ -143,7 +142,6 @@
</fail>
</j:if>
<j:set var="checkValue"
value="${pom.getPluginContext('maven-touchstone-partner-plugin').getVariable('touchstone_partner_postGoal_C')}"/>
-<echo>${checkValue}</echo>
<j:if test="${checkValue != 'true'}">
<fail message="">
@@ -175,7 +173,6 @@
</fail>
</j:if>
-
<attainGoal name="test-mavenjellyscope"/>
<j:if test="${context.findVariable('test-mavenjellyscope') != 'success'}">
<fail>
@@ -190,6 +187,11 @@
<attainGoal name="test-make-absolute-path" />
<attainGoal name="test-make-relative-path" />
+
+<!-- TODO [RC2] - re-enable
+ <attainGoal name="test-preGoal-counter" />
+ <attainGoal name="test-postGoal-counter" />
+-->
</goal>
<!--
@@ -537,11 +539,14 @@
xmlns:testmavenjellyscope="test-mavenjellyscope"
name="test-mavenjellyscope"
description="throws a ClassCastException when loading the jelly script from a
nested maven session.">
- <!--
+ <!--
+ |
+ | The purpose of this defined tag is to get jelly to create a new scope
+ | from the one it has.
+ | If the factory methods aren't defined, then the scope is not the
+ | correct type, and BaseTagSupport.getMavenContext throws a
+ | ClassCastException.
|
- | The purpose of this defined tag is to get jelly to create a new scope from
the one it has.
- | If the factory methods aren't defined, then the scope is not the correct
type, and
- | BaseTagSupport.getMavenContext throws a ClassCastException.
-->
<define:taglib uri="test-mavenjellyscope">
<define:tag name="runmaven">
@@ -667,4 +672,37 @@
</preGoal>
+ <goal name="test-preGoal-counter">
+ <j:set var="counterPre" scope="parent" value="0" />
+ <attainGoal name="counter-pre"/>
+ <j:if test="${counterPre != 1}">
+ <fail>counterPre should be '1', but is '${counterPre}'</fail>
+ </j:if>
+ </goal>
+
+ <preGoal name="counter-pre">
+ <j:set var="counterPre" scope="parent" value="${counterPre + 1}" />
+ </preGoal>
+
+ <goal name="counter-pre">
+ <echo>counter-pre</echo>
+ </goal>
+
+ <goal name="test-postGoal-counter">
+ <j:set var="counterPost" scope="parent" value="0" />
+ <attainGoal name="counter-post"/>
+ <j:if test="${counterPost != 1}">
+ <fail>counterPost should be '1', but is '${counterPost}'</fail>
+ </j:if>
+ </goal>
+
+ <postGoal name="counter-post">
+ <j:set var="counterPost" scope="parent" value="${counterPost + 1}" />
+ </postGoal>
+
+ <goal name="counter-post">
+ <echo>counter-post</echo>
+ </goal>
+
</project>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
