jvanzyl 2003/12/06 07:44:16
Modified: maven-model-tools maven-model-tools.ipr
maven-model-tools.iws
maven-model-tools/src/test/org/apache/maven/model
DefaultPomUnmarshallerTest.java
Removed: maven-model-tools/src/test/org/apache/maven/model
project.xml
Log:
o getting rid of external resources for the test.
Revision Changes Path
1.2 +1 -0 maven-components/maven-model-tools/maven-model-tools.ipr
Index: maven-model-tools.ipr
===================================================================
RCS file: /home/cvs/maven-components/maven-model-tools/maven-model-tools.ipr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-model-tools.ipr 1 Sep 2003 16:06:16 -0000 1.1
+++ maven-model-tools.ipr 6 Dec 2003 15:44:16 -0000 1.2
@@ -23,6 +23,7 @@
<root type="simple"
url="jar:///home/jvanzyl/maven-repo-local/avalon/jars/avalon-framework-api-4.1.4.jar!/"
/>
<root type="simple"
url="jar:///home/jvanzyl/maven-repo-local/xpp3/jars/xpp3-1.1.2a.jar!/" />
<root type="simple"
url="jar:///home/jvanzyl/maven-repo-local/xmlpull/jars/xmlpull-1.1.2.1.jar!/" />
+ <root type="simple"
url="jar:///home/jvanzyl/maven-repo-local/junit/jars/junit-3.8.1.jar!/" />
</root>
</classPath>
<excludePath>
1.3 +26 -11 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-model-tools.iws 2 Sep 2003 14:33:48 -0000 1.2
+++ maven-model-tools.iws 6 Dec 2003 15:44:16 -0000 1.3
@@ -2,35 +2,45 @@
<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.7587822"
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.7763466"
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">
<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.82552695" 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.7587822"
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.7763466"
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">
<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.82552695" horizontal-scroll-proportion="0.0"
selected="true" />
</open-files>
</component>
<component name="ToolWindowManager">
- <frame x="-3" y="0" width="1288" height="1025" extended-state="0" />
- <editor active="true" />
+ <frame x="-4" y="3" width="1288" height="1025" extended-state="1" />
+ <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="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" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false"
internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="true" weight="0.24959743" order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="true" weight="0.24959743" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.4" order="3" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="docked" type="docked" visible="false" weight="0.33039647" order="1" />
<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" />
@@ -233,12 +243,17 @@
<component name="ProjectViewSettings">
<navigator currentView="ProjectPane" flattenPackages="false"
showMembers="false" showStructure="false" autoscrollToSource="false"
splitterProportion="0.5" />
<view id="ProjectPane">
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache/maven" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache" />
+ <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/test/org/apache/maven/model" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
<expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven" />
- <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$" />
- <expanded_node type="directory"
url="file://$PROJECT_DIR$/src/java/org/apache/maven/model" />
+ <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
<expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
</view>
<view id="SourcepathPane" />
1.4 +132 -14
maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultPomUnmarshallerTest.java
Index: DefaultPomUnmarshallerTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultPomUnmarshallerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultPomUnmarshallerTest.java 12 Oct 2003 01:15:16 -0000 1.3
+++ DefaultPomUnmarshallerTest.java 6 Dec 2003 15:44:16 -0000 1.4
@@ -2,8 +2,7 @@
import org.codehaus.plexus.PlexusTestCase;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
public class DefaultPomUnmarshallerTest
extends PlexusTestCase
@@ -16,23 +15,142 @@
super( testName );
}
- public void setUp()
+ public void testModelUnmarshalling()
throws Exception
{
- super.setUp();
-
- InputStream is = DefaultPomUnmarshallerTest.class.getResourceAsStream(
"project.xml" );
-
- assertNotNull( "Project model inputstream is null!", is );
+ 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 InputStreamReader( is ) );
- }
+ model = modelUnmarshaller.parse( new StringReader( modelXml ) );
- public void testModelUnmarshalling()
- throws Exception
- {
// ----------------------------------------------------------------------
// Top-level elements
// ----------------------------------------------------------------------
@@ -143,7 +261,7 @@
Resource resource0 = (Resource) unitTest.getResources().get(0);
assertEquals( "${basedir}/src/test", resource0.getDirectory() );
- assertEquals( "**/*.xml", (String) resource0.getIncludes().get( 0 ) );
+ assertEquals( "**/*.modelXml", (String) resource0.getIncludes().get( 0 ) );
Resource resource1 = (Resource) build.getResources().get( 0 );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
