svn commit: r639102 - in /maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils: ChecksumsTest.java ResourceUtils.java

[brett]

Author: brett
Date: Wed Mar 19 17:54:43 2008
New Revision: 639102

URL: http://svn.apache.org/viewvc?rev=639102&view=rev
Log:
[MRM-642] don't rely on relative paths for tests
Submitted by Stephen Gargan
Merged from: r638988 on archiva-1.0.x

Added:
    
maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ResourceUtils.java
      - copied unchanged from r638988, 
maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ResourceUtils.java
Modified:
    
maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java

Modified: 
maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java?rev=639102&r1=639101&r2=639102&view=diff
==============================================================================
--- 
maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
 (original)
+++ 
maven/archiva/trunk/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java
 Wed Mar 19 17:54:43 2008
@@ -27,8 +27,8 @@
 import java.io.FileReader;
 
 /**
- * ChecksumsTest 
- *
+ * ChecksumsTest
+ * 
  * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>
  * @version $Id$
  */
@@ -256,14 +256,14 @@
     private File createTestableFiles( String md5State, String sha1State )
         throws Exception
     {
-        File sourceDir = new File( "src/test/resources/checksums/" );
+
         File destDir = new File( "target/checksum-tests/" + getName() + "/" );
 
-        FileUtils.copyFileToDirectory( new File( sourceDir, "artifact.jar" ), 
destDir );
+        FileUtils.copyFileToDirectory( ResourceUtils.getResource( 
"/checksums/artifact.jar" ), destDir );
 
         if ( md5State != null )
         {
-            File md5File = new File( sourceDir, "artifact.jar.md5-" + md5State 
);
+            File md5File = ResourceUtils.getResource( 
"/checksums/artifact.jar.md5-" + md5State );
             assertTrue( "Testable file exists: " + md5File.getName() + ":", 
md5File.exists() && md5File.isFile() );
             File destFile = new File( destDir, "artifact.jar.md5" );
             FileUtils.copyFile( md5File, destFile );
@@ -271,7 +271,7 @@
 
         if ( sha1State != null )
         {
-            File sha1File = new File( sourceDir, "artifact.jar.sha1-" + 
sha1State );
+            File sha1File = ResourceUtils.getResource( 
"/checksums/artifact.jar.sha1-" + sha1State );
             assertTrue( "Testable file exists: " + sha1File.getName() + ":", 
sha1File.exists() && sha1File.isFile() );
             File destFile = new File( destDir, "artifact.jar.sha1" );
             FileUtils.copyFile( sha1File, destFile );
@@ -284,8 +284,8 @@
     private Checksums lookupChecksums()
         throws Exception
     {
-        Checksums policy = (Checksums) lookup( Checksums.class );
-        assertNotNull( policy );
-        return policy;
+        Checksums checksums = (Checksums) lookup( Checksums.class );
+        assertNotNull( checksums );
+        return checksums;
     }
 }