Author: vsiveton Date: Thu Dec 30 15:00:04 2010 New Revision: 1053906 URL: http://svn.apache.org/viewvc?rev=1053906&view=rev Log: o updated test cases
Modified: maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml Modified: maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java?rev=1053906&r1=1053905&r2=1053906&view=diff ============================================================================== --- maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java (original) +++ maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/DoapMojoTest.java Thu Dec 30 15:00:04 2010 @@ -88,28 +88,28 @@ public class DoapMojoTest // Validate // Pure DOAP - assertTrue( readed.indexOf( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + assertTrue( readed.contains( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" " - + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\">" ) != -1 ); + + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\">" ) ); if ( StringUtils.isNotEmpty( mavenProject.getUrl() ) ) { - assertTrue( readed.indexOf( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) != -1 ); - assertTrue( readed.indexOf( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 ); + assertTrue( readed.contains( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) ); + assertTrue( readed.contains( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) ); } - assertTrue( readed.indexOf( "<name>" + mavenProject.getName() + "</name>" ) != -1 ); - assertTrue( readed.indexOf( "<programming-language>java</programming-language>" ) != -1 ); + assertTrue( readed.contains( "<name>" + mavenProject.getName() + "</name>" ) ); + assertTrue( readed.contains( "<programming-language>java</programming-language>" ) ); // ASF ext - assertFalse( readed.indexOf( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 ); - assertFalse( readed.indexOf( "<asfext:name>" + mavenProject.getName() + "</name>" ) != -1 ); + assertFalse( readed.contains( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) ); + assertFalse( readed.contains( "<asfext:name>" + mavenProject.getName() + "</name>" ) ); // Developers and Organizations - assertTrue( readed.indexOf( "<maintainer>" ) != -1 ); - assertTrue( readed.indexOf( "<foaf:Person rdf:nodeID=\"b1\">" ) != -1 ); - assertTrue( readed.indexOf( "<foaf:name>Jane Doe</foaf:name>" ) != -1 ); - assertTrue( readed.indexOf( "<foaf:Organization>" ) != -1 ); - assertTrue( readed.indexOf( "<foaf:homepage rdf:resource=\"http://www.example.org\"/>" ) != -1 ); - assertTrue( readed.indexOf( "<foaf:member rdf:nodeID=\"b1\"/>" ) != -1 ); + assertTrue( readed.contains( "<maintainer>" ) ); + assertTrue( readed.contains( "<foaf:Person rdf:nodeID=\"b1\">" ) ); + assertTrue( readed.contains( "<foaf:name>Jane Doe</foaf:name>" ) ); + assertTrue( readed.contains( "<foaf:Organization>" ) ); + assertTrue( readed.contains( "<foaf:homepage rdf:resource=\"http://www.example.org\"/>" ) ); + assertTrue( readed.contains( "<foaf:member rdf:nodeID=\"b1\"/>" ) ); } /** @@ -148,10 +148,10 @@ public class DoapMojoTest // Validate // Pure DOAP - assertTrue( readed.indexOf( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + assertTrue( readed.contains( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" " - + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\">" ) != -1 ); - assertTrue( readed.indexOf( "<name>Plexus Common Utilities</name>" ) != -1 ); + + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\">" ) ); + assertTrue( readed.contains( "<name>Plexus Common Utilities</name>" ) ); } /** @@ -185,20 +185,20 @@ public class DoapMojoTest // Validate // ASF DOAP - assertTrue( readed.indexOf( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + assertTrue( readed.contains( "<rdf:RDF xml:lang=\"en\" xmlns=\"http://usefulinc.com/ns/doap#\" " + "xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" " - + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\" " + "xmlns:asfext=\"http://projects.apache.org/ns/asfext#\">" ) != -1 ); + + "xmlns:foaf=\"http://xmlns.com/foaf/0.1/\" " + "xmlns:asfext=\"http://projects.apache.org/ns/asfext#\">" ) ); if ( StringUtils.isNotEmpty( mavenProject.getUrl() ) ) { - assertTrue( readed.indexOf( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) != -1 ); - assertTrue( readed.indexOf( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 ); + assertTrue( readed.contains( "<Project rdf:about=\"" + mavenProject.getUrl() + "\">" ) ); + assertTrue( readed.contains( "<homepage rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) ); } - assertTrue( readed.indexOf( "<name>Apache " + mavenProject.getName() + "</name>" ) != -1 ); - assertTrue( readed.indexOf( "<programming-language>Java</programming-language>" ) != -1 ); + assertTrue( readed.contains( "<name>Apache " + mavenProject.getName() + "</name>" ) ); + assertTrue( readed.contains( "<programming-language>Java</programming-language>" ) ); // ASF ext - assertTrue( readed.indexOf( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) != -1 ); - assertTrue( readed.indexOf( "<asfext:name>Apache " + mavenProject.getName() + "</asfext:name>" ) != -1 ); + assertTrue( readed.contains( "<asfext:pmc rdf:resource=\"" + mavenProject.getUrl() + "\"/>" ) ); + assertTrue( readed.contains( "<asfext:name>Apache " + mavenProject.getName() + "</asfext:name>" ) ); } /** Modified: maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java?rev=1053906&r1=1053905&r2=1053906&view=diff ============================================================================== --- maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java (original) +++ maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java Thu Dec 30 15:00:04 2010 @@ -23,6 +23,7 @@ import java.io.File; import java.util.List; import org.apache.maven.model.Developer; +import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.IssueManagement; import org.apache.maven.model.License; import org.apache.maven.model.Model; @@ -104,4 +105,22 @@ public class AsfDoapProjectStub { return model.getIssueManagement(); } + + @Override + public String getDescription() + { + return model.getDescription(); + } + + @Override + public String getInceptionYear() + { + return model.getInceptionYear(); + } + + @Override + public DistributionManagement getDistributionManagement() + { + return model.getDistributionManagement(); + } } Modified: maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java?rev=1053906&r1=1053905&r2=1053906&view=diff ============================================================================== --- maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java (original) +++ maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java Thu Dec 30 15:00:04 2010 @@ -23,7 +23,12 @@ import java.io.File; import java.util.List; import org.apache.maven.model.Developer; +import org.apache.maven.model.DistributionManagement; +import org.apache.maven.model.IssueManagement; +import org.apache.maven.model.License; import org.apache.maven.model.Model; +import org.apache.maven.model.Organization; +import org.apache.maven.model.Scm; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.codehaus.plexus.util.ReaderFactory; @@ -76,4 +81,46 @@ public class DoapProjectStub { return model.getDevelopers(); } + + @Override + public String getDescription() + { + return model.getDescription(); + } + + @Override + public String getInceptionYear() + { + return model.getInceptionYear(); + } + + @Override + public List<License> getLicenses() + { + return model.getLicenses(); + } + + @Override + public Scm getScm() + { + return model.getScm(); + } + + @Override + public IssueManagement getIssueManagement() + { + return model.getIssueManagement(); + } + + @Override + public DistributionManagement getDistributionManagement() + { + return model.getDistributionManagement(); + } + + @Override + public Organization getOrganization() + { + return model.getOrganization(); + } } Modified: maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml?rev=1053906&r1=1053905&r2=1053906&view=diff ============================================================================== --- maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml (original) +++ maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml Thu Dec 30 15:00:04 2010 @@ -53,11 +53,13 @@ under the License. <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration</developerConnection> <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration</url> </scm> - <issueManagement> <system>JIRA</system> <url>http://jira.codehaus.org/browse/MDOAPTEST</url> </issueManagement> + <distributionManagement> + <downloadUrl>http://foo.org/download.html</downloadUrl> + </distributionManagement> <developers> <developer> @@ -67,6 +69,7 @@ under the License. <organization>ASF</organization> <roles> <role>PMC Member</role> + <role>chairman</role> </roles> <timezone>-5</timezone> </developer> @@ -85,17 +88,24 @@ under the License. <validate>true</validate> <doapOptions> - <shortdesc>test doap</shortdesc> - <created>2010-12-22</created> - <downloadPage>http://foo.org/download.html</downloadPage> - <programmingLanguage>java</programmingLanguage> + <audience>developers</audience> + <blog>http://myblog.apache.org</blog> <category>library</category> + <downloadMirror>http://mirror.apache.org</downloadMirror> + <downloadPage>http://foo.apache.org/download.html</downloadPage> + <implementations>JSR-foo</implementations> + <language>en,fr</language> + <oldHomepage>http://old.apache.org</oldHomepage> + <os>windows,linux,mac</os> + <platform>java</platform> + <programmingLanguage>java</programmingLanguage> + <screenshots>http://screenshot.apache.org</screenshots> + <serviceEndpoint>http://webservice.apache.org</serviceEndpoint> + <wiki>http://wiki.apache.org</wiki> </doapOptions> <asfExtOptions> - <charter>http://maven.apache.org</charter> - <chair>Vincent Siveton</chair> - <included>true</included> + <charter>This is an ASF project</charter> </asfExtOptions> </configuration> </plugin> Modified: maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml?rev=1053906&r1=1053905&r2=1053906&view=diff ============================================================================== --- maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml (original) +++ maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml Thu Dec 30 15:00:04 2010 @@ -36,16 +36,30 @@ under the License. <description>Test the DOAP plugin</description> <url>http://foo.org/plugins/maven-doap-plugin/tests</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <organization> + <name>foo</name> + <url>http://www.foo.org/</url> + </organization> + <scm> <connection>scm:svn:http://svn.foo.org/repos/asf/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration</connection> <developerConnection>scm:svn:https://svn.foo.org/repos/asf/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration</developerConnection> <url>http://svn.foo.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration</url> </scm> - <issueManagement> <system>JIRA</system> <url>http://jira.codehaus.org/browse/MDOAPTEST</url> </issueManagement> + <distributionManagement> + <downloadUrl>http://foo.org/download.html</downloadUrl> + </distributionManagement> <developers> <developer> @@ -74,7 +88,19 @@ under the License. <validate>true</validate> <doapOptions> + <audience>developers</audience> + <blog>http://myblog.foo.org</blog> + <category>library</category> + <downloadMirror>http://mirror.foo.org</downloadMirror> + <implementations>JSR-foo</implementations> + <language>en,fr</language> + <oldHomepage>http://old.foo.org</oldHomepage> + <os>windows,linux,mac</os> + <platform>java</platform> <programmingLanguage>java</programmingLanguage> + <screenshots>http://screenshot.foo.org</screenshots> + <serviceEndpoint>http://webservice.foo.org</serviceEndpoint> + <wiki>http://wiki.foo.org</wiki> </doapOptions> <asfExtOptions>