maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject cvs commit: maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/update SvnUpdateCommandTest.java
Date Wed, 28 Apr 2004 13:01:49 GMT
evenisse    2004/04/28 06:01:49

  Modified:    scm-api/src/main/java/org/apache/maven/scm/util
                        Commandline.java
               scm-api/src/test/java/org/apache/maven/scm/util
                        CommandlineTest.java
               scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog
                        ClearcaseChangeLogCommandTest.java
               scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout
                        ClearcaseCheckOutCommandTest.java
               scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog
                        CvsChangeLogCommandTest.java
               scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout
                        CvsCheckoutCommandTest.java
               scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/tag
                        CvsTagCommandTest.java
               scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/update
                        CvsUpdateCommandTest.java
               scm-providers/perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog
                        PerforceChangeLogCommandTest.java
               scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog
                        StarteamChangeLogCommandTest.java
               scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout
                        StarteamCheckOutCommandTest.java
               scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog
                        SvnChangeLogCommandTest.java
               scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout
                        SvnCheckOutCommandTest.java
               scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/update
                        SvnUpdateCommandTest.java
  Log:
  Rework the use of shell. It now transparent for providers.
  
  Revision  Changes    Path
  1.3       +33 -6     maven-scm/scm-api/src/main/java/org/apache/maven/scm/util/Commandline.java
  
  Index: Commandline.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-api/src/main/java/org/apache/maven/scm/util/Commandline.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Commandline.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ Commandline.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -251,17 +251,28 @@
        * <p>Gets the shell or command-line interpretor for the detected operating system,

        * and the shell arguments.</p>
        */
  -    public String getDefaultShell()
  +    private String getDefaultShell()
       {
           if ( shell != null )
           {
               String args = "";
               for (Enumeration enum = shellArgs.elements(); enum.hasMoreElements(); )
               {
  -                args += (String)enum.nextElement() + " ";
  +                args += (String)enum.nextElement();
  +                if (enum.hasMoreElements())
  +                {
  +                    args += " ";
  +                }
               }
               
  -            return shell + " " + args;
  +            if (args.length() > 0)
  +            {
  +                return shell + " " + args;
  +            }
  +            else
  +            {
  +                return shell;
  +            }
           }
           else
           {
  @@ -332,11 +343,27 @@
               createArgument().setValue( line[i] );
           }
       }
  +    
  +    /**
  +     * Returns the executable and all defined arguments.
  +     */
  +    public String[] getCommandline()
  +    {
  +        final String[] args = getArguments();
  +        if ( executable == null )
  +        {
  +            return args;
  +        }
  +        final String[] result = new String[args.length + 1];
  +        result[0] = executable;
  +        System.arraycopy( args, 0, result, 1, args.length );
  +        return result;
  +    }
   
       /**
        * Returns the shell, executable and all defined arguments.
        */
  -    public String[] getCommandline()
  +    public String[] getShellCommandline()
       {
           int shellCount = 0;
           int arrayPos = 0;
  @@ -624,7 +651,7 @@
           if ( workingDir == null )
           {
               System.err.println( "Executing \"" + this + "\"" );
  -            process = Runtime.getRuntime().exec( getCommandline() );
  +            process = Runtime.getRuntime().exec( getShellCommandline() );
           }
           else
           {
  @@ -633,7 +660,7 @@
                   + this
                   + "\" in directory "
                   + ( workingDir != null ? workingDir.getAbsolutePath() : null ) );
  -            process = Runtime.getRuntime().exec( getCommandline(), null, workingDir );
  +            process = Runtime.getRuntime().exec( getShellCommandline(), null, workingDir
);
           }
   
           return process;
  
  
  
  1.3       +6 -20     maven-scm/scm-api/src/test/java/org/apache/maven/scm/util/CommandlineTest.java
  
  Index: CommandlineTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-api/src/test/java/org/apache/maven/scm/util/CommandlineTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CommandlineTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ CommandlineTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -24,7 +24,6 @@
   public class CommandlineTest extends TestCase
   {
       private String baseDir;
  -    private String shellStringValue = "";
       
       /**
        * @param testName
  @@ -42,18 +41,6 @@
           super.setUp();
           baseDir = System.getProperty("basedir");
           assertNotNull("The system property basedir was not defined.", baseDir);
  -        
  -        //Set the shell string to assert against
  -        Commandline cmd = new Commandline();
  -        shellStringValue = cmd.toString() + ((cmd.toString().length() > 0)? " ":"");
  -
  -        //Validate cmd.exe or command.com for windows
  -        if ( System.getProperty( "os.name" ).indexOf( "Windows" ) > -1 )
  -        {
  -            int shellPosition = cmd.toString().indexOf( "CMD.EXE" );
  -            shellPosition += cmd.toString().indexOf( "COMMAND.COM" );
  -            assertTrue( shellPosition > -2 );
  -        }
       }
       
       public void testCommandlineWithoutArgumentInConstructor()
  @@ -64,7 +51,7 @@
               cmd.setWorkingDirectory(baseDir);
               cmd.createArgument().setValue("cd");
               cmd.createArgument().setValue(".");
  -            assertEquals(shellStringValue + "cd .", cmd.toString());
  +            assertEquals("cd .", cmd.toString());
           }
           catch(Exception e)
           {
  @@ -78,7 +65,7 @@
           {
               Commandline cmd = new Commandline("cd .");
               cmd.setWorkingDirectory(baseDir);
  -            assertEquals(shellStringValue + "cd .", cmd.toString());
  +            assertEquals("cd .", cmd.toString());
           }
           catch(Exception e)
           {
  @@ -95,7 +82,7 @@
               cmd.setExecutable("echo");
               assertEquals("echo", cmd.getExecutable());
               cmd.createArgument().setValue("Hello");
  -            assertEquals(shellStringValue + "echo Hello", cmd.toString());
  +            assertEquals("echo Hello", cmd.toString());
               cmd.execute();
           }
           catch(Exception e)
  @@ -113,7 +100,7 @@
               cmd.setExecutable("echo");
               cmd.createArgument().setLine(null);
               cmd.createArgument().setLine("Hello");
  -            assertEquals(shellStringValue + "echo Hello", cmd.toString());
  +            assertEquals("echo Hello", cmd.toString());
           }
           catch(Exception e)
           {
  @@ -129,7 +116,7 @@
               cmd.setWorkingDirectory(baseDir);
               cmd.createArgument().setValue(".");
               cmd.createArgument(true).setValue("cd");
  -            assertEquals(shellStringValue + "cd .", cmd.toString());
  +            assertEquals("cd .", cmd.toString());
           }
           catch(Exception e)
           {
  @@ -146,7 +133,7 @@
               cmd.createArgument().setValue("more");
               File f = new File("test.txt");
               cmd.createArgument().setFile(f);
  -            assertEquals(shellStringValue + "more "+f.getAbsoluteFile(), cmd.toString());
  +            assertEquals("more "+f.getAbsoluteFile(), cmd.toString());
           }
           catch(Exception e)
           {
  @@ -183,4 +170,3 @@
       }
       
   }
  -
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearcaseChangeLogCommandTest.java
  
  Index: ClearcaseChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearcaseChangeLogCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClearcaseChangeLogCommandTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ ClearcaseChangeLogCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -64,7 +64,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cleartool lshistory -fmt \"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o
- %o - %c - Activity: %[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco",
  +                "cleartool lshistory -fmt \"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o -
%c - Activity: %[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco",
                   cl.toString());
           }
           catch(Exception e)
  @@ -82,7 +82,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cleartool lshistory -fmt \"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o
- %o - %c - Activity: %[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco -branch myBranch",
  +                "cleartool lshistory -fmt \"NAME:%En\\nDATE:%Nd\\nCOMM:%-12.12o - %o -
%c - Activity: %[activity]p\\nUSER:%-8.8u\\n\" -recurse -nco -branch myBranch",
                   cl.toString());
           }
           catch(Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearcaseCheckOutCommandTest.java
  
  Index: ClearcaseCheckOutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/clearcase/src/test/java/org/apache/maven/scm/provider/clearcase/command/checkout/ClearcaseCheckOutCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClearcaseCheckOutCommandTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ ClearcaseCheckOutCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -87,7 +87,7 @@
               Commandline cl = cmd.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cleartool co -branch myBranch",
  +                "cleartool co -branch myBranch",
                   cl.toString());
           }
           catch(ScmException e)
  @@ -103,7 +103,7 @@
               Commandline cl = cmd.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cleartool co",
  +                "cleartool co",
                   cl.toString());
           }
           catch(ScmException e)
  
  
  
  1.3       +4 -4      maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
  
  Index: CvsChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CvsChangeLogCommandTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ CvsChangeLogCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -71,7 +71,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic
-q log -d2003-09-10<2003-10-10",
  +                "cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -q log -d2003-09-10<2003-10-10",
                   cl.toString());
           }
           catch (Exception e)
  @@ -96,7 +96,7 @@
   			Commandline cl = instance.getCommandLine();
   			System.out.println(cl.toString());
   			assertEquals(
  -				cl.getDefaultShell()+"cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -q log
-d>2003-09-10",
  +				"cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -q log -d>2003-09-10",
   				cl.toString());
   		}
   		catch (Exception e)
  @@ -118,7 +118,7 @@
   			Commandline cl = instance.getCommandLine();
   			System.out.println(cl.toString());
   			assertEquals(
  -				cl.getDefaultShell()+"cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -q log
-rbranchName",
  +				"cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -q log -rbranchName",
   				cl.toString());
   		}
   		catch (Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java
  
  Index: CvsCheckoutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CvsCheckoutCommandTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ CvsCheckoutCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -67,7 +67,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic
-q checkout test-repo",
  +                "cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic -q checkout
test-repo",
                   cl.toString());
   
               String workingDir = baseDir + "/target/testrepo/cvslib/checkout/";
  @@ -105,7 +105,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic
-q checkout -rmyTag test-repo",
  +                "cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic -q checkout
-rmyTag test-repo",
                   cl.toString());
           }
           catch(ScmException e)
  
  
  
  1.3       +2 -2      maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommandTest.java
  
  Index: CvsTagCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CvsTagCommandTest.java	27 Apr 2004 14:12:13 -0000	1.2
  +++ CvsTagCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -66,7 +66,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic
-q tag -c my_tag",
  +                "cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic -q tag -c my_tag",
                   cl.toString());
           }
           catch (Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
  
  Index: CvsUpdateCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/cvslib/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CvsUpdateCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ CvsUpdateCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -86,7 +86,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic
-q update test-repo",
  +                "cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic -q update test-repo",
                   cl.toString());
   
               instance.setWorkingDirectory(workingDir);
  @@ -118,7 +118,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic
-q update -rmyTag test-repo",
  +                "cvs -d :pserver:anonymous@cvs.codehaus.org:/scm/cvspublic -q update -rmyTag
test-repo",
                   cl.toString());
           }
           catch (Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java
  
  Index: PerforceChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PerforceChangeLogCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ PerforceChangeLogCommandTest.java	28 Apr 2004 13:01:48 -0000	1.3
  @@ -64,7 +64,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"p4 filelog -tl //depot/projects/pathname",
  +                "p4 filelog -tl //depot/projects/pathname",
                   cl.toString());
           }
           catch(Exception e)
  @@ -84,7 +84,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"p4 -p myhost:1234 -u username -P myPassword filelog
-tl //depot/projects/pathname",
  +                "p4 -p myhost:1234 -u username -P myPassword filelog -tl //depot/projects/pathname",
                   cl.toString());
           }
           catch(Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java
  
  Index: StarteamChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StarteamChangeLogCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ StarteamChangeLogCommandTest.java	28 Apr 2004 13:01:49 -0000	1.3
  @@ -64,7 +64,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"stcmd hist -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl",
  +                "stcmd hist -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl",
                   cl.toString());
           }
           catch(Exception e)
  @@ -81,7 +81,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"stcmd hist -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl
-vl myTag",
  +                "stcmd hist -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl
-vl myTag",
                   cl.toString());
           }
           catch(Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java
  
  Index: StarteamCheckOutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/starteam/src/test/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StarteamCheckOutCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ StarteamCheckOutCommandTest.java	28 Apr 2004 13:01:49 -0000	1.3
  @@ -90,7 +90,7 @@
               Commandline cl = cmd.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"stcmd co -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl
-vl myTag",
  +                "stcmd co -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl
-vl myTag",
                   cl.toString());
           }
           catch(ScmException e)
  @@ -106,7 +106,7 @@
               Commandline cl = cmd.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"stcmd co -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl",
  +                "stcmd co -x -nologo -is -p myusername:mypassword@myhost:1234/projecturl",
                   cl.toString());
           }
           catch(ScmException e)
  
  
  
  1.3       +5 -5      maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommandTest.java
  
  Index: SvnChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnChangeLogCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ SvnChangeLogCommandTest.java	28 Apr 2004 13:01:49 -0000	1.3
  @@ -71,7 +71,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn log --non-interactive -v -r \"{2003/09/10 GMT}:{2003/10/10
GMT}\" http://foo.com/svn/trunk",
  +                "svn log --non-interactive -v -r \"{2003/09/10 GMT}:{2003/10/10 GMT}\"
http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  @@ -95,7 +95,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn log --non-interactive -v -r \"{2003/09/10 GMT}:HEAD\"
http://foo.com/svn/trunk",
  +                "svn log --non-interactive -v -r \"{2003/09/10 GMT}:HEAD\" http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  @@ -118,7 +118,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn log --non-interactive -v -r 3 --username anonymous
--password passwd http://foo.com/svn/trunk",
  +                "svn log --non-interactive -v -r 3 --username anonymous --password passwd
http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  @@ -140,7 +140,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn log --non-interactive -v --username anonymous
--password passwd http://foo.com/svn/trunk",
  +                "svn log --non-interactive -v --username anonymous --password passwd http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTest.java
  
  Index: SvnCheckOutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnCheckOutCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ SvnCheckOutCommandTest.java	28 Apr 2004 13:01:49 -0000	1.3
  @@ -62,7 +62,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn checkout --non-interactive -v -r 10 --username
anonymous --password passwd http://foo.com/svn/trunk",
  +                "svn checkout --non-interactive -v -r 10 --username anonymous --password
passwd http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  @@ -83,7 +83,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn checkout --non-interactive -v http://foo.com/svn/trunk",
  +                "svn checkout --non-interactive -v http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  
  
  
  1.3       +3 -3      maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTest.java
  
  Index: SvnUpdateCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/scm-providers/svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnUpdateCommandTest.java	27 Apr 2004 14:12:14 -0000	1.2
  +++ SvnUpdateCommandTest.java	28 Apr 2004 13:01:49 -0000	1.3
  @@ -62,7 +62,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn update --non-interactive -v -r 10 --username
anonymous --password passwd http://foo.com/svn/trunk",
  +                "svn update --non-interactive -v -r 10 --username anonymous --password
passwd http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  @@ -83,7 +83,7 @@
               Commandline cl = instance.getCommandLine();
               System.out.println(cl.toString());
               assertEquals(
  -                cl.getDefaultShell()+"svn update --non-interactive -v http://foo.com/svn/trunk",
  +                "svn update --non-interactive -v http://foo.com/svn/trunk",
                   cl.toString());
           }
           catch (Exception e)
  
  
  

Mime
View raw message