You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/22 11:52:10 UTC
svn commit: r1174024 - in /maven/wagon/trunk/wagon-providers:
wagon-ssh-common-test/
wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/
wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/
Author: olamy
Date: Thu Sep 22 09:52:09 2011
New Revision: 1174024
URL: http://svn.apache.org/viewvc?rev=1174024&view=rev
Log:
[WAGON-350] add unit test for wagon ssh with an embedded ssh server : refactor to be able to share test with scp external module
Added:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java
- copied, changed from r1173861, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml?rev=1174024&r1=1174023&r2=1174024&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml Thu Sep 22 09:52:09 2011
@@ -42,6 +42,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-common</artifactId>
</dependency>
<dependency>
Copied: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java (from r1173861, maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java)
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java?p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java&r1=1173861&r2=1174024&rev=1174024&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractEmbeddedScpWagonTest.java Thu Sep 22 09:52:09 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.providers.ssh.jsch;
+package org.apache.maven.wagon.providers.ssh;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,6 @@ package org.apache.maven.wagon.providers
import org.apache.maven.wagon.StreamingWagonTestCase;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.maven.wagon.providers.ssh.SshServerEmbedded;
-import org.apache.maven.wagon.providers.ssh.TestData;
-import org.apache.maven.wagon.providers.ssh.TestPasswordAuthenticator;
import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
@@ -37,44 +34,13 @@ import java.util.Arrays;
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class EmbeddedScpWagonTest
+public abstract class AbstractEmbeddedScpWagonTest
extends StreamingWagonTestCase
{
SshServerEmbedded sshServerEmbedded;
@Override
- protected Wagon getWagon()
- throws Exception
- {
- ScpWagon scpWagon = (ScpWagon) super.getWagon();
- scpWagon.setInteractive( false );
- scpWagon.setKnownHostsProvider( new KnownHostsProvider()
- {
- public void storeKnownHosts( String contents )
- throws IOException
- {
-
- }
-
- public void setHostKeyChecking( String hostKeyChecking )
- {
- }
-
- public String getHostKeyChecking()
- {
- return "no";
- }
-
- public String getContents()
- {
- return null;
- }
- } );
- return scpWagon;
- }
-
- @Override
protected void setUp()
throws Exception
{
@@ -101,10 +67,7 @@ public class EmbeddedScpWagonTest
sshServerEmbedded.stop( true );
}
- protected String getProtocol()
- {
- return "scp";
- }
+ protected abstract String getProtocol();
@Override
protected int getTestRepositoryPort()
@@ -135,10 +98,6 @@ public class EmbeddedScpWagonTest
@Override
- protected boolean supportsGetIfNewer()
- {
- return false;
- }
-
+ protected abstract boolean supportsGetIfNewer();
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java?rev=1174024&r1=1174023&r2=1174024&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java Thu Sep 22 09:52:09 2011
@@ -19,26 +19,24 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import org.apache.maven.wagon.StreamingWagonTestCase;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.providers.ssh.AbstractEmbeddedScpWagonTest;
import org.apache.maven.wagon.providers.ssh.SshServerEmbedded;
import org.apache.maven.wagon.providers.ssh.TestData;
-import org.apache.maven.wagon.providers.ssh.TestPasswordAuthenticator;
import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.apache.maven.wagon.repository.Repository;
import org.apache.maven.wagon.resource.Resource;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
public class EmbeddedScpWagonTest
- extends StreamingWagonTestCase
+ extends AbstractEmbeddedScpWagonTest
{
SshServerEmbedded sshServerEmbedded;
@@ -74,64 +72,12 @@ public class EmbeddedScpWagonTest
return scpWagon;
}
- @Override
- protected void setUp()
- throws Exception
- {
- super.setUp();
-
- String sshKeyResource = "ssh-keys/id_rsa";
-
- sshServerEmbedded = new SshServerEmbedded( getProtocol(), Arrays.asList( sshKeyResource ), false );
-
- sshServerEmbedded.start();
- System.out.println( "sshd on port " + sshServerEmbedded.getPort() );
- }
-
- @Override
- protected void tearDownWagonTestingFixtures()
- throws Exception
- {
-
- for ( TestPasswordAuthenticator.PasswordAuthenticatorRequest passwordAuthenticatorRequest : sshServerEmbedded.passwordAuthenticator.passwordAuthenticatorRequests )
- {
- assertEquals( TestData.getUserName(), passwordAuthenticatorRequest.username );
- assertEquals( TestData.getUserPassword(), passwordAuthenticatorRequest.password );
- }
- sshServerEmbedded.stop( true );
- }
protected String getProtocol()
{
return "scp";
}
- @Override
- protected int getTestRepositoryPort()
- {
- return sshServerEmbedded.getPort();
- }
-
-
- public String getTestRepositoryUrl()
- {
- return TestData.getTestRepositoryUrl( sshServerEmbedded.getPort() );
- }
-
- protected AuthenticationInfo getAuthInfo()
- {
- AuthenticationInfo authInfo = super.getAuthInfo();
-
- authInfo.setUserName( TestData.getUserName() );
- authInfo.setPassword( TestData.getUserPassword() );
-
- return authInfo;
- }
-
- protected long getExpectedLastModifiedOnGet( Repository repository, Resource resource )
- {
- return new File( repository.getBasedir(), resource.getName() ).lastModified();
- }
@Override