cvs commit: maven-components/maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render XdocPluginTest.java

[jvanzyl]

jvanzyl     2004/04/07 10:49:55

  Modified:    
maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render
                        XdocPluginTest.java
  Log:
  o preparing to make a separate test case
  
  Revision  Changes    Path
  1.3       +23 -16    
maven-components/maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render/XdocPluginTest.java
  
  Index: XdocPluginTest.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render/XdocPluginTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XdocPluginTest.java       7 Apr 2004 17:37:39 -0000       1.2
  +++ XdocPluginTest.java       7 Apr 2004 17:49:55 -0000       1.3
  @@ -1,15 +1,14 @@
   package org.apache.maven.xdoc.render;
   
  -import org.apache.maven.project.MavenProject;
  -import org.apache.maven.project.MavenProjectBuilder;
  -import org.apache.maven.xdoc.XdocPlugin;
  +import org.apache.maven.plugin.Plugin;
   import org.apache.maven.plugin.PluginExecutionRequest;
   import org.apache.maven.plugin.PluginExecutionResponse;
  -import org.apache.maven.plugin.Plugin;
  -import org.apache.maven.plugin.plexus.executor.IntegratedPluginExecutor;
  -import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  -import org.apache.maven.plugin.descriptor.PluginDescriptor;
   import org.apache.maven.plugin.descriptor.GoalDescriptor;
  +import org.apache.maven.plugin.descriptor.PluginDescriptor;
  +import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  +import org.apache.maven.plugin.plexus.executor.IntegratedPluginExecutor;
  +import org.apache.maven.project.MavenProject;
  +import org.apache.maven.project.MavenProjectBuilder;
   import org.codehaus.plexus.PlexusTestCase;
   
   import java.io.File;
  @@ -30,18 +29,26 @@
           super( s );
       }
   
  -    public void testXdocRenderer()
  +    protected void setUp()
           throws Exception
       {
  -        String basedir = System.getProperty( "basedir" );
  +        super.setUp();
  +
  +        PluginDescriptor pluginDescriptor = findPluginDescriptor();
   
  +        getContainer().addComponentDescriptor( pluginDescriptor );
  +    }
  +
  +    public void testXdocRenderer()
  +        throws Exception
  +    {
           MavenProjectBuilder builder = (MavenProjectBuilder) lookup( 
MavenProjectBuilder.ROLE );
   
  -        MavenProject project = builder.build( new File( System.getProperty( 
"basedir" ), "project.xml" ) );
  +        MavenProject project = builder.build( new File( basedir, "project.xml" ) );
   
  -        XdocPlugin plugin = new XdocPlugin();
  +        Plugin plugin = (Plugin) lookup( Plugin.ROLE, "xdoc" );
   
  -        PluginExecutionResponse response = executePlugin( plugin, project );
  +        PluginExecutionResponse response = executePlugin( plugin, "xdoc", project );
   
           if ( response.exceptionOccurred() )
           {
  @@ -49,12 +56,12 @@
           }
       }
   
  -    protected PluginExecutionResponse executePlugin( Plugin plugin, MavenProject 
project )
  +    protected PluginExecutionResponse executePlugin( Plugin plugin, String goal, 
MavenProject project )
           throws Exception
       {
           IntegratedPluginExecutor executor = new IntegratedPluginExecutor();
   
  -        PluginExecutionRequest request = createPluginExecutionRequest( "xdoc", 
project );
  +        PluginExecutionRequest request = createPluginExecutionRequest( goal, 
project );
   
           request.setPlugin( plugin );
   
  @@ -70,7 +77,7 @@
       {
           PluginDescriptor pluginDescriptor = findPluginDescriptor();
   
  -        GoalDescriptor goalDescriptor = findGoalDescriptor( pluginDescriptor, 
"xdoc" );
  +        GoalDescriptor goalDescriptor = findGoalDescriptor( pluginDescriptor, goal 
);
   
           PluginExecutionRequest request = new PluginExecutionRequest( 
pluginDescriptor, goalDescriptor, project );
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]