epugh 2004/07/30 01:21:10
Modified: cruisecontrol/src/plugin-test/cvs-scm maven.xml
project.properties
cruisecontrol/src/plugin-resources cruisecontrol.jsl
Log:
MPCRUISECONTROL-10 Unit tests failing due to build status log element not being
created
Revision Changes Path
1.5 +6 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 23 Jul 2004 09:05:21 -0000 1.4
+++ maven.xml 30 Jul 2004 08:21:09 -0000 1.5
@@ -51,17 +51,19 @@
<goal name="test-cruisecontrol-jsl-file">
<attainGoal name="cruisecontrol"/>
-
+ <ant:echo message="Now testing cruisecontrol configuration:
${maven.cruisecontrol.config}"/>
+
<u:file var="cruisecontrolFile" name="${maven.cruisecontrol.config}"/>
<x:parse var="cruisecontrolDoc" xml="${cruisecontrolFile.toURL()}" />
+
<x:set var="count"
select="count($cruisecontrolDoc/cruisecontrol/project/modificationset/cvs)"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
+ <assert:assertEquals message="Looking for modification sets" expected="1"
value="${count.intValue().toString()}"/>
<x:set var="count"
select="count($cruisecontrolDoc/cruisecontrol/project/log/merge)"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
+ <assert:assertEquals message="Looking for log merge directories" expected="1"
value="${count.intValue().toString()}"/>
<x:set var="count"
select="count($cruisecontrolDoc/cruisecontrol/project/modificationset/buildstatus)"/>
- <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>
+ <assert:assertEquals message="Looking for build status" expected="1"
value="${count.intValue().toString()}"/>
</goal>
<goal name="test-report-link-to-cruisecontrol">
1.2 +1 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 23 Jul 2004 08:37:04 -0000 1.1
+++ project.properties 30 Jul 2004 08:21:09 -0000 1.2
@@ -16,7 +16,7 @@
# 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.config=${maven.build.dir}/cruisecontrol.xml
maven.cruisecontrol.home=${maven.build.dest}
maven.cruisecontrol.trigger.projects=svn-scm
1.11 +2 -2
maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
Index: cruisecontrol.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cruisecontrol.jsl 23 Jul 2004 08:37:37 -0000 1.10
+++ cruisecontrol.jsl 30 Jul 2004 08:21:10 -0000 1.11
@@ -55,9 +55,9 @@
</j:if>
<!-- Add the list of additional directories for the classpath from
${maven.eclipse.classpath.include}-->
- <u:tokenize var="maven.cruisecontrol.trigger.projects.split"
delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>
+ <u:tokenize var="triggerProjectsSplit"
delim=",">${maven.cruisecontrol.trigger.projects}</u:tokenize>
<!-- add extra directories to be included in the classpath -->
- <j:forEach var="triggerProject"
items="${maven.cruisecontrol.trigger.projects.split}">
+ <j:forEach var="triggerProject" items="${triggerProjectsSplit}">
<buildstatus
logdir="${maven.cruisecontrol.logs.dir}/${triggerProject}"/>
</j:forEach>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]