jvanzyl 2004/05/20 10:06:43 Modified: maven-plugins/maven-xdoc-plugin project.xml maven-plugins/maven-xdoc-plugin/src/test/java/org/apache/maven/xdoc/render XdocPluginTest.java Log: turn into a maven plugin and add @tags for descriptor generation. Revision Changes Path 1.6 +1 -70 maven-components/maven-plugins/maven-xdoc-plugin/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/maven-components/maven-plugins/maven-xdoc-plugin/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 12 Apr 2004 20:14:19 -0000 1.5 +++ project.xml 20 May 2004 17:06:43 -0000 1.6 @@ -3,80 +3,11 @@ <project> <parent> <groupId>maven</groupId> - <artifactId>maven-plugin</artifactId> + <artifactId>maven-plugin-parent</artifactId> <version>2.0-SNAPSHOT</version> </parent> <name>Maven Xdoc plugin</name> <groupId>maven</groupId> <artifactId>maven-xdoc-plugin</artifactId> <version>2.0-SNAPSHOT</version> - <description></description> - <shortDescription>Java Project Management Tools</shortDescription> - <inceptionYear>2001</inceptionYear> - <logo>/images/maven.gif</logo> - <url>http://maven.apache.org/</url> - <repository> - <connection>scm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic:maven-components/maven-model-xpp3</connection> - <developerConnection>scm:cvs:ext:[EMAIL PROTECTED]:/home/cvs:maven-components/maven-model-xpp3</developerConnection> - <url>http://cvs.apache.org/viewcvs.cgi/maven/</url> - </repository> - <developers> - <developer> - <name>Jason van Zyl</name> - <id>jvanzyl</id> - <email>[EMAIL PROTECTED]</email> - <organization>Zenplex</organization> - <roles> - <role>Architect</role> - <role>Release Manager</role> - </roles> - </developer> - </developers> - <dependencies> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-core</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-model</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>plexus</groupId> - <artifactId>plexus</artifactId> - <version>0.14-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.3.3</version> - </dependency> - <dependency> - <groupId>xstream</groupId> - <artifactId>xstream</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>classworlds</groupId> - <artifactId>classworlds</artifactId> - <version>1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - <version>2.5.1</version> - </dependency> - <dependency> - <groupId>maven</groupId> - <artifactId>wagon-api</artifactId> - <version>0.9-SNAPSHOT</version> - </dependency> - </dependencies> </project> 1.7 +41 -7 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- XdocPluginTest.java 8 May 2004 01:34:26 -0000 1.6 +++ XdocPluginTest.java 20 May 2004 17:06:43 -0000 1.7 @@ -1,26 +1,60 @@ package org.apache.maven.xdoc.render; -import org.apache.maven.plugin.IntegratedPluginGoalTestCase; +import org.apache.maven.plugin.PluginTestCase; +import org.apache.maven.xdoc.XdocPlugin; +import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.embed.Embedder; + +import java.util.Map; +import java.util.HashMap; +import java.io.File; /** * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> * @version $Id$ */ public class XdocPluginTest - extends IntegratedPluginGoalTestCase + extends PluginTestCase { public XdocPluginTest( String s ) { super( s ); } - public String getPluginId() + protected void setupPlugin() + throws Exception + { + plugin = new XdocPlugin(); + } + + protected Map getTestParameters() + throws Exception { - return "xdoc"; + Embedder embedder = new Embedder(); + + embedder.setClassLoader( Thread.currentThread().getContextClassLoader() ); + + embedder.start(); + + MavenProjectBuilder builder = (MavenProjectBuilder) embedder.lookup( MavenProjectBuilder.ROLE ); + + MavenProject project = builder.build( new File( basedir, "project.xml" ) ); + + Map parameters = new HashMap(); + + parameters.put( "project", project ); + + parameters.put( "xdocDirectory", new File( basedir, "src/test/resources/xdocs" ).getPath() ); + + parameters.put( "outputDirectory", new File( basedir, "target/docs" ).getPath() ); + + return parameters; } - public String getGoal() + protected void validatePluginExecution() + throws Exception { - return "xdoc"; + // We could use some xmlUnit capabilities here. } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]