Fix all Unit Tests

Author: slawekjaranowski

pom.xml

@@ -406,7 +406,7 @@ under the License.
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!-- Need more heap space in order to run the unit tests !-->
-          <argLine>-Xmx384m</argLine>
+          <argLine>-Xmx512m</argLine>
           <systemPropertyVariables>
             <maven.home>${maven.home}</maven.home>
           </systemPropertyVariables>

src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java

@@ -22,8 +22,10 @@
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.testing.SilentLog;
 import org.apache.maven.plugins.dependency.resolvers.CollectDependenciesMojo;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
 import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
 import org.apache.maven.project.MavenProject;
 
@@ -32,6 +34,11 @@ public class TestCollectMojo extends AbstractDependencyMojoTestCase {
     protected void setUp() throws Exception {
         // required for mojo lookups to work
         super.setUp("markers", false);
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
     }
 
     /**

src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java

@@ -30,7 +30,8 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
 import org.eclipse.jetty.security.ConstraintMapping;
@@ -49,21 +50,25 @@ public class TestGetMojo extends AbstractDependencyMojoTestCase {
     protected void setUp() throws Exception {
         // required for mojo lookups to work
         super.setUp("markers", false);
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
 
         File testPom = new File(getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml");
         mojo = (GetMojo) lookupMojo("get", testPom);
 
         assertNotNull(mojo);
 
         LegacySupport legacySupport = lookup(LegacySupport.class);
-        MavenSession mavenSession = newMavenSession(new MavenProjectStub());
-        Settings settings = mavenSession.getSettings();
+        Settings settings = session.getSettings();
         Server server = new Server();
         server.setId("myserver");
         server.setUsername("foo");
         server.setPassword("bar");
         settings.addServer(server);
-        legacySupport.setSession(mavenSession);
+        legacySupport.setSession(session);
 
         installLocalRepository(legacySupport);
 

src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java

@@ -27,7 +27,8 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
+import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
 import org.junit.Assert;
@@ -39,6 +40,13 @@ public class TestListClassesMojo extends AbstractDependencyMojoTestCase {
 
     protected void setUp() throws Exception {
         super.setUp("markers", false);
+
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+
         File testPom = new File(getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml");
 
         assertTrue(testPom.exists());
@@ -47,7 +55,6 @@ protected void setUp() throws Exception {
         assertNotNull(mojo);
 
         LegacySupport legacySupport = lookup(LegacySupport.class);
-        MavenSession session = newMavenSession(new MavenProjectStub());
         Settings settings = session.getSettings();
         Server server = new Server();
         server.setId("myserver");
@@ -57,8 +64,6 @@ protected void setUp() throws Exception {
         legacySupport.setSession(session);
 
         installLocalRepository(legacySupport);
-
-        setVariableValueToObject(mojo, "session", legacySupport.getSession());
     }
 
     public void testListClassesNotTransitive() throws Exception {

src/test/java/org/apache/maven/plugins/dependency/TestPropertiesMojo.java

@@ -22,12 +22,20 @@
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
 import org.apache.maven.project.MavenProject;
 
 public class TestPropertiesMojo extends AbstractDependencyMojoTestCase {
     protected void setUp() throws Exception {
         // required for mojo lookups to work
         super.setUp("markers", true);
+
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
     }
 
     /**

src/test/java/org/apache/maven/plugins/dependency/TestSkip.java

@@ -20,15 +20,29 @@
 
 import java.io.File;
 
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
+import org.apache.maven.project.MavenProject;
 import org.mockito.ArgumentCaptor;
 
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 public class TestSkip extends AbstractDependencyMojoTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+    }
+
     public void testSkipAnalyze() throws Exception {
         doTest("analyze");
     }

src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java

@@ -22,15 +22,25 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DuplicateDependencies2ProjectStub;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DuplicateDependenciesProjectStub;
+import org.apache.maven.project.MavenProject;
 
 /**
  * @author <a href="mailto:[email protected]">Vincent Siveton</a>
  * @version $Id$
  */
 public class TestAnalyzeDuplicateMojo extends AbstractDependencyMojoTestCase {
     public void testDuplicate() throws Exception {
+        MavenProject project = new DuplicateDependenciesProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+
         File testPom = new File(getBasedir(), "target/test-classes/unit/duplicate-dependencies/plugin-config.xml");
         AnalyzeDuplicateMojo mojo = (AnalyzeDuplicateMojo) lookupMojo("analyze-duplicate", testPom);
         assertNotNull(mojo);
@@ -44,6 +54,12 @@ public void testDuplicate() throws Exception {
     }
 
     public void testDuplicate2() throws Exception {
+        MavenProject project = new DuplicateDependencies2ProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+
         File testPom = new File(getBasedir(), "target/test-classes/unit/duplicate-dependencies/plugin-config2.xml");
         AnalyzeDuplicateMojo mojo = (AnalyzeDuplicateMojo) lookupMojo("analyze-duplicate", testPom);
         assertNotNull(mojo);

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java

@@ -31,6 +31,7 @@
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
 import org.apache.maven.plugins.dependency.utils.DependencyUtil;
 import org.apache.maven.project.MavenProject;
 
@@ -39,6 +40,11 @@ public class TestCopyMojo extends AbstractDependencyMojoTestCase {
 
     protected void setUp() throws Exception {
         super.setUp("copy", false, false);
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
 
         File testPom = new File(getBasedir(), "target/test-classes/unit/copy-test/plugin-config.xml");
         mojo = (CopyMojo) lookupMojo("copy", testPom);
@@ -48,9 +54,6 @@ protected void setUp() throws Exception {
         assertNotNull(mojo);
         assertNotNull(mojo.getProject());
 
-        MavenSession session = newMavenSession(mojo.getProject());
-        setVariableValueToObject(mojo, "session", session);
-
         LegacySupport legacySupport = lookup(LegacySupport.class);
         legacySupport.setSession(session);
         installLocalRepository(legacySupport);

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java

@@ -28,7 +28,9 @@
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
 import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
+import org.apache.maven.project.MavenProject;
 
 public class TestIncludeExcludeUnpackMojo extends AbstractDependencyMojoTestCase {
     private final String PACKED_FILE = "test.zip";
@@ -45,6 +47,12 @@ protected void setUp() throws Exception {
         // required for mojo lookups to work
         super.setUp("unpack", true, false);
 
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+
         File testPom = new File(getBasedir(), "target/test-classes/unit/unpack-test/plugin-config.xml");
         mojo = (UnpackMojo) lookupMojo("unpack", testPom);
         mojo.setOutputDirectory(new File(this.testDir, "outputDirectory"));
@@ -63,9 +71,6 @@ protected void setUp() throws Exception {
         mojo.setMarkersDirectory(new File(this.testDir, "markers"));
         mojo.setArtifactItems(list);
 
-        MavenSession session = newMavenSession(mojo.getProject());
-        setVariableValueToObject(mojo, "session", session);
-
         LegacySupport legacySupport = lookup(LegacySupport.class);
         legacySupport.setSession(session);
         installLocalRepository(legacySupport);

src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java

@@ -34,6 +34,7 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
 import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
+import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub;
 import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -45,6 +46,12 @@ public class TestUnpackMojo extends AbstractDependencyMojoTestCase {
     protected void setUp() throws Exception {
         super.setUp("unpack", true, false);
 
+        MavenProject project = new DependencyProjectStub();
+        getContainer().addComponent(project, MavenProject.class.getName());
+
+        MavenSession session = newMavenSession(project);
+        getContainer().addComponent(session, MavenSession.class.getName());
+
         File testPom = new File(getBasedir(), "target/test-classes/unit/unpack-test/plugin-config.xml");
         mojo = (UnpackMojo) lookupMojo("unpack", testPom);
         mojo.setOutputDirectory(new File(this.testDir, "outputDirectory"));
@@ -62,9 +69,6 @@ protected void setUp() throws Exception {
         stubFactory.setSrcFile(new File(
                 getBasedir() + File.separatorChar + "target/test-classes/unit/unpack-dependencies-test/test.txt"));
 
-        MavenSession session = newMavenSession(mojo.getProject());
-        setVariableValueToObject(mojo, "session", session);
-
         LegacySupport legacySupport = lookup(LegacySupport.class);
 
         legacySupport.setSession(session);