You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/06/23 08:40:57 UTC
svn commit: r787562 - in /maven/plugins/trunk/maven-pdf-plugin/src:
main/java/org/apache/maven/plugins/pdf/
test/java/org/apache/maven/plugins/pdf/
test/java/org/apache/maven/plugins/pdf/stubs/ test/resources/unit/pdf/
Author: ltheussl
Date: Tue Jun 23 06:40:57 2009
New Revision: 787562
URL: http://svn.apache.org/viewvc?rev=787562&view=rev
Log:
Expand ModelBuilderTest to include authors and organization
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/pom_model_builder.xml
Modified: maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java?rev=787562&r1=787561&r2=787562&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/DocumentModelBuilder.java Tue Jun 23 06:40:57 2009
@@ -248,7 +248,7 @@
if ( it2.hasNext() )
{
- roles.append( ',' );
+ roles.append( ',' ).append( ' ' );
}
}
if ( roles != null )
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java?rev=787562&r1=787561&r2=787562&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/DocumentModelBuilderTest.java Tue Jun 23 06:40:57 2009
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.Reader;
+import org.apache.maven.doxia.document.DocumentAuthor;
import org.apache.maven.doxia.document.DocumentCover;
import org.apache.maven.doxia.document.DocumentMeta;
import org.apache.maven.doxia.document.DocumentModel;
@@ -75,11 +76,14 @@
assertEquals( "Test Name", cover.getProjectName() );
assertEquals( "Test Name", cover.getCoverTitle() );
assertEquals( "v. Test Version", cover.getCoverSubTitle() );
- assertEquals( 0, cover.getAuthors().size() );
+ assertEquals( "Test Organization", cover.getCompanyName() );
+ assertEquals( 2, cover.getAuthors().size() );
+ assertFirstDocumentAuthor( (DocumentAuthor) cover.getAuthors().get( 0 ) );
DocumentMeta meta = model.getMeta();
assertEquals( "Test Description", meta.getDescription() );
- assertEquals( 0, meta.getAuthors().size() );
+ assertEquals( 2, meta.getAuthors().size() );
+ assertFirstDocumentAuthor( (DocumentAuthor) meta.getAuthors().get( 0 ) );
assertEquals( "Test Name", meta.getSubject() );
assertEquals( "Test Name", meta.getTitle() );
@@ -94,7 +98,6 @@
public void testGetDocumentModelWithSiteDescriptor()
throws Exception
{
- System.out.println( "basedir: " + getBasedir() );
File descriptorFile = new File( testBaseDir() + "src/site/", "model_builder_site.xml" );
DecorationModel dModel = getDecorationModelFromFile( descriptorFile );
DocumentModel model =
@@ -103,7 +106,15 @@
DocumentTOC toc = model.getToc();
assertEquals( 1, toc.getItems().size() );
assertEquals( "Intro", ( (DocumentTOCItem) toc.getItems().get( 0 ) ).getName() );
+ assertEquals( "index.html", ( (DocumentTOCItem) toc.getItems().get( 0 ) ).getRef() );
+ }
+ private void assertFirstDocumentAuthor( DocumentAuthor author )
+ {
+ assertEquals( "dev name", author.getName() );
+ assertEquals( "dev@email", author.getEmail() );
+ assertEquals( "dev broetchengeber", author.getCompanyName() );
+ assertEquals( "dev main role, dev second role", author.getPosition() );
}
private DecorationModel getDecorationModelFromFile( File descriptorFile )
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java?rev=787562&r1=787561&r2=787562&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/java/org/apache/maven/plugins/pdf/stubs/ModelBuilderMavenProjectStub.java Tue Jun 23 06:40:57 2009
@@ -21,8 +21,11 @@
import java.io.File;
import java.io.FileReader;
+import java.util.List;
+import org.apache.maven.model.Developer;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Organization;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -49,6 +52,8 @@
setVersion( model.getVersion() );
setName( model.getName() );
setDescription( model.getDescription() );
+ setDevelopers( model.getDevelopers() );
+ setOrganization( model.getOrganization() );
}
catch ( Exception e )
{
@@ -63,4 +68,44 @@
{
return new File( super.getBasedir() + "/target/test-classes/unit/pdf/" );
}
+
+ /** {@inheritDoc}
+ * @param developer
+ */
+ public void addDeveloper( Developer developer )
+ {
+ getModel().addDeveloper( developer );
+ }
+
+ /** {@inheritDoc}
+ * @return
+ */
+ public List getDevelopers()
+ {
+ return getModel().getDevelopers();
+ }
+
+ /** {@inheritDoc}
+ * @return
+ */
+ public Organization getOrganization()
+ {
+ return getModel().getOrganization();
+ }
+
+ /** {@inheritDoc}
+ * @param list
+ */
+ public void setDevelopers( List list )
+ {
+ getModel().setDevelopers( list );
+ }
+
+ /** {@inheritDoc}
+ * @param organization
+ */
+ public void setOrganization( Organization organization )
+ {
+ getModel().setOrganization( organization );
+ }
}
Modified: maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/pom_model_builder.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/pom_model_builder.xml?rev=787562&r1=787561&r2=787562&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/pom_model_builder.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/test/resources/unit/pdf/pom_model_builder.xml Tue Jun 23 06:40:57 2009
@@ -28,6 +28,11 @@
<name>Test Name</name>
<description>Test Description</description>
+ <organization>
+ <name>Test Organization</name>
+ <url>Test Organization URL</url>
+ </organization>
+
<developers>
<developer>
<id>devid</id>