Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPCRUISECONTROL-10 Unit tests failing due to build status log element not being created

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
epugh 2004-07-30 08:21:10 +00:00
parent 7c9be9826e
commit 48aa345ae0
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cruisecontrol/src/plugin-resources/cruisecontrol.jsl
View File

@ -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>

10
cruisecontrol/src/plugin-test/cvs-scm/maven.xml
View File

@ -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">

2
cruisecontrol/src/plugin-test/cvs-scm/project.properties
View File

@ -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