You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/11 10:58:03 UTC
[maven-scm] branch mojotest created (now 0148295)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch mojotest
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
at 0148295 extract common code
This branch includes the following new commits:
new 0148295 extract common code
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-scm] 01/01: extract common code
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch mojotest
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 01482954990e28a11e0fb8ec95be76d6a355e6fc
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon May 11 06:57:39 2020 -0400
extract common code
---
.../org/apache/maven/scm/plugin/TagMojoTest.java | 39 +++++++---------------
1 file changed, 12 insertions(+), 27 deletions(-)
diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java
index ca5495b..54fb124 100644
--- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java
+++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/TagMojoTest.java
@@ -23,7 +23,6 @@ import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.scm.ScmTestCase;
import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -63,32 +62,29 @@ public class TagMojoTest
"src/test/resources/mojos/checkout/checkoutWithConnectionUrl.xml" ) );
checkoutMojo.setWorkingDirectory( new File( getBasedir() ) );
- String connectionUrl = checkoutMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace( connectionUrl, "${basedir}", getBasedir() );
- connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
- checkoutMojo.setConnectionUrl( connectionUrl );
+ setupConnectionUrl( checkoutMojo );
checkoutMojo.setCheckoutDirectory( checkoutDir );
checkoutMojo.execute();
}
+ private static void setupConnectionUrl( AbstractScmMojo mojo )
+ {
+ String connectionUrl = mojo.getConnectionUrl();
+ connectionUrl = connectionUrl.replace( "${basedir}", getBasedir() );
+ connectionUrl = connectionUrl.replace( '\\', '/' );
+ mojo.setConnectionUrl( connectionUrl );
+ }
+
public void testTag()
throws Exception
{
- if ( !ScmTestCase.isSystemCmd( SvnScmTestUtils.SVNADMIN_COMMAND_LINE ) )
- {
- ScmTestCase.printSystemCmdUnavail( SvnScmTestUtils.SVNADMIN_COMMAND_LINE, getName() );
- return;
- }
TagMojo mojo = (TagMojo) lookupMojo( "tag", getTestFile( "src/test/resources/mojos/tag/tag.xml" ) );
mojo.setWorkingDirectory( checkoutDir );
- String connectionUrl = mojo.getConnectionUrl();
- connectionUrl = StringUtils.replace( connectionUrl, "${basedir}", getBasedir() );
- connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
- mojo.setConnectionUrl( connectionUrl );
+ setupConnectionUrl( mojo );
mojo.execute();
@@ -102,10 +98,7 @@ public class TagMojoTest
(CheckoutMojo) lookupMojo( "checkout", getTestFile( "src/test/resources/mojos/tag/checkout.xml" ) );
checkoutMojo.setWorkingDirectory( new File( getBasedir() ) );
- connectionUrl = checkoutMojo.getConnectionUrl();
- connectionUrl = StringUtils.replace( connectionUrl, "${basedir}", getBasedir() );
- connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
- checkoutMojo.setConnectionUrl( connectionUrl );
+ setupConnectionUrl( checkoutMojo );
File tagCheckoutDir = getTestFile( "target/tags/mytag" );
if ( tagCheckoutDir.exists() )
@@ -122,20 +115,12 @@ public class TagMojoTest
public void testTagWithTimestamp()
throws Exception
{
- if ( !ScmTestCase.isSystemCmd( SvnScmTestUtils.SVN_COMMAND_LINE ) )
- {
- ScmTestCase.printSystemCmdUnavail( SvnScmTestUtils.SVN_COMMAND_LINE, getName() );
- return;
- }
TagMojo mojo =
(TagMojo) lookupMojo( "tag", getTestFile( "src/test/resources/mojos/tag/tagWithTimestamp.xml" ) );
mojo.setWorkingDirectory( checkoutDir );
- String connectionUrl = mojo.getConnectionUrl();
- connectionUrl = StringUtils.replace( connectionUrl, "${basedir}", getBasedir() );
- connectionUrl = StringUtils.replace( connectionUrl, "\\", "/" );
- mojo.setConnectionUrl( connectionUrl );
+ setupConnectionUrl( mojo );
mojo.execute();
}