Changed: Fixed the failing changeset associate test (on unix). Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/90986823 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/90986823 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/90986823
Branch: refs/heads/master Commit: 909868237bdd00af70989137879316943098e4f5 Parents: 416ada2 Author: Chris Graham <chrisgw...@gmail.com> Authored: Fri May 1 12:10:17 2015 +1000 Committer: Chris Graham <chrisgw...@apache.org> Committed: Thu May 7 12:04:23 2015 +1000 ---------------------------------------------------------------------- .../apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java | 1 - .../scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/90986823/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java index e5e822a..8cfcb60 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java @@ -56,7 +56,6 @@ public class JazzScmCommandTest ? "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password *****\"" : "/bin/sh -c scm list --repository-uri https://localhost:9443/jazz --username myUserName --password '*****'"; - System.out.println( "actual:" + actual ); assertEquals( "cryptPassword failed!", expected, actual ); } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/90986823/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java index 55349fd..b30bfcf 100644 --- a/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java +++ b/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommandTest.java @@ -63,6 +63,8 @@ public class JazzCheckInCommandTest repo.setWorkItem( "215762" ); repo.setChangeSetAlias( 1234 ); Commandline cmd = new JazzCheckInCommand().createChangesetAssociateCommand( repo ).getCommandline(); + // Because we do not use a ScmFileSet, the working dir is not set, so the test fails. + cmd.setWorkingDirectory( getWorkingDirectory() ); String expected = "scm changeset associate --username myUserName --password myPassword 1234 215762"; assertCommandLine( expected, getWorkingDirectory(), cmd ); }