Fix tests that had broken in earlier commit of making CC more flexible.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116154 13f79535-47bb-0310-9956-ffa450edef68

cruisecontrol/src/plugin-test/cvs-scm/maven.xml

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

cruisecontrol/src/plugin-test/cvs-scm/project.properties

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

cruisecontrol/src/plugin-test/svn-scm/maven.xml

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

cruisecontrol/src/plugin-test/svn-scm/project.properties

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