diff options
Diffstat (limited to 'archiva-modules/archiva-base/archiva-dependency-graph')
3 files changed, 10 insertions, 6 deletions
diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index dda33ffe2..415d7ef2e 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -29,6 +29,11 @@ <name>Archiva Base :: Dependency Graph</name> <dependencies> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java index 26aa0ef6f..d35373495 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java +++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java @@ -33,7 +33,7 @@ import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.Dependency; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.util.ArrayList; import java.util.Collection; @@ -47,7 +47,7 @@ import java.util.List; * @version $Id$ */ public abstract class AbstractDependencyGraphFactoryTestCase - extends PlexusTestCase + extends PlexusInSpringTestCase { public class ExpectedEdge { diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java index 2a277394c..e33a867ea 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java +++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java @@ -19,13 +19,13 @@ package org.apache.maven.archiva.dependency.graph; * under the License. */ +import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.dependency.DependencyGraphFactory; import org.apache.maven.archiva.model.DependencyScope; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.PlexusTestCase; import java.io.File; import java.io.FileWriter; @@ -41,7 +41,6 @@ import java.util.List; * @version $Id$ */ public class GraphvizDotTool - extends PlexusTestCase implements GraphListener { private int phaseNumber = 0; @@ -49,7 +48,7 @@ public class GraphvizDotTool protected VersionedReference toVersionedReference( String key ) { String parts[] = StringUtils.splitPreserveAllTokens( key, ':' ); - assertEquals( "Versioned Reference [" + key + "] part count.", 3, parts.length ); + Assert.assertEquals( "Versioned Reference [" + key + "] part count.", 3, parts.length ); VersionedReference ref = new VersionedReference(); ref.setGroupId( parts[0] ); @@ -78,7 +77,7 @@ public class GraphvizDotTool DependencyGraph graph = factory.getGraph( rootRef ); // Test the results. - assertNotNull( "Graph shouldn't be null.", graph ); + Assert.assertNotNull( "Graph shouldn't be null.", graph ); return graph; } |