svn commit: r1128076 - in /archiva/trunk: archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java pom.xml

[ol...@apache.org]

Author: olamy
Date: Thu May 26 20:52:33 2011
New Revision: 1128076

URL: http://svn.apache.org/viewvc?rev=1128076&view=rev
Log:
fix tests in archiva-transaction

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java?rev=1128076&r1=1128075&r2=1128076&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java Thu May 26 20:52:33 2011
@@ -19,31 +19,44 @@ package org.apache.maven.archiva.transac
  * under the License.
  */
 
+import junit.framework.TestCase;
 import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-import org.codehaus.plexus.spring.PlexusToSpringUtils;
 import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.Md5Digester;
+import org.codehaus.plexus.digest.Sha1Digester;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 /**
- * 
  * @version $Id$
  */
 public abstract class AbstractFileEventTest
-    extends PlexusInSpringTestCase
+    extends TestCase
 {
     protected List<Digester> digesters;
 
-    @SuppressWarnings("unchecked")
+    public static String getBasedir()
+    {
+
+        String basedir = System.getProperty( "basedir" );
+        if (basedir == null)
+        {
+            basedir = new File( "" ).getAbsolutePath();
+        }
+        return basedir;
+
+    }
+
+    @SuppressWarnings( "unchecked" )
     public void setUp()
         throws Exception
     {
         super.setUp();
 
-        digesters = PlexusToSpringUtils.lookupList( PlexusToSpringUtils.buildSpringId( Digester.class.getName() ), getApplicationContext() );
+        digesters = Arrays.asList( (Digester) new Md5Digester(), (Digester) new Sha1Digester() );
     }
 
     protected void assertChecksumExists( File file, String algorithm )

Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1128076&r1=1128075&r2=1128076&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu May 26 20:52:33 2011
@@ -572,7 +572,7 @@
       <dependency>
         <groupId>org.sonatype.sisu</groupId>
         <artifactId>sisu-inject-plexus</artifactId>
-        <version>2.2.0</version>
+        <version>2.2.2</version>
       </dependency>
       <dependency>
         <groupId>org.sonatype.sisu</groupId>