jvanzyl 2003/12/06 10:22:54
Modified: maven-model-tools/src/test/org/apache/maven/model
DefaultModelMarshallingTest.java
Log:
o put model xml string in the form the marshaller spits out so i can compare easily.
Revision Changes Path
1.2 +121 -126
maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java
Index: DefaultModelMarshallingTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultModelMarshallingTest.java 6 Dec 2003 18:07:12 -0000 1.1
+++ DefaultModelMarshallingTest.java 6 Dec 2003 18:22:54 -0000 1.2
@@ -20,135 +20,130 @@
{
String modelXml =
"<project>" +
- "<pomVersion>3</pomVersion>" +
- "<groupId>maven</groupId>" +
- "<artifactId>maven</artifactId>" +
- "<name>Maven</name>" +
- "<currentVersion>1.0-beta-9</currentVersion>" +
- "<inceptionYear>2001</inceptionYear>" +
- "<package>org.apache.maven</package>" +
- "<description>Description</description>" +
- "<shortDescription>shortDescription</shortDescription>" +
- "<url>http://maven.apache.org/</url>" +
- "<issueTrackingUrl>issueTrackingUrl</issueTrackingUrl>" +
- "<siteAddress>maven.apache.org</siteAddress>" +
- "<siteDirectory>/www/maven.apache.org/</siteDirectory>" +
-
"<distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>" +
- "<organization>" +
- "<name>Apache Software Foundation</name>" +
- "<url>http://apache.org/</url>" +
- "<logo>/images/jakarta-logo-blue.gif</logo>" +
- "</organization>" +
- "<repository>" +
- "<connection>anon-connection</connection>" +
- "<developerConnection>developer-connection</developerConnection>" +
- "<url>repository-url</url>" +
- "</repository>" +
- "<versions>" +
- "<version>" +
- "<id>b1</id>" +
- "<name>1.0-b1</name>" +
- "<tag>MAVEN_1_0_B1</tag>" +
- "</version>" +
- "</versions>" +
- "<mailingLists>" +
- "<mailingList>" +
- "<name>Maven User List</name>" +
- "<subscribe>subscribe</subscribe>" +
- "<unsubscribe>unsubscribe</unsubscribe>" +
- "<archive>archive</archive>" +
- "</mailingList>" +
- "</mailingLists>" +
- "<developers>" +
- "<developer>" +
- "<name>Jason van Zyl</name>" +
- "<id>jvanzyl</id>" +
- "<email>[EMAIL PROTECTED]</email>" +
- "<organization>Zenplex</organization>" +
- "<roles>" +
- "<role>Founder</role>" +
- "<role>Release Manager</role>" +
- "</roles>" +
- "</developer>" +
- "</developers>" +
- "<contributors>" +
- "<contributor>" +
- "<name>Martin van dem Bemt</name>" +
- "<email>[EMAIL PROTECTED]</email>" +
- "</contributor>" +
- "</contributors>" +
- "<dependencies>" +
- "<dependency>" +
- "<groupId>g1</groupId>" +
- "<artifactId>d1</artifactId>" +
- "<version>1.0</version>" +
- "<url>d1-url</url>" +
- "</dependency>" +
- "<dependency>" +
- "<groupId>g2</groupId>" +
- "<artifactId>d2</artifactId>" +
- "<version>2.0</version>" +
- "<url>d2-url</url>" +
- "</dependency>" +
- "</dependencies>" +
- "<build>" +
- "<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>" +
- "<sourceDirectory>sourceDirectory</sourceDirectory>" +
-
"<unitTestSourceDirectory>unitTestSourceDirectory</unitTestSourceDirectory>" +
- "<unitTest>" +
- "<includes>" +
- "<include>**/*Test.java</include>" +
- "</includes>" +
- "<excludes>" +
- "<exclude>**/RepositoryTest.java</exclude>" +
- "<exclude>**/JAXPTest.java</exclude>" +
- "</excludes>" +
- "<resources>" +
- "<resource>" +
- "<directory>${basedir}/src/test</directory>" +
- "<includes>" +
- "<include>**/*.modelXml</include>" +
- "</includes>" +
- "</resource>" +
- "</resources>" +
- "</unitTest>" +
- "<resources>" +
- "<resource>" +
- "<directory>src/conf</directory>" +
- "<includes>" +
- "<include>*.xsd</include>" +
- "<include>*.dtd</include>" +
- "<include>*.mod</include>" +
- "<include>log4j.properties</include>" +
- "<include>driver.jelly</include>" +
- "<include>driver.properties</include>" +
- "</includes>" +
- "</resource>" +
- "<resource>" +
- "<directory>src/messages</directory>" +
- "<targetPath>org/apache/maven/messages</targetPath>" +
- "<includes>" +
- "<include>messages*.properties</include>" +
- "</includes>" +
- "</resource>" +
- "</resources>" +
- "</build>" +
- "<reports>" +
- "<report>maven-jdepend-plugin</report>" +
- "<report>maven-checkstyle-plugin</report>" +
- "<report>maven-changelog-plugin</report>" +
- "<report>maven-file-activity-plugin</report>" +
- "<report>maven-developer-activity-plugin</report>" +
- "<report>maven-javadoc-plugin</report>" +
- "<report>maven-jxr-plugin</report>" +
- "<report>maven-junit-report-plugin</report>" +
- "<report>maven-tasklist-plugin</report>" +
- "<report>maven-jellydoc-plugin</report>" +
- "</reports>" +
+ " <pomVersion>3</pomVersion>" +
+ " <groupId>maven</groupId>" +
+ " <artifactId>maven</artifactId>" +
+ " <name>Maven</name>" +
+ " <currentVersion>1.0-beta-9</currentVersion>" +
+ " <inceptionYear>2001</inceptionYear>" +
+ " <package>org.apache.maven</package>" +
+ " <description>Description</description>" +
+ " <shortDescription>shortDescription</shortDescription>" +
+ " <url>http://maven.apache.org/</url>" +
+ " <issueTrackingUrl>issueTrackingUrl</issueTrackingUrl>" +
+ " <siteAddress>maven.apache.org</siteAddress>" +
+ " <siteDirectory>/www/maven.apache.org/</siteDirectory>" +
+ "
<distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>" +
+ " <organization>" +
+ " <name>Apache Software Foundation</name>" +
+ " <url>http://apache.org/</url>" +
+ " <logo>/images/jakarta-logo-blue.gif</logo>" +
+ " </organization>" +
+ " <repository>" +
+ " <connection>anon-connection</connection>" +
+ " <developerConnection>developer-connection</developerConnection>" +
+ " <url>repository-url</url>" +
+ " </repository>" +
+ " <versions>" +
+ " <version>" +
+ " <id>b1</id>" +
+ " <name>1.0-b1</name>" +
+ " <tag>MAVEN_1_0_B1</tag>" +
+ " </version>" +
+ " </versions>" +
+ " <mailingLists>" +
+ " <mailingList>" +
+ " <name>Maven User List</name>" +
+ " <subscribe>subscribe</subscribe>" +
+ " <unsubscribe>unsubscribe</unsubscribe>" +
+ " <archive>archive</archive>" +
+ " </mailingList>" +
+ " </mailingLists>" +
+ " <developers>" +
+ " <developer>" +
+ " <name>Jason van Zyl</name>" +
+ " <id>jvanzyl</id>" +
+ " <email>[EMAIL PROTECTED]</email>" +
+ " <organization>Zenplex</organization>" +
+ " <roles>" +
+ " <role>Founder</role>" +
+ " <role>Release Manager</role>" +
+ " </roles>" +
+ " </developer>" +
+ " </developers>" +
+ " <contributors>" +
+ " <contributor>" +
+ " <name>Martin van dem Bemt</name>" +
+ " <email>[EMAIL PROTECTED]</email>" +
+ " </contributor>" +
+ " </contributors>" +
+ " <dependencies>" +
+ " <dependency>" +
+ " <groupId>g1</groupId>" +
+ " <artifactId>d1</artifactId>" +
+ " <version>1.0</version>" +
+ " <url>d1-url</url>" +
+ " </dependency>" +
+ " <dependency>" +
+ " <groupId>g2</groupId>" +
+ " <artifactId>d2</artifactId>" +
+ " <version>2.0</version>" +
+ " <url>d2-url</url>" +
+ " </dependency>" +
+ " </dependencies>" +
+ " <build>" +
+ " <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>" +
+ " <sourceDirectory>sourceDirectory</sourceDirectory>" +
+ "
<unitTestSourceDirectory>unitTestSourceDirectory</unitTestSourceDirectory>" +
+ " <unitTest>" +
+ " <includes>" +
+ " <include>**/*Test.java</include>" +
+ " </includes>" +
+ " <excludes>" +
+ " <exclude>**/RepositoryTest.java</exclude>" +
+ " <exclude>**/JAXPTest.java</exclude>" +
+ " </excludes>" +
+ " <resources>" +
+ " <resource>" +
+ " <directory>${basedir}/src/test</directory>" +
+ " <includes>" +
+ " <include>**/*.modelXml</include>" +
+ " </includes>" +
+ " </resource>" +
+ " </resources>" +
+ " </unitTest>" +
+ " <resources>" +
+ " <resource>" +
+ " <directory>src/conf</directory>" +
+ " <includes>" +
+ " <include>*.xsd</include>" +
+ " <include>*.dtd</include>" +
+ " <include>*.mod</include>" +
+ " <include>log4j.properties</include>" +
+ " <include>driver.jelly</include>" +
+ " <include>driver.properties</include>" +
+ " </includes>" +
+ " </resource>" +
+ " <resource>" +
+ " <directory>src/messages</directory>" +
+ " <targetPath>org/apache/maven/messages</targetPath>" +
+ " <includes>" +
+ " <include>messages*.properties</include>" +
+ " </includes>" +
+ " </resource>" +
+ " </resources>" +
+ " </build>" +
+ " <reports>" +
+ " <report>maven-jdepend-plugin</report>" +
+ " <report>maven-checkstyle-plugin</report>" +
+ " <report>maven-changelog-plugin</report>" +
+ " </reports>" +
"</project>";
ModelUnmarshaller modelUnmarshaller = (ModelUnmarshaller) lookup(
ModelUnmarshaller.ROLE );
+ ModelMarshaller modelMarshaller = (ModelMarshaller) lookup(
ModelMarshaller.ROLE );
+
model = modelUnmarshaller.parse( new StringReader( modelXml ) );
// ----------------------------------------------------------------------
@@ -259,7 +254,7 @@
assertEquals( "**/*Test.java", (String) unitTest.getIncludes().get( 0 ) );
assertEquals( "**/RepositoryTest.java", (String)
unitTest.getExcludes().get( 0 ) );
- Resource resource0 = (Resource) unitTest.getResources().get(0);
+ Resource resource0 = (Resource) unitTest.getResources().get( 0 );
assertEquals( "${basedir}/src/test", resource0.getDirectory() );
assertEquals( "**/*.modelXml", (String) resource0.getIncludes().get( 0 ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
