jvanzyl 2003/12/06 11:53:02 Modified: maven-model-tools/src/test/org/apache/maven/model DefaultModelMarshallingTest.java Log: o insert bogus elements everywhere to make sure we deal with them properly. Revision Changes Path 1.4 +49 -5 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DefaultModelMarshallingTest.java 6 Dec 2003 19:14:00 -0000 1.3 +++ DefaultModelMarshallingTest.java 6 Dec 2003 19:53:02 -0000 1.4 @@ -21,6 +21,7 @@ { String modelXml = "<project>" + + " <extend>extend</extend>" + " <pomVersion>3</pomVersion>" + " <groupId>maven</groupId>" + " <artifactId>maven</artifactId>" + @@ -40,95 +41,126 @@ " <name>Apache Software Foundation</name>" + " <url>http://apache.org/</url>" + " <logo>/images/jakarta-logo-blue.gif</logo>" + + " <bogus>bogus</bogus>" + " </organization>" + " <licenses> "+ + " <bogus>bogus</bogus>" + " <license>"+ " <name>lic-name</name>"+ " <url>lic-url</url>"+ " <distribution>lic-distribution</distribution>"+ + " <bogus>bogus</bogus>" + " </license>"+ " </licenses>"+ " <repository>" + " <connection>anon-connection</connection>" + " <developerConnection>developer-connection</developerConnection>" + " <url>repository-url</url>" + + " <bogus>bogus</bogus>" + " </repository>" + " <versions>" + + " <bogus>bogus</bogus>" + " <version>" + " <id>b1</id>" + " <name>1.0-b1</name>" + " <tag>MAVEN_1_0_B1</tag>" + + " <bogus>bogus</bogus>" + " </version>" + " </versions>" + " <branches>" + + " <bogus>bogus</bogus>" + " <branch>" + " <tag>MAVEN_1_0_B1</tag>" + + " <bogus>bogus</bogus>" + " </branch>" + " </branches>" + " <mailingLists>" + + " <bogus>bogus</bogus>" + " <mailingList>" + " <name>Maven User List</name>" + " <subscribe>subscribe</subscribe>" + " <unsubscribe>unsubscribe</unsubscribe>" + " <archive>archive</archive>" + + " <bogus>bogus</bogus>" + " </mailingList>" + " </mailingLists>" + " <developers>" + + " <bogus>bogus</bogus>" + " <developer>" + " <name>Jason van Zyl</name>" + " <id>jvanzyl</id>" + " <email>[EMAIL PROTECTED]</email>" + " <organization>Zenplex</organization>" + + " <bogus>bogus</bogus>" + " <roles>" + + " <bogus>bogus</bogus>" + " <role>Founder</role>" + " <role>Release Manager</role>" + " </roles>" + " </developer>" + " </developers>" + " <contributors>" + + " <bogus>bogus</bogus>" + " <contributor>" + " <name>Martin van dem Bemt</name>" + " <email>[EMAIL PROTECTED]</email>" + + " <bogus>bogus</bogus>" + " </contributor>" + " </contributors>" + " <dependencies>" + + " <bogus>bogus</bogus>" + " <dependency>" + " <groupId>g1</groupId>" + " <artifactId>d1</artifactId>" + " <version>1.0</version>" + " <url>d1-url</url>" + + " <bogus>bogus</bogus>" + + " <artifact>artifact</artifact>" + " </dependency>" + " <dependency>" + " <groupId>g2</groupId>" + " <artifactId>d2</artifactId>" + " <version>2.0</version>" + " <url>d2-url</url>" + + " <jar>jar</jar>" + + " <properties>" + + " <bogus>bogus</bogus>" + + " <property>value</property>" + + " </properties>" + " </dependency>" + " </dependencies>" + " <build>" + " <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>" + " <sourceDirectory>sourceDirectory</sourceDirectory>" + " <unitTestSourceDirectory>unitTestSourceDirectory</unitTestSourceDirectory>" + + " <bogus>bogus</bogus>" + " <unitTest>" + + " <bogus>bogus</bogus>" + " <includes>" + " <include>**/*Test.java</include>" + + " <bogus>bogus</bogus>" + " </includes>" + " <excludes>" + " <exclude>**/RepositoryTest.java</exclude>" + " <exclude>**/JAXPTest.java</exclude>" + + " <bogus>bogus</bogus>" + " </excludes>" + " <resources>" + + " <bogus>bogus</bogus>" + " <resource>" + - " <directory>${basedir}/src/test</directory>" + - " <includes>" + - " <include>**/*.modelXml</include>" + - " </includes>" + - " </resource>" + + " <bogus>bogus</bogus>" + + " <directory>${basedir}/src/test</directory>" + + " <includes>" + + " <include>**/*.modelXml</include>" + + " </includes>" + + " </resource>" + " </resources>" + " </unitTest>" + " <resources>" + + " <bogus>bogus</bogus>" + " <resource>" + " <directory>src/conf</directory>" + + " <bogus>bogus</bogus>" + " <includes>" + " <include>*.xsd</include>" + " <include>*.dtd</include>" + @@ -136,6 +168,7 @@ " <include>log4j.properties</include>" + " <include>driver.jelly</include>" + " <include>driver.properties</include>" + + " <bogus>bogus</bogus>" + " </includes>" + " </resource>" + " <resource>" + @@ -144,10 +177,15 @@ " <includes>" + " <include>messages*.properties</include>" + " </includes>" + + " <excludes>" + + " <bogus>bogus</bogus>" + + " <exclude>foo</exclude>" + + " </excludes>" + " </resource>" + " </resources>" + " </build>" + " <reports>" + + " <bogus>bogus</bogus>" + " <report>maven-jdepend-plugin</report>" + " <report>maven-checkstyle-plugin</report>" + " <report>maven-changelog-plugin</report>" + @@ -171,6 +209,12 @@ model = modelUnmarshaller.parse( new StringReader( writer.toString() ) ); checkModel( model ); + + Model emptyModel = new Model(); + + StringWriter w = new StringWriter(); + + modelMarshaller.marshall( writer, model, " ", "" ); } private void checkModel( Model model )
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]