You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2011/02/03 18:48:46 UTC

svn commit: r1066895 - in /maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle: LifecycleExecutorTest.java internal/LifecycleExecutionPlanCalculatorTest.java

Author: ifedorenko
Date: Thu Feb  3 17:48:45 2011
New Revision: 1066895

URL: http://svn.apache.org/viewvc?rev=1066895&view=rev
Log:
lifeCycleExecutionPlanCalculator.setupMojoExecution test

Modified:
    maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
    maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java

Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=1066895&r1=1066894&r2=1066895&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Thu Feb  3 17:48:45 2011
@@ -15,14 +15,19 @@ package org.apache.maven.lifecycle;
  * the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import org.apache.maven.AbstractCoreMavenComponentTestCase;
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.exception.ExceptionHandler;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.lifecycle.internal.DefaultLifecycleTaskSegmentCalculator;
 import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
 import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
+import org.apache.maven.lifecycle.internal.LifecycleTask;
 import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
-import org.apache.maven.lifecycle.internal.DefaultLifecycleTaskSegmentCalculator;
 import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
 import org.apache.maven.lifecycle.internal.TaskSegment;
 import org.apache.maven.model.Plugin;
@@ -32,11 +37,6 @@ import org.apache.maven.plugin.descripto
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 public class LifecycleExecutorTest
     extends AbstractCoreMavenComponentTestCase
 {
@@ -359,4 +359,25 @@ public class LifecycleExecutorTest
         assertNotNull( plugin );
     }
 
+    public void testSetupMojoExecution()
+        throws Exception
+    {
+        File pom = getProject( "mojo-configuration" );
+
+        MavenSession session = createMavenSession( pom );
+
+        LifecycleTask task = new LifecycleTask( "generate-sources" );
+        MavenExecutionPlan executionPlan =
+            lifeCycleExecutionPlanCalculator.calculateExecutionPlan( session, session.getCurrentProject(),
+                                                                     Arrays.asList( (Object) task ), false );
+
+        MojoExecution execution = executionPlan.getMojoExecutions().get(0);
+        assertEquals(execution.toString(), "maven-it-plugin", execution.getArtifactId());
+        assertNull(execution.getConfiguration());
+
+        lifeCycleExecutionPlanCalculator.setupMojoExecution( session, session.getCurrentProject(), execution );
+        assertNotNull(execution.getConfiguration());
+        assertEquals("1.0", execution.getConfiguration().getChild( "version" ).getAttribute( "default-value" ));
+    }
+
 }

Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java?rev=1066895&r1=1066894&r2=1066895&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java Thu Feb  3 17:48:45 2011
@@ -15,7 +15,9 @@
 
 package org.apache.maven.lifecycle.internal;
 
-import junit.framework.TestCase;
+import java.io.File;
+
+import org.apache.maven.AbstractCoreMavenComponentTestCase;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.MavenExecutionPlan;
 import org.apache.maven.lifecycle.internal.stub.BuildPluginManagerStub;
@@ -29,7 +31,7 @@ import org.apache.maven.lifecycle.intern
  * @author Kristian Rosenvold>
  */
 public class LifecycleExecutionPlanCalculatorTest
-    extends TestCase
+    extends AbstractCoreMavenComponentTestCase
 {
 
     public void testCalculateExecutionPlanWithGoalTasks()
@@ -59,11 +61,9 @@ public class LifecycleExecutionPlanCalcu
 
     // Maybe also make one with LifeCycleTasks
 
-    public static LifecycleExecutionPlanCalculator createExecutionPlaceCalculator(
-        MojoDescriptorCreator mojoDescriptorCreator )
+    public static LifecycleExecutionPlanCalculator createExecutionPlaceCalculator( MojoDescriptorCreator mojoDescriptorCreator )
     {
-        LifecyclePluginResolver lifecyclePluginResolver =
-            new LifecyclePluginResolver( new PluginVersionResolverStub() );
+        LifecyclePluginResolver lifecyclePluginResolver = new LifecyclePluginResolver( new PluginVersionResolverStub() );
         return new DefaultLifecycleExecutionPlanCalculator( new BuildPluginManagerStub(),
                                                             DefaultLifecyclesStub.createDefaultLifecycles(),
                                                             mojoDescriptorCreator, lifecyclePluginResolver,
@@ -76,4 +76,11 @@ public class LifecycleExecutionPlanCalcu
                                           new PluginPrefixResolverStub(),
                                           new LifecyclePluginResolver( new PluginVersionResolverStub() ) );
     }
+
+    @Override
+    protected String getProjectsDirectory()
+    {
+        return "src/test/projects/lifecycle-executor";
+    }
+
 }