Updated Branches: refs/heads/master b84f2aa76 -> 4419eb77a
Fix test for Windows Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/4419eb77 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/4419eb77 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/4419eb77 Branch: refs/heads/master Commit: 4419eb77a28e06d8d0af7128dcac9b80a9e0019a Parents: b84f2aa Author: rfscholte <rfscho...@apache.org> Authored: Sun Jan 20 14:01:15 2013 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Sun Jan 20 14:01:15 2013 +0100 ---------------------------------------------------------------------- .../apache/maven/scm/provider/hg/HgUtilsTest.java | 17 +++++++++++++- 1 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/4419eb77/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java index 6fbef80..0be95b7 100644 --- a/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java +++ b/maven-scm-providers/maven-scm-provider-hg/src/test/java/org/apache/maven/scm/provider/hg/HgUtilsTest.java @@ -19,9 +19,10 @@ package org.apache.maven.scm.provider.hg; * under the License. */ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.apache.maven.scm.provider.hg.command.HgCommandConstants; +import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.Commandline; import org.junit.Test; @@ -46,6 +47,18 @@ public class HgUtilsTest "https://username:passw...@example.com/foobar"; } ); Commandline cmd = new Commandline( HgUtils.maskPassword( cmdHttps ) ); - assertEquals( "https://username:*****@example.com/foobar";, cmd.getArguments()[3] ); + + String[] shellArgs = cmd.getShell().getShellArgs(); + if ( shellArgs != null ) + { + // [/C, hg push https://username:*****@example.com/foobar] + // [/X, /C, hg push https://username:*****@example.com/foobar] + assertEquals( "https://username:*****@example.com/foobar";, + StringUtils.split( cmd.getArguments()[shellArgs.length] )[2] ); + } + else + { + assertEquals( "https://username:*****@example.com/foobar";, cmd.getArguments()[3] ); + } } }
