Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 87190 invoked from network); 12 Nov 2008 20:50:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Nov 2008 20:50:32 -0000 Received: (qmail 46584 invoked by uid 500); 12 Nov 2008 20:50:39 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 46533 invoked by uid 500); 12 Nov 2008 20:50:39 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 46524 invoked by uid 99); 12 Nov 2008 20:50:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2008 12:50:39 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2008 20:49:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E435223888A2; Wed, 12 Nov 2008 12:49:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r713506 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3836/ resources/mng-3836/child/ Date: Wed, 12 Nov 2008 20:49:59 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081112204959.E435223888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Wed Nov 12 12:49:59 2008 New Revision: 713506 URL: http://svn.apache.org/viewvc?rev=713506&view=rev Log: [MNG-3836] Inherited plugin configuration is merged with configuration from child whereas child config should completely override o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=713506&r1=713505&r2=713506&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Wed Nov 12 12:49:59 2008 @@ -88,6 +88,7 @@ // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng3836PluginConfigInheritanceTest.class ); suite.addTestSuite( MavenITmng3833PomInterpolationDataFlowChainTest.class ); suite.addTestSuite( MavenITmng3831PomInterpolationTest.class ); suite.addTestSuite( MavenITmng3827PluginConfigTest.class ); Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java?rev=713506&r1=713505&r2=713506&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java Wed Nov 12 12:49:59 2008 @@ -40,7 +40,7 @@ * plugin POM for backward-compat with Maven 2.0.5- (due to MNG-2892, plexus-utils is no longer part of the core * class realm in Maven 2.0.6+). */ - public void testitMNG3818() + public void testitMNG3819() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3819" ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java?rev=713506&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java Wed Nov 12 12:49:59 2008 @@ -0,0 +1,78 @@ +package org.apache.maven.it; + +/* + * 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. + */ + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +import java.io.File; +import java.util.Properties; + +/** + * This is a test set for MNG-3836. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng3836PluginConfigInheritanceTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng3836PluginConfigInheritanceTest() + { + } + + /** + * Verify that sub modules can *override* inherited plugin configuration. + */ + public void testitMNG3836() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3836" ); + + Verifier verifier = new Verifier( new File( testDir, "child" ).getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties props = verifier.loadProperties( "target/plugin-config.properties" ); + + assertEquals( "4", props.getProperty( "stringParams" ) ); + assertEquals( "PASSED-1", props.getProperty( "stringParams.0" ) ); + assertEquals( "PASSED-3", props.getProperty( "stringParams.1" ) ); + assertEquals( "PASSED-2", props.getProperty( "stringParams.2" ) ); + assertEquals( "PASSED-4", props.getProperty( "stringParams.3" ) ); + + assertEquals( "4", props.getProperty( "listParam" ) ); + assertEquals( "PASSED-1", props.getProperty( "listParam.0" ) ); + assertEquals( "PASSED-3", props.getProperty( "listParam.1" ) ); + assertEquals( "PASSED-2", props.getProperty( "listParam.2" ) ); + assertEquals( "PASSED-4", props.getProperty( "listParam.3" ) ); + + assertEquals( "4", props.getProperty( "domParam.children" ) ); + assertEquals( "PASSED-1", props.getProperty( "domParam.children.echo.0.value" ) ); + assertEquals( "PASSED-3", props.getProperty( "domParam.children.echo.1.value" ) ); + assertEquals( "PASSED-2", props.getProperty( "domParam.children.echo.2.value" ) ); + assertEquals( "PASSED-4", props.getProperty( "domParam.children.echo.3.value" ) ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml?rev=713506&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml Wed Nov 12 12:49:59 2008 @@ -0,0 +1,82 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.mng3836 + parent + 1.0-SNAPSHOT + + + org.apache.maven.its.mng3836 + child + 1.0-SNAPSHOT + + Maven Integration Test :: MNG-3836 + + Verify that children can *override* inherited plugin configuration. + + + + + + org.apache.maven.its.plugins + maven-it-plugin-configuration + 2.1-SNAPSHOT + + + target/plugin-config.properties + + PASSED-1 + PASSED-3 + PASSED-2 + PASSED-4 + + + PASSED-1 + PASSED-3 + PASSED-2 + PASSED-4 + + + PASSED-1 + PASSED-3 + PASSED-2 + PASSED-4 + + + + + validate + + config + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/child/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml?rev=713506&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml Wed Nov 12 12:49:59 2008 @@ -0,0 +1,77 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3836 + parent + 1.0-SNAPSHOT + pom + + Maven Integration Test :: MNG-3836 + + Verify that children can *override* inherited plugin configuration. + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-configuration + 2.1-SNAPSHOT + + target/failed.properties + + FAILED-1 + FAILED-3 + FAILED-2 + FAILED-4 + + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-configuration + 2.1-SNAPSHOT + + target/failed.properties + + FAILED-1 + FAILED-3 + FAILED-2 + FAILED-4 + + + FAILED-1 + FAILED-3 + FAILED-2 + FAILED-4 + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3836/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision