commit 47747e70dfc9af7de00ab605c7d2279058b2d61b
author Robert Scholte <rfscholte@apache.org> Sun Jun 14 12:18:11 2015 +0000
committer Robert Scholte <rfscholte@apache.org> Sun Jun 14 12:18:11 2015 +0000
tree 5831a8375b5d3162e6c3d05467ab80bcb0740114
parent 7768befb986d1ad660a64c24721c8ac6c20c0643

upgrade maven-plugin-testing-harness to 2.2
Replace ArtifactFactory with ArtifactStubFactory, which is sufficient enough

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1685396 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index d0dfb36..7e0eaf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,15 +121,8 @@
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.3</version>
+      <version>2.1</version>
       <scope>test</scope>
-      <!-- This exclusion can be removed after upgrading to version 1.4 -->
-      <exclusions>
-        <exclusion>
-          <groupId>easymock</groupId>
-          <artifactId>easymock</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
 </project>

src/test/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilterTest.java

diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilterTest.java b/src/test/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilterTest.java
index ae522b0..bebef16 100644
--- a/src/test/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilterTest.java
@@ -19,24 +19,27 @@
  * under the License.
  */
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import junit.framework.TestCase;
+
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.plexus.PlexusTestCase;
-
-import static org.easymock.EasyMock.*;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
 
 public class ScopeArtifactFilterTest
-    extends PlexusTestCase
+    extends TestCase
 {
     
     public void testExcludedArtifactWithRangeShouldNotCauseNPE()
         throws Exception
     {
-        ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+        ArtifactStubFactory factory = new ArtifactStubFactory();
         
-        Artifact excluded = factory.createDependencyArtifact( "group", "artifact", VersionRange.createFromVersionSpec( "[1.2.3]" ), "jar", null, Artifact.SCOPE_PROVIDED );
+        Artifact excluded = factory.createArtifact( "group", "artifact", VersionRange.createFromVersionSpec( "[1.2.3]" ), Artifact.SCOPE_PROVIDED, "jar", null, false );
         
         ArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );