Author: evenisse Date: Thu Apr 19 01:48:36 2007 New Revision: 530333 URL: http://svn.apache.org/viewvc?view=rev&rev=530333 Log: [MRELEASE-128] Add tests
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java?view=diff&rev=530333&r1=530332&r2=530333 ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java (original) +++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java Thu Apr 19 01:48:36 2007 @@ -216,9 +216,9 @@ mapNextVersion( config, "groupId:artifactId" ); Scm scm = new Scm(); - scm.setConnection( "scm:cvs:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module" ); - scm.setDeveloperConnection( "scm:cvs:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module" ); - scm.setUrl( "http://localhost/viewcvs.cgi/module" ); + scm.setConnection( "${scm.base}:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module" ); + scm.setDeveloperConnection( "${scm.base}:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module" ); + scm.setUrl( "${baseUrl}/module" ); config.mapOriginalScmInfo( "groupId:artifactId", scm ); phase.execute( config, null, reactorProjects ); Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml?view=diff&rev=530333&r1=530332&r2=530333 ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml (original) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/expected-pom.xml Thu Apr 19 01:48:36 2007 @@ -27,8 +27,12 @@ </prerequisites> <scm> - <connection>scm:cvs:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> - <developerConnection>scm:cvs:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> - <url>http://localhost/viewcvs.cgi/module</url> + <connection>${scm.base}:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> + <developerConnection>${scm.base}:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> + <url>${baseUrl}/module</url> </scm> + <properties> + <scm.base>scm:cvs</scm.base> + <baseUrl>http://localhost/viewcvs.cgi</baseUrl> + </properties> </project> Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml?view=diff&rev=530333&r1=530332&r2=530333 ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml (original) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-development/basic-pom-with-cvs/pom.xml Thu Apr 19 01:48:36 2007 @@ -27,9 +27,13 @@ </prerequisites> <scm> - <connection>scm:cvs:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> - <developerConnection>scm:cvs:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> - <url>http://localhost/viewcvs.cgi/module</url> + <connection>${scm.base}:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> + <developerConnection>${scm.base}:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> + <url>${baseUrl}/module</url> <tag>release-label</tag> </scm> + <properties> + <scm.base>scm:cvs</scm.base> + <baseUrl>http://localhost/viewcvs.cgi</baseUrl> + </properties> </project> Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml?view=diff&rev=530333&r1=530332&r2=530333 ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml (original) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/expected-pom.xml Thu Apr 19 01:48:36 2007 @@ -27,9 +27,13 @@ </prerequisites> <scm> - <connection>scm:cvs:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> - <developerConnection>scm:cvs:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> - <url>http://localhost/viewcvs.cgi/module</url> + <connection>${scm.base}:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> + <developerConnection>${scm.base}:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> + <url>${baseUrl}/module</url> <tag>release-label</tag> </scm> + <properties> + <scm.base>scm:cvs</scm.base> + <baseUrl>http://localhost/viewcvs.cgi</baseUrl> + </properties> </project> Modified: maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml?view=diff&rev=530333&r1=530332&r2=530333 ============================================================================== --- maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml (original) +++ maven/release/trunk/maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs-from-tag/pom.xml Thu Apr 19 01:48:36 2007 @@ -27,9 +27,13 @@ </prerequisites> <scm> - <connection>scm:cvs:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> - <developerConnection>scm:cvs:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> - <url>http://localhost/viewcvs.cgi/module</url> + <connection>${scm.base}:pserver:[EMAIL PROTECTED]:/tmp/scm-repo:module</connection> + <developerConnection>${scm.base}:ext:[EMAIL PROTECTED]:/tmp/scm-repo:module</developerConnection> + <url>${baseUrl}/module</url> <tag>original-tag</tag> </scm> + <properties> + <scm.base>scm:cvs</scm.base> + <baseUrl>http://localhost/viewcvs.cgi</baseUrl> + </properties> </project>