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 12:08:31 UTC
[maven-scm] branch master updated: [SCM-936] extract common code
(#102)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new 8a731b3 [SCM-936] extract common code (#102)
8a731b3 is described below
commit 8a731b377d95c27a8cb2d509f81733bdebced628
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon May 11 08:08:21 2020 -0400
[SCM-936] extract common code (#102)
* extract common code
* assume scm exists
---
.../org/apache/maven/scm/plugin/TagMojoTest.java | 52 ++++++----------------
1 file changed, 14 insertions(+), 38 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..f08a27d 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,7 @@ 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 org.junit.Assume;
import java.io.File;
@@ -51,11 +51,7 @@ public class TagMojoTest
FileUtils.forceDelete( repository );
- if ( !ScmTestCase.isSystemCmd( SvnScmTestUtils.SVNADMIN_COMMAND_LINE ) )
- {
- ScmTestCase.printSystemCmdUnavail( SvnScmTestUtils.SVNADMIN_COMMAND_LINE, "setUp" );
- return;
- }
+ Assume.assumeTrue( ScmTestCase.isSystemCmd( SvnScmTestUtils.SVNADMIN_COMMAND_LINE ) );
SvnScmTestUtils.initializeRepository( repository );
@@ -63,49 +59,37 @@ 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();
- if ( !ScmTestCase.isSystemCmd( SvnScmTestUtils.SVN_COMMAND_LINE ) )
- {
- ScmTestCase.printSystemCmdUnavail( SvnScmTestUtils.SVN_COMMAND_LINE, getName() );
- return;
- }
-
CheckoutMojo checkoutMojo =
(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 +106,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();
}