Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 91E046929 for ; Thu, 26 May 2011 20:52:54 +0000 (UTC) Received: (qmail 68480 invoked by uid 500); 26 May 2011 20:52:54 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 68442 invoked by uid 500); 26 May 2011 20:52:54 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 68435 invoked by uid 99); 26 May 2011 20:52:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 20:52:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 20:52:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67F302388A60; Thu, 26 May 2011 20:52:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128076 - in /archiva/trunk: archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java pom.xml Date: Thu, 26 May 2011 20:52:33 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110526205233.67F302388A60@eris.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 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 @@ org.sonatype.sisu sisu-inject-plexus - 2.2.0 + 2.2.2 org.sonatype.sisu