svn commit: r1329158 - in /maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src: main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java

[ol...@apache.org]

Author: olamy
Date: Mon Apr 23 10:11:18 2012
New Revision: 1329158

URL: http://svn.apache.org/viewvc?rev=1329158&view=rev
Log:
fix jazz provider test on unix

Modified:
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java?rev=1329158&r1=1329157&r2=1329158&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommand.java Mon Apr 23 10:11:18 2012
@@ -155,7 +155,7 @@ public class JazzScmCommand
         Iterator<File> iter = fileSet.getFileList().iterator();
         while ( iter.hasNext() )
         {
-            fCommand.createArg().setValue( ( (File) iter.next() ).getPath() );
+            fCommand.createArg().setValue(  iter.next().getPath() );
         }
     }
 
@@ -256,7 +256,7 @@ public class JazzScmCommand
             }
             else
             {
-                clString = beforePassword + "'*****'" + afterPassword;
+                clString = beforePassword + "'*****'";
             }
         }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java?rev=1329158&r1=1329157&r2=1329158&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/test/java/org/apache/maven/scm/provider/jazz/command/JazzScmCommandTest.java Mon Apr 23 10:11:18 2012
@@ -1,6 +1,9 @@
 package org.apache.maven.scm.provider.jazz.command;
 
+import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.provider.jazz.JazzScmTestCase;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.cli.Commandline;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,20 +36,27 @@ public class JazzScmCommandTest
     }
 
     public void testJazzScmCommand()
+        throws Exception
     {
-        JazzScmCommand listCommand = new JazzScmCommand( "list", getScmProviderRepository(), null, null );
-        String actual = listCommand.getCommandline().toString();
+        ScmFileSet scmFileSet = new ScmFileSet( getWorkingCopy() );
+        JazzScmCommand listCommand = new JazzScmCommand( "list", getScmProviderRepository(), scmFileSet, null );
         String expected =
-            "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword\"";
-        assertEquals( "Constructing command line failed!", expected, actual );
+            "scm list --repository-uri https://localhost:9443/jazz --username myUserName --password myPassword";
+
+        assertCommandLine( expected, getWorkingDirectory(), listCommand.getCommandline() );
+
     }
 
     public void testCryptPassword()
+        throws Exception
     {
         JazzScmCommand listCommand = new JazzScmCommand( "list", getScmProviderRepository(), null, null );
         String actual = JazzScmCommand.cryptPassword( listCommand.getCommandline() );
-        String expected =
-            "cmd.exe /X /C \"scm list --repository-uri https://localhost:9443/jazz --username myUserName --password *****\"";
+        String expected = Os.isFamily( Os.FAMILY_WINDOWS )
+            ? "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 );
     }
 }