svn commit: r1004613 - in /maven/core-integration-testing/trunk: core-it-suite/src/test/java/org/apache/maven/it/ core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/

[brett]

Author: brett
Date: Tue Oct  5 11:24:41 2010
New Revision: 1004613

URL: http://svn.apache.org/viewvc?rev=1004613&view=rev
Log:
make wagon tests basedir independent so they run on the embedded profile

Modified:
    
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
    
maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java

Modified: 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java?rev=1004613&r1=1004612&r2=1004613&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
 Tue Oct  5 11:24:41 2010
@@ -43,7 +43,7 @@ public class MavenITmng3485OverrideWagon
 
         verifier.executeGoal( "deploy" );
 
-        verifier.assertFilePresent( "target/wagon-data" );
+        verifier.assertFilePresent( "target/wagon.properties" );
         verifier.verifyErrorFreeLog();
 
         verifier.resetStreams();

Modified: 
maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: 
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=1004613&r1=1004612&r2=1004613&view=diff
==============================================================================
--- 
maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
 (original)
+++ 
maven/core-integration-testing/trunk/core-it-support/core-it-wagon/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
 Tue Oct  5 11:24:41 2010
@@ -90,6 +90,8 @@ public class ScpExternalWagon
 
         outputData.setResource( resource );
 
+        writeTestProperties( source.getParentFile() );
+
         fillOutputData( outputData );
 
         OutputStream os = outputData.getOutputStream();
@@ -106,15 +108,6 @@ public class ScpExternalWagon
     public void closeConnection()
         throws ConnectionException
     {
-        File f = new File( "target/wagon-data" );
-        try
-        {
-            f.createNewFile();
-        }
-        catch ( IOException e )
-        {
-            throw new ConnectionException( e.getMessage(), e );
-        }
     }
 
     public void fillInputData( InputData inputData )
@@ -130,7 +123,7 @@ public class ScpExternalWagon
         }
     }
 
-    public void fillOutputData( OutputData outputData )
+    public void writeTestProperties( File dir )
         throws TransferFailedException
     {
         Properties props = new Properties();
@@ -152,7 +145,7 @@ public class ScpExternalWagon
 
         try
         {
-            OutputStream os = new FileOutputStream( "target/wagon.properties" 
);
+            OutputStream os = new FileOutputStream( new File( dir, 
"wagon.properties" ) );
             try
             {
                 props.store( os, "MAVEN-CORE-IT-WAGON" );
@@ -166,14 +159,16 @@ public class ScpExternalWagon
         {
             throw new TransferFailedException( e.getMessage(), e );
         }
+    }
 
+    public void fillOutputData( OutputData outputData )
+        throws TransferFailedException
+    {
         outputData.setOutputStream( new ByteArrayOutputStream() );
     }
 
     public void openConnection()
         throws ConnectionException, AuthenticationException
     {
-        // TODO Auto-generated method stub
-
     }
 }