You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/07/15 11:07:15 UTC
svn commit: r676838 - in
/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src:
main/java/org/apache/maven/project/builder/PomClassicTransformer.java
test/java/org/apache/maven/project/MavenProjectDynamismTest.java
Author: sisbell
Date: Tue Jul 15 02:07:14 2008
New Revision: 676838
URL: http://svn.apache.org/viewvc?rev=676838&view=rev
Log:
Fixed unit tests. The new builder code reverses order of tags.
Modified:
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=676838&r1=676837&r2=676838&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Tue Jul 15 02:07:14 2008
@@ -207,7 +207,7 @@
if (domainModels.size() > 1) {
ModelDataSource source = new DefaultModelDataSource();
source.init(tmp, Arrays.asList(new ArtifactModelContainerFactory(), new IdModelContainerFactory()));
- List<ModelContainer> containers = null;
+ List<ModelContainer> containers;
try {
containers = source.queryFor(ProjectUri.Dependencies.Dependency.xUri);
} catch (IllegalArgumentException e) {
Modified: maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=676838&r1=676837&r2=676838&view=diff
==============================================================================
--- maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java (original)
+++ maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java Tue Jul 15 02:07:14 2008
@@ -112,14 +112,14 @@
children = conf.getChildren();
assertEquals( 3, children.length );
- assertEquals( "Configuration parameter: " + children[0].getName() + " should have "
- + projectGidExpr + " as its value.", children[0].getValue(), projectGidExpr );
+ assertEquals( "Configuration parameter: " + children[2].getName() + " should have "
+ + projectGidExpr + " as its value.", children[2].getValue(), projectGidExpr );
assertEquals( "Configuration parameter: " + children[1].getName() + " should have "
+ pomGidExpr + " as its value.", children[1].getValue(), pomGidExpr );
- assertEquals( "Configuration parameter: " + children[2].getName() + " should have "
- + nakedGidExpr + " as its value.", children[2].getValue(), nakedGidExpr );
+ assertEquals( "Configuration parameter: " + children[0].getName() + " should have "
+ + nakedGidExpr + " as its value.", children[0].getValue(), nakedGidExpr );
}
public void testRoundTrip()