You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2008/05/27 09:49:26 UTC
svn commit: r660419 - in
/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src:
main/java/org/apache/maven/wagon/providers/ssh/external/
test/java/org/apache/maven/wagon/providers/ssh/external/
Author: brett
Date: Tue May 27 00:49:26 2008
New Revision: 660419
URL: http://svn.apache.org/viewvc?rev=660419&view=rev
Log:
update tests
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=660419&r1=660418&r2=660419&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Tue May 27 00:49:26 2008
@@ -282,6 +282,10 @@
{
throw new TransferFailedException( "Error executing command for transfer", e );
}
+
+ resource.setContentLength( source.length() );
+
+ resource.setLastModified( source.lastModified() );
firePutStarted( resource, source );
@@ -322,14 +326,16 @@
public void get( String resourceName, File destination )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
- String basedir = getRepository().getBasedir();
-
String path = StringUtils.replace( resourceName, "\\", "/" );
- createParentDirectories( destination );
-
Resource resource = new Resource( path );
+ fireGetInitiated( resource, destination );
+
+ String basedir = getRepository().getBasedir();
+
+ createParentDirectories( destination );
+
fireGetStarted( resource, destination );
executeScpCommand( destination, basedir + "/" + path, false );
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java?rev=660419&r1=660418&r2=660419&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java Tue May 27 00:49:26 2008
@@ -19,9 +19,12 @@
* under the License.
*/
+import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.WagonTestCase;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.providers.ssh.TestData;
+import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.resource.Resource;
import java.io.File;
@@ -32,6 +35,16 @@
public class ScpExternalWagonTest
extends WagonTestCase
{
+ protected int getExpectedContentLengthOnGet( int expectedSize )
+ {
+ return WagonConstants.UNKNOWN_LENGTH;
+ }
+
+ protected long getExpectedLastModifiedOnGet( Repository repository, Resource resource )
+ {
+ return 0;
+ }
+
protected String getProtocol()
{
return "scpexe";
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java?rev=660419&r1=660418&r2=660419&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java Tue May 27 00:49:26 2008
@@ -19,9 +19,12 @@
* under the License.
*/
+import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.WagonTestCase;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.providers.ssh.TestData;
+import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.wagon.resource.Resource;
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
@@ -30,6 +33,16 @@
public class ScpWagonWithSshPrivateKeySearchTest
extends WagonTestCase
{
+ protected int getExpectedContentLengthOnGet( int expectedSize )
+ {
+ return WagonConstants.UNKNOWN_LENGTH;
+ }
+
+ protected long getExpectedLastModifiedOnGet( Repository repository, Resource resource )
+ {
+ return 0;
+ }
+
protected String getProtocol()
{
return "scpexe";
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org