jvanzyl 2004/04/16 10:56:37
Modified: maven-project/src/test/java/org/apache/maven/project
DefaultProjectBuilderTest.java
ProjectBaseDirectoryAlignmentTest.java
Added: maven-project/src/test/resources/projects bad-project.xml
build.properties
child-which-inherits-from-super-model.xml
child-with-bogus-parent.xml child.xml
fully-populated-child.xml project.properties
project.xml
maven-project/src/test/resources/projects/base-directory-alignment
project-which-needs-directory-alignment-child.xml
project-which-needs-directory-alignment.xml
maven-project/src/test/resources/projects/base-directory-alignment/subproject
project-which-needs-directory-alignment-child.xml
Removed: maven-project/src/test/input NOTES.txt maven.xml
maven-project/src/test/java/org/apache/maven/project
DefaultProjectBuilderTest.xml bad-project.xml
build.properties
child-which-inherits-from-super-model.xml
child-with-bogus-parent.xml child.xml
fully-populated-child.xml
project-which-needs-directory-alignment-child.xml
project-which-needs-directory-alignment.xml
project.properties project.xml
maven-project/src/test/java/org/apache/maven/project/plugins
project-which-needs-directory-alignment-child.xml
Log:
o start collecting the test POMs together in directory per category of
testing.
Revision Changes Path
1.5 +1 -1
maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultProjectBuilderTest.java 16 Apr 2004 17:01:58 -0000 1.4
+++ DefaultProjectBuilderTest.java 16 Apr 2004 17:56:37 -0000 1.5
@@ -15,7 +15,7 @@
public class DefaultProjectBuilderTest
extends AbstractProjectTestCase
{
- private String dir = "src/test/java/org/apache/maven/project/";
+ private String dir = "src/test/resources/projects/";
public void testDefaultsPropertiesExtraction()
throws Exception
1.2 +2 -2
maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Index: ProjectBaseDirectoryAlignmentTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectBaseDirectoryAlignmentTest.java 16 Apr 2004 17:01:58 -0000 1.1
+++ ProjectBaseDirectoryAlignmentTest.java 16 Apr 2004 17:56:37 -0000 1.2
@@ -8,7 +8,7 @@
public class ProjectBaseDirectoryAlignmentTest
extends AbstractProjectTestCase
{
- private String dir = "src/test/java/org/apache/maven/project/";
+ private String dir = "src/test/resources/projects/base-directory-alignment/";
public void testProjectDirectoryBaseDirectoryAlignment()
throws Exception
@@ -53,7 +53,7 @@
public void
testProjectDirectoryBaseDirectoryAlignmentInheritanceWithParentOneDirectoryUp()
throws Exception
{
- File f = new File( basedir, dir +
"plugins/project-which-needs-directory-alignment-child.xml" );
+ File f = new File( basedir, dir +
"subproject/project-which-needs-directory-alignment-child.xml" );
MavenProject project = projectBuilder.build( f );
1.1
maven-components/maven-project/src/test/resources/projects/bad-project.xml
Index: bad-project.xml
===================================================================
i want to be a POM!
1.1
maven-components/maven-project/src/test/resources/projects/build.properties
Index: build.properties
===================================================================
name = sarel
1.1
maven-components/maven-project/src/test/resources/projects/child-which-inherits-from-super-model.xml
Index: child-which-inherits-from-super-model.xml
===================================================================
<project>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<name>Babar</name>
<!-- Build element should be inherited from the super model -->
</project>
1.1
maven-components/maven-project/src/test/resources/projects/child-with-bogus-parent.xml
Index: child-with-bogus-parent.xml
===================================================================
<project>
<extend>${basedir}/bogus.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>bogus</artifactId>
<version>1.0-beta-9</version>
</parent>
</project>
1.1
maven-components/maven-project/src/test/resources/projects/child.xml
Index: child.xml
===================================================================
<project>
<extend>project.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>maven-project-test</artifactId>
<version>1.0-beta-9</version>
</parent>
</project>
1.1
maven-components/maven-project/src/test/resources/projects/fully-populated-child.xml
Index: fully-populated-child.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<extend>project.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>maven-project-test</artifactId>
<version>1.0-beta-9</version>
</parent>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
<name>Maven</name>
<version>1.0-beta-9</version>
<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>
<scm>
<connection>anon-connection</connection>
<developerConnection>developer-connection</developerConnection>
<url>repository-url</url>
</scm>
<versions>
<version>
<id>b1</id>
<name>1.0-b1</name>
<tag>MAVEN_1_0_B1</tag>
</version>
</versions>
<branches>
<branch>
<tag>tag</tag>
</branch>
</branches>
<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>**/*.xml</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>
1.1
maven-components/maven-project/src/test/resources/projects/project.properties
Index: project.properties
===================================================================
name = jason
occupation = builder
maven.name = foo
1.1
maven-components/maven-project/src/test/resources/projects/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-project-test</artifactId>
<name>Maven</name>
<version>1.0-beta-9</version>
<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>
<scm>
<connection>anon-connection</connection>
<developerConnection>developer-connection</developerConnection>
<url>repository-url</url>
</scm>
<versions>
<version>
<id>b1</id>
<name>1.0-b1</name>
<tag>MAVEN_1_0_B1</tag>
</version>
</versions>
<branches>
<branch>
<tag>tag</tag>
</branch>
</branches>
<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>**/*.xml</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>
1.1
maven-components/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
<project>
<extend>project-which-needs-directory-alignment.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>project-which-needs-directory-alignment.xml</artifactId>
<version>1.0-beta-9</version>
</parent>
</project>
1.1
maven-components/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml
Index: project-which-needs-directory-alignment.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>3</modelVersion>
<groupId>maven</groupId>
<artifactId>project-which-needs-directory-alignment</artifactId>
<name>Maven</name>
<version>1.0-beta-9</version>
<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>
<branches>
<branch>
<tag>tag</tag>
</branch>
</branches>
<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>src/test</directory>
<includes>
<include>**/*.xml</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>
1.1
maven-components/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml
Index: project-which-needs-directory-alignment-child.xml
===================================================================
<project>
<extend>../project-which-needs-directory-alignment.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>project-which-needs-directory-alignment</artifactId>
<version>1.0-beta-9</version>
</parent>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
