epugh 2004/10/19 09:02:22
Modified: cruisecontrol/src/plugin-test/svn-scm project.properties
maven.xml
cruisecontrol/src/plugin-test/cvs-scm maven.xml
project.properties
Log:
Fix tests that had broken in earlier commit of making CC more flexible.
Revision Changes Path
1.3 +1 -1
maven-plugins/cruisecontrol/src/plugin-test/svn-scm/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-test/svn-scm/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 23 Jul 2004 09:05:21 -0000 1.2
+++ project.properties 19 Oct 2004 16:02:22 -0000 1.3
@@ -18,6 +18,6 @@
# MUST specify these, even though they are the defaults, so we can run inside
reactor where they were already set
maven.cruisecontrol.config=${maven.build.dest}
maven.cruisecontrol.home=${maven.build.dest}
-maven.cruisecontrol.buildresults.site=http://sometest.server.com:8080
+maven.cruisecontrol.buildresults.url=http://sometest.server.com:8080
1.3 +3 -3 maven-plugins/cruisecontrol/src/plugin-test/svn-scm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/svn-scm/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 23 Jul 2004 09:05:21 -0000 1.2
+++ maven.xml 19 Oct 2004 16:02:22 -0000 1.3
@@ -43,8 +43,8 @@
<goal name="test-cruisecontrol-validate">
<attainGoal name="cruisecontrol:validate"/>
- <j:set var="method" value="${context.getVariable('maven.scm.method')}"/>
- <j:if test="${empty(method)}">
+ <maven:get var="method" plugin='maven-scm-plugin' property='maven.scm.method'
/>
+ <j:if test="${empty(method)}">
<ant:fail>method shouldn't be null</ant:fail>
</j:if>
</goal>
@@ -62,6 +62,6 @@
<goal name="test-report-link-to-cruisecontrol">
<attainGoal name="maven-cruisecontrol-plugin:report"/>
<j:set var="cruiseControlURL"
value="${context.getVariable('maven.cruisecontrol.buildresults.url')}"/>
- <assert:assertEquals
expected="http://sometest.server.com:8080/buildresults/test-maven-cruisecontrol-svn-plugin";
value="${cruiseControlURL.trim()}"/>
+ <assert:assertEquals expected="http://sometest.server.com:8080";
value="${cruiseControlURL.trim()}"/>
</goal>
</project>
1.7 +1 -1 maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 9 Aug 2004 15:47:57 -0000 1.6
+++ maven.xml 19 Oct 2004 16:02:22 -0000 1.7
@@ -43,7 +43,7 @@
<goal name="test-cruisecontrol-validate">
<attainGoal name="cruisecontrol:validate"/>
- <j:set var="method" value="${context.getVariable('maven.scm.method')}"/>
+ <maven:get var="method" plugin='maven-scm-plugin' property='maven.scm.method'
/>
<j:if test="${empty(method)}">
<ant:fail>method shouldn't be null</ant:fail>
</j:if>
1.3 +1 -0
maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-test/cvs-scm/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 30 Jul 2004 08:21:09 -0000 1.2
+++ project.properties 19 Oct 2004 16:02:22 -0000 1.3
@@ -19,5 +19,6 @@
maven.cruisecontrol.config=${maven.build.dir}/cruisecontrol.xml
maven.cruisecontrol.home=${maven.build.dest}
maven.cruisecontrol.trigger.projects=svn-scm
+maven.cruisecontrol.logs.merge=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
