You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/10 11:46:01 UTC
svn commit: r733262 - in /maven/components/trunk/maven-project/src/test:
java/org/apache/maven/project/builder/
resources-project-builder/id-container-joining-with-empty-elements/
resources-project-builder/id-container-joining-with-empty-elements/sub/
Author: bentmann
Date: Sat Jan 10 02:46:00 2009
New Revision: 733262
URL: http://svn.apache.org/viewvc?rev=733262&view=rev
Log:
o Created UT for MNG-3979
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml (with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=733262&r1=733261&r2=733262&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Sat Jan 10 02:46:00 2009
@@ -418,7 +418,15 @@
assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop0" ).toString() ) );
assertEquals( pom.getBasedir(), new File( pom.getValue( "properties/prop1" ).toString() ) );
}
-
+
+ /* FIXME: cf. MNG-3979
+ public void testJoiningOfContainersWhenChildHasEmptyElements()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "id-container-joining-with-empty-elements/sub" );
+ assertNotNull( pom );
+ }
+ //*/
private PomArtifactResolver artifactResolver( String basedir )
{
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml?rev=733262&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml Sat Jan 10 02:46:00 2009
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3979</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3979</name>
+ <description>
+ Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+ POM has a non-empty element and the child POM has an empty element to join.
+ </description>
+
+ <properties>
+ <prop0>test</prop0>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>equal-repo-id</id>
+ <url>http://maven.apache.org/null</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>equal-build-exec-id</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>reset</goal>
+ </goals>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>test</string>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <reportSets>
+ <reportSet>
+ <id>equal-report-exec-id</id>
+ <reports>
+ <report>reset</report>
+ </reports>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>test</string>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml?rev=733262&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml Sat Jan 10 02:46:00 2009
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3979</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3979</name>
+ <description>
+ Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
+ POM has a non-empty element and the child POM has an empty element to join.
+ </description>
+
+ <properties/>
+
+ <repositories>
+ <repository>
+ <id>equal-repo-id</id>
+ <url>file:///${basedir}/null</url>
+ <snapshots/>
+ <releases/>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>equal-build-exec-id</id>
+ <phase>initialize</phase>
+ <goals/>
+ <configuration/>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <reportSets>
+ <reportSet>
+ <id>equal-report-exec-id</id>
+ <reports/>
+ <configuration/>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision