Author: kenney
Date: Fri Mar 2 04:05:15 2007
New Revision: 513720
URL: http://svn.apache.org/viewvc?view=rev&rev=513720
Log:
Fix unit tests.
The order of the tests is important since the same groupId/artifactId/version
combinations are used in different local repositories in the tests, containing
different poms. The DefaultMavenProjectBuilder caches models with g:a:v,
so it can serve a model from another local repo.
Solved this by changing groupId's in the poms and repositories so they don't
conflict.
Added:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/
- copied from r513695,
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/
- copied from r513719,
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/poms/
Removed:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven/
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
Fri Mar 2 04:05:15 2007
@@ -39,7 +39,12 @@
protected File projectFile( String name )
{
- return new File( getLocalRepositoryPath(), "/maven/poms/" + name +
"-1.0.pom" );
+ return projectFile( "maven", name );
+ }
+
+ protected File projectFile( String groupId, String artifactId )
+ {
+ return new File( getLocalRepositoryPath(), "/" + groupId + "/poms/" +
artifactId + "-1.0.pom" );
}
// ----------------------------------------------------------------------
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
Fri Mar 2 04:05:15 2007
@@ -54,7 +54,7 @@
// Check p0 value for org name
//
----------------------------------------------------------------------
- MavenProject p0 = getProject( projectFile( "p0" ) );
+ MavenProject p0 = getProject( projectFile( "maven.t01", "p0" ) );
assertEquals( "p0-org", p0.getOrganization().getName() );
@@ -62,7 +62,7 @@
// Check p1 value for org name
//
----------------------------------------------------------------------
- MavenProject p1 = getProject( projectFile( "p1" ) );
+ MavenProject p1 = getProject( projectFile( "maven.t01", "p1" ) );
assertEquals( "p1-org", p1.getOrganization().getName() );
@@ -70,7 +70,7 @@
// Check p2 value for org name
//
----------------------------------------------------------------------
- MavenProject p2 = getProject( projectFile( "p2" ) );
+ MavenProject p2 = getProject( projectFile( "maven.t01", "p2" ) );
assertEquals( "p2-org", p2.getOrganization().getName() );
@@ -78,7 +78,7 @@
// Check p2 value for org name
//
----------------------------------------------------------------------
- MavenProject p3 = getProject( projectFile( "p3" ) );
+ MavenProject p3 = getProject( projectFile( "maven.t01", "p3" ) );
assertEquals( "p3-org", p3.getOrganization().getName() );
@@ -86,7 +86,7 @@
// Check p4 value for org name
//
----------------------------------------------------------------------
- MavenProject p4 = getProject( projectFile( "p4" ) );
+ MavenProject p4 = getProject( projectFile( "maven.t01", "p4" ) );
assertEquals( "p4-org", p4.getOrganization().getName() );
}
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom
Fri Mar 2 04:05:15 2007
@@ -1,6 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<name>p0</name>
@@ -8,4 +8,4 @@
<organization>
<name>p0-org</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom
Fri Mar 2 04:05:15 2007
@@ -1,11 +1,11 @@
<project>
<parent>
<artifactId>p0</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<artifactId>p1</artifactId>
<packaging>pom</packaging>
<name>p1</name>
@@ -13,4 +13,4 @@
<organization>
<name>p1-org</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom
Fri Mar 2 04:05:15 2007
@@ -1,11 +1,11 @@
<project>
<parent>
<artifactId>p1</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<artifactId>p2</artifactId>
<packaging>pom</packaging>
<name>p2</name>
@@ -13,4 +13,4 @@
<organization>
<name>p2-org</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom
Fri Mar 2 04:05:15 2007
@@ -1,11 +1,11 @@
<project>
<parent>
<artifactId>p2</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<artifactId>p3</artifactId>
<packaging>pom</packaging>
<name>p3</name>
@@ -13,4 +13,4 @@
<organization>
<name>p3-org</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom
Fri Mar 2 04:05:15 2007
@@ -1,11 +1,11 @@
<project>
<parent>
<artifactId>p3</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t01</groupId>
<artifactId>p4</artifactId>
<packaging>jar</packaging>
<name>p4</name>
@@ -13,4 +13,4 @@
<organization>
<name>p4-org</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,13 +20,13 @@
<project>
<parent>
<artifactId>p4</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p5</artifactId>
<packaging>jar</packaging>
<name>p5</name>
<version>1.0</version>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,13 +20,13 @@
<project>
<parent>
<artifactId>p3</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p4</artifactId>
<packaging>jar</packaging>
<name>p4</name>
<version>1.0</version>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,14 +20,14 @@
<project>
<parent>
<artifactId>p2</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p3</artifactId>
<packaging>pom</packaging>
<name>p3</name>
<version>1.0</version>
<inceptionYear>2000</inceptionYear>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,11 +20,11 @@
<project>
<parent>
<artifactId>p1</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p2</artifactId>
<packaging>pom</packaging>
<name>p2</name>
@@ -34,4 +34,4 @@
<name>mailing-list</name>
</mailingList>
</mailingLists>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,11 +20,11 @@
<project>
<parent>
<artifactId>p0</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p1</artifactId>
<packaging>pom</packaging>
<name>p1</name>
@@ -48,4 +48,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml
Fri Mar 2 04:05:15 2007
@@ -19,7 +19,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t02</groupId>
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<name>p0</name>
@@ -27,4 +27,4 @@
<organization>
<name>Codehaus</name>
</organization>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml
Fri Mar 2 04:05:15 2007
@@ -20,11 +20,11 @@
<project>
<parent>
<artifactId>p0</artifactId>
- <groupId>maven</groupId>
+ <groupId>maven.t03</groupId>
<version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t03</groupId>
<artifactId>p1</artifactId>
<packaging>pom</packaging>
<name>p1</name>
@@ -42,4 +42,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml?view=diff&rev=513720&r1=513719&r2=513720
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml
Fri Mar 2 04:05:15 2007
@@ -19,7 +19,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>maven</groupId>
+ <groupId>maven.t03</groupId>
<artifactId>p0</artifactId>
<packaging>pom</packaging>
<name>p0</name>
@@ -27,4 +27,4 @@
<organization>
<name>Codehaus</name>
</organization>
-</project>
\ No newline at end of file
+</project>
