maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject cvs commit: maven-wagon/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh ScpWagonTest.java ScpWagonWithSshPrivateKeySearchTest.java
Date Tue, 26 Oct 2004 18:52:30 GMT
michal      2004/10/26 11:52:30

  Modified:    wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh
                        ScpWagonTest.java
                        ScpWagonWithSshPrivateKeySearchTest.java
  Log:
  trting to make test pass in continuum for ssh provider
  
  Revision  Changes    Path
  1.3       +8 -20     maven-wagon/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java
  
  Index: ScpWagonTest.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ScpWagonTest.java	30 Sep 2004 13:29:17 -0000	1.2
  +++ ScpWagonTest.java	26 Oct 2004 18:52:30 -0000	1.3
  @@ -38,20 +38,22 @@
           return "scp";
       }
   
  -    protected String getTestRepositoryUrl()
  +    public String getTestRepositoryUrl()
       {
  -        return "scp://beaver.codehaus.org//home/users/" + getUserName() + "/public_html";
  +        return TestData.getTestRepositoryUrl();
       }
   
  +
  +
       protected AuthenticationInfo getAuthInfo()
       {
           AuthenticationInfo authInfo = new AuthenticationInfo();
   
  -        String userName = getUserName();
  +        String userName = TestData.getUserName();
   
           authInfo.setUserName( userName );
   
  -        File privateKey = new File( System.getProperty( "user.home" ), "/.ssh/id_dsa" );
  +        File privateKey = TestData.getPrivateKey() ;
   
           if ( privateKey.exists() )
           {
  @@ -60,23 +62,9 @@
               authInfo.setPassphrase( "" );
           }
   
  -        authInfo.setGroup( getUserName() );
  +        authInfo.setGroup( userName );
   
           return authInfo;
  -    }
  -
  -
  -    private String getUserName()
  -    {
  -
  -        String retValue = System.getProperty( "testuser.name" );
  -
  -        if ( retValue == null )
  -        {
  -            retValue = System.getProperty( "user.name" );
  -        }
  -
  -        return retValue;
       }
   
   }
  
  
  
  1.3       +6 -16     maven-wagon/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java
  
  Index: ScpWagonWithSshPrivateKeySearchTest.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/ScpWagonWithSshPrivateKeySearchTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ScpWagonWithSshPrivateKeySearchTest.java	30 Sep 2004 13:29:17 -0000	1.2
  +++ ScpWagonWithSshPrivateKeySearchTest.java	26 Oct 2004 18:52:30 -0000	1.3
  @@ -37,36 +37,26 @@
           return "scp";
       }
   
  -    protected String getTestRepositoryUrl()
  +    public String getTestRepositoryUrl()
       {
  -        return "scp://beaver.codehaus.org//home/users/" + getUserName() + "/public_html";
  +        return TestData.getTestRepositoryUrl();
       }
   
  +
       protected AuthenticationInfo getAuthInfo()
       {
           AuthenticationInfo authInfo = new AuthenticationInfo();
   
  -        String userName = getUserName();
  +        String userName = TestData.getUserName();
   
           authInfo.setUserName( userName );
   
           authInfo.setPassphrase( "" );
   
  -        authInfo.setGroup( getUserName() );
  +        authInfo.setGroup( userName );
   
           return authInfo;
       }
   
  -    private String getUserName()
  -    {
  -
  -        String retValue = System.getProperty( "testuser.name" );
   
  -        if ( retValue == null )
  -        {
  -            retValue = System.getProperty( "user.name" );
  -        }
  -
  -        return retValue;
  -    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org


Mime
View raw message