You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/04/14 03:26:50 UTC
svn commit: r647646 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-transaction: ./
src/test/java/org/apache/maven/archiva/transaction/
Author: brett
Date: Sun Apr 13 18:26:33 2008
New Revision: 647646
URL: http://svn.apache.org/viewvc?rev=647646&view=rev
Log:
remove plexus test case
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=647646&r1=647645&r2=647646&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Sun Apr 13 18:26:33 2008
@@ -36,6 +36,17 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
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=647646&r1=647645&r2=647646&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 Sun Apr 13 18:26:33 2008
@@ -20,7 +20,8 @@
*/
import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.codehaus.plexus.spring.PlexusToSpringUtils;
import org.codehaus.plexus.digest.Digester;
import java.io.File;
@@ -33,7 +34,7 @@
* @version $Id$
*/
public abstract class AbstractFileEventTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
protected List digesters;
@@ -42,7 +43,7 @@
{
super.setUp();
- digesters = getContainer().lookupList( Digester.class.getName() );
+ digesters = PlexusToSpringUtils.lookupList( PlexusToSpringUtils.buildSpringId( Digester.class.getName() ), getApplicationContext() );
}
protected void assertChecksumExists( File file, String algorithm )
@@ -87,4 +88,4 @@
{
FileUtils.writeStringToFile( file, content );
}
-}
\ No newline at end of file
+}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java?rev=647646&r1=647645&r2=647646&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java Sun Apr 13 18:26:33 2008
@@ -20,7 +20,6 @@
*/
import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.io.IOException;
@@ -31,11 +30,11 @@
public class CopyFileEventTest
extends AbstractFileEventTest
{
- private File testDir = new File( PlexusTestCase.getBasedir(), "target/transaction-tests/copy-file" );
+ private File testDir = new File( getBasedir(), "target/transaction-tests/copy-file" );
private File testDest = new File( testDir, "test-file.txt" );
- private File testSource = new File( PlexusTestCase.getBasedir(), "target/transaction-tests/test-file.txt" );
+ private File testSource = new File( getBasedir(), "target/transaction-tests/test-file.txt" );
private File testDestChecksum;
@@ -154,7 +153,7 @@
{
super.tearDown();
- FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ) );
+ FileUtils.deleteDirectory( new File( getBasedir(), "target/transaction-tests" ) );
}
protected void assertChecksumCommit( File file )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java?rev=647646&r1=647645&r2=647646&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java Sun Apr 13 18:26:33 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.PlexusTestCase;
/**
* @author Edwin Punzalan
@@ -30,7 +29,7 @@
public class CreateFileEventTest
extends AbstractFileEventTest
{
- private File testDir = new File( PlexusTestCase.getBasedir(), "target/transaction-tests/create-file" );
+ private File testDir = new File( getBasedir(), "target/transaction-tests/create-file" );
public void testCreateCommitRollback()
throws Exception
@@ -54,7 +53,7 @@
assertChecksumRollback( testFile );
assertFalse( "Test file parent directories has been rolledback too", testDir.exists() );
- assertTrue( "target directory still exists", new File( PlexusTestCase.getBasedir(), "target" ).exists() );
+ assertTrue( "target directory still exists", new File( getBasedir(), "target" ).exists() );
}
public void testCreateCommitRollbackWithBackup()
@@ -116,6 +115,6 @@
{
super.tearDown();
- FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ) );
+ FileUtils.deleteDirectory( new File( getBasedir(), "target/transaction-tests" ) );
}
}