jvanzyl 2003/12/06 10:07:12
Modified: maven-model-tools maven-model-tools.iws
Added: maven-model-tools/src/test/org/apache/maven/model
DefaultModelMarshallingTest.java
DefaultModelMarshallingTest.xml
Removed: maven-model-tools/src/test/org/apache/maven/model
DefaultPomUnmarshallerTest.java
DefaultPomUnmarshallerTest.xml
Log:
o setting up for a bidirectional test
Revision Changes Path
1.4 +23 -13 maven-components/maven-model-tools/maven-model-tools.iws
Index: maven-model-tools.iws
===================================================================
RCS file: /home/cvs/maven-components/maven-model-tools/maven-model-tools.iws,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-model-tools.iws 6 Dec 2003 15:44:16 -0000 1.3
+++ maven-model-tools.iws 6 Dec 2003 18:07:12 -0000 1.4
@@ -2,30 +2,32 @@
<project version="3" relativePaths="false">
<component name="FileEditorManager">
<history>
- <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/DefaultModelMarshaller.java"
line="470" column="16" vertical-scroll-proportion="0.7763466"
horizontal-scroll-proportion="0.114832535">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/DefaultModelMarshaller.java"
line="470" column="16" vertical-scroll-proportion="0.794964"
horizontal-scroll-proportion="0.114832535">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="68"
column="0" vertical-scroll-proportion="0.8442623" horizontal-scroll-proportion="0.0" />
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultPomUnmarshallerTest.java"
line="20" column="17" vertical-scroll-proportion="-1.704918"
horizontal-scroll-proportion="0.12200957">
+ <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="68"
column="0" vertical-scroll-proportion="0.8645084" horizontal-scroll-proportion="0.0" />
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java"
line="20" column="17" vertical-scroll-proportion="-1.7458034"
horizontal-scroll-proportion="0.12200957">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultModelMarshallingTest.xml"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" />
</history>
<open-files>
- <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/DefaultModelMarshaller.java"
line="470" column="16" vertical-scroll-proportion="0.7763466"
horizontal-scroll-proportion="0.114832535">
+ <source-position-entry
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/DefaultModelMarshaller.java"
line="470" column="16" vertical-scroll-proportion="0.794964"
horizontal-scroll-proportion="0.114832535">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
- <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="68"
column="0" vertical-scroll-proportion="0.8442623" horizontal-scroll-proportion="0.0" />
- <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultPomUnmarshallerTest.java"
line="20" column="17" vertical-scroll-proportion="-1.704918"
horizontal-scroll-proportion="0.12200957" selected="true">
+ <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="68"
column="0" vertical-scroll-proportion="0.8645084" horizontal-scroll-proportion="0.0" />
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java"
line="20" column="17" vertical-scroll-proportion="-1.7458034"
horizontal-scroll-proportion="0.12200957">
<folding>
<element signature="imports" expanded="true" />
</folding>
</source-position-entry>
+ <source-position-entry
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DefaultModelMarshallingTest.xml"
line="0" column="0" vertical-scroll-proportion="0.0"
horizontal-scroll-proportion="0.0" selected="true" />
</open-files>
</component>
<component name="ToolWindowManager">
@@ -33,6 +35,7 @@
<editor active="false" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="6" />
@@ -44,7 +47,6 @@
<window_info id="Messages" active="false" anchor="bottom" auto_hide="true"
internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.4" order="5" />
<window_info id="Web" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
<window_info id="EJB" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
</layout>
@@ -151,6 +153,12 @@
<option name="GROUP_GETTERS_AND_SETTERS" value="true" />
</component>
<component name="CvsConfiguration">
+ <cvs_root>
+ <option name="METHOD" value="ext" />
+ <option name="USER_NAME" value="jvanzyl" />
+ <option name="HOST" value="cvs.apache.org" />
+ <option name="REPOSITORY" value="/maven-components/maven-model-tools" />
+ </cvs_root>
<Checkout>
<option name="DATE_TAG" value="" />
<option name="REVISION_TAG" value="" />
@@ -184,7 +192,7 @@
</Diff>
<Add>
<option name="ADD_AS_BINARY" value="false" />
- <option name="LOG_MESSAGE" />
+ <option name="LOG_MESSAGE" value="" />
</Add>
<Status>
<option name="NON_RECURSIVE" value="false" />
@@ -214,13 +222,13 @@
<option name="NON_RECURSIVE" value="false" />
<option name="FORCE_RECURSIVE" value="false" />
</Editors>
- <option name="CLIENT_PATH" value="" />
- <option name="EXTERNAL_DIFF_PATH" />
+ <option name="CLIENT_PATH" value="/usr/bin/cvs" />
+ <option name="EXTERNAL_DIFF_PATH" value="" />
<option name="USE_EXTERNAL_DIFF" value="false" />
<option name="WORKING_FILES_READONLY" value="false" />
<option name="COMPRESSION_LEVEL" value="0" />
<option name="ADDITIONAL_OPTIONS" value="" />
- <option name="BINARY_FILES_EXTENSIONS" />
+ <option name="BINARY_FILES_EXTENSIONS" value="" />
<option name="REUSE_LAST_LOG_MESSAGE" value="false" />
<option name="PUT_FOCUS_INTO_LOG_MESSAGE" value="false" />
<option name="SHOW_UPDATE_OPTIONS" value="true" />
@@ -238,7 +246,9 @@
<option name="HIDE_UP_TO_DATE_FILES" value="false" />
</component>
<component name="CvsVcs">
- <expanded_paths />
+ <expanded_paths>
+ <path value="$PROJECT_DIR$" />
+ </expanded_paths>
</component>
<component name="ProjectViewSettings">
<navigator currentView="ProjectPane" flattenPackages="false"
showMembers="false" showStructure="false" autoscrollToSource="false"
splitterProportion="0.5" />
@@ -463,7 +473,7 @@
</todo-panel>
</component>
<component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="" />
+ <option name="ACTIVE_VCS_NAME" value="CVS" />
</component>
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
1.1
maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java
Index: DefaultModelMarshallingTest.java
===================================================================
package org.apache.maven.model;
import org.codehaus.plexus.PlexusTestCase;
import java.io.StringReader;
public class DefaultModelMarshallingTest
extends PlexusTestCase
{
/** Test model. */
private Model model;
public DefaultModelMarshallingTest( String testName )
{
super( testName );
}
public void testModelUnmarshalling()
throws Exception
{
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>" +
"</project>";
ModelUnmarshaller modelUnmarshaller = (ModelUnmarshaller) lookup(
ModelUnmarshaller.ROLE );
model = modelUnmarshaller.parse( new StringReader( modelXml ) );
// ----------------------------------------------------------------------
// Top-level elements
// ----------------------------------------------------------------------
assertEquals( "3", model.getPomVersion() );
assertEquals( "maven", model.getGroupId() );
assertEquals( "Maven", model.getName() );
assertEquals( "1.0-beta-9", model.getCurrentVersion() );
assertEquals( "2001", model.getInceptionYear() );
assertEquals( "org.apache.maven", model.getPackage() );
assertEquals( "Description", model.getDescription() );
assertEquals( "shortDescription", model.getShortDescription() );
assertEquals( "http://maven.apache.org/";, model.getUrl() );
assertEquals( "issueTrackingUrl", model.getIssueTrackingUrl() );
assertEquals( "maven.apache.org", model.getSiteAddress() );
assertEquals( "/www/maven.apache.org/", model.getSiteDirectory() );
assertEquals( "/www/maven.apache.org/builds/",
model.getDistributionDirectory() );
// ----------------------------------------------------------------------
// Organization
// ----------------------------------------------------------------------
assertEquals( "Apache Software Foundation",
model.getOrganization().getName() );
assertEquals( "http://apache.org/";, model.getOrganization().getUrl() );
assertEquals( "/images/jakarta-logo-blue.gif",
model.getOrganization().getLogo() );
// ----------------------------------------------------------------------
// Repository
// ----------------------------------------------------------------------
assertEquals( "anon-connection", model.getRepository().getConnection() );
assertEquals( "developer-connection",
model.getRepository().getDeveloperConnection() );
assertEquals( "repository-url", model.getRepository().getUrl() );
// ----------------------------------------------------------------------
// Versions
// ----------------------------------------------------------------------
Version v = (Version) model.getVersions().get( 0 );
assertEquals( "b1", v.getId() );
assertEquals( "1.0-b1", v.getName() );
assertEquals( "MAVEN_1_0_B1", v.getTag() );
// ----------------------------------------------------------------------
// MailingLists
// ----------------------------------------------------------------------
MailingList ml = (MailingList) model.getMailingLists().get( 0 );
assertEquals( "Maven User List", ml.getName() );
assertEquals( "subscribe", ml.getSubscribe() );
assertEquals( "unsubscribe", ml.getUnsubscribe() );
assertEquals( "archive", ml.getArchive() );
// ----------------------------------------------------------------------
// Developers
// ----------------------------------------------------------------------
Developer d = (Developer) model.getDevelopers().get( 0 );
assertEquals( "Jason van Zyl", d.getName() );
assertEquals( "jvanzyl", d.getId() );
assertEquals( "[EMAIL PROTECTED]", d.getEmail() );
assertEquals( "Zenplex", d.getOrganization() );
assertEquals( "Founder", (String) d.getRoles().first() );
// ----------------------------------------------------------------------
// Contributors
// ----------------------------------------------------------------------
Contributor c = (Contributor) model.getContributors().get( 0 );
assertEquals( "Martin van dem Bemt", c.getName() );
assertEquals( "[EMAIL PROTECTED]", c.getEmail() );
// ----------------------------------------------------------------------
// Dependencies
// ----------------------------------------------------------------------
Dependency dep = (Dependency) model.getDependencies().get( 0 );
assertEquals( "g1", dep.getGroupId() );
assertEquals( "d1", dep.getArtifactId() );
assertEquals( "1.0", dep.getVersion() );
assertEquals( "d1-url", dep.getUrl() );
Dependency dep2 = (Dependency) model.getDependencies().get( 1 );
assertEquals( "g2", dep2.getGroupId() );
assertEquals( "d2", dep2.getArtifactId() );
assertEquals( "2.0", dep2.getVersion() );
assertEquals( "d2-url", dep2.getUrl() );
// ----------------------------------------------------------------------
// Build
// ----------------------------------------------------------------------
Build build = model.getBuild();
assertEquals( "[EMAIL PROTECTED]", build.getNagEmailAddress() );
assertEquals( "sourceDirectory", build.getSourceDirectory() );
assertEquals( "unitTestSourceDirectory", build.getUnitTestSourceDirectory()
);
UnitTest unitTest = build.getUnitTest();
assertEquals( "**/*Test.java", (String) unitTest.getIncludes().get( 0 ) );
assertEquals( "**/RepositoryTest.java", (String) unitTest.getExcludes().get(
0 ) );
Resource resource0 = (Resource) unitTest.getResources().get(0);
assertEquals( "${basedir}/src/test", resource0.getDirectory() );
assertEquals( "**/*.modelXml", (String) resource0.getIncludes().get( 0 ) );
Resource resource1 = (Resource) build.getResources().get( 0 );
assertEquals( "src/conf", resource1.getDirectory() );
assertEquals( "*.xsd", (String) resource1.getIncludes().get( 0 ) );
Resource resource2 = (Resource) build.getResources().get( 1 );
assertEquals( "src/messages", resource2.getDirectory() );
assertEquals( "org/apache/maven/messages", resource2.getTargetPath() );
assertEquals( "messages*.properties", (String) resource2.getIncludes().get(
0 ) );
// ----------------------------------------------------------------------
// Reports
// ----------------------------------------------------------------------
assertEquals( "maven-jdepend-plugin", model.getReports().get( 0 ) );
assertEquals( "maven-checkstyle-plugin", model.getReports().get( 1 ) );
}
}
1.1
maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.xml
Index: DefaultModelMarshallingTest.xml
===================================================================
<configuration>
<components>
<component>
<role>org.apache.maven.model.ModelUnmarshaller</role>
<implementation>org.apache.maven.model.DefaultModelUnmarshaller</implementation>
<configuration/>
</component>
</components>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
