From commits-return-22408-apmail-maven-commits-archive=maven.apache.org@maven.apache.org Fri Nov 28 18:11:21 2008 Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 52655 invoked from network); 28 Nov 2008 18:11:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Nov 2008 18:11:20 -0000 Received: (qmail 17448 invoked by uid 500); 28 Nov 2008 18:11:31 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 17378 invoked by uid 500); 28 Nov 2008 18:11:31 -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 17368 invoked by uid 99); 28 Nov 2008 18:11:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Nov 2008 10:11:30 -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; Fri, 28 Nov 2008 18:10:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE8D523888A4; Fri, 28 Nov 2008 10:10:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r721545 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0117-testUsesOfPropertiesInAMojo/ resources/mng-2843/ Date: Fri, 28 Nov 2008 18:10:47 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081128181047.BE8D523888A4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Fri Nov 28 10:10:47 2008 New Revision: 721545 URL: http://svn.apache.org/viewvc?rev=721545&view=rev Log: o Added test controller for orphaned IT project Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/ (props changed) - copied from r721435, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/ Removed: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/ 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/resources/mng-2843/pom.xml 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=721545&r1=721544&r2=721545&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 Fri Nov 28 10:10:47 2008 @@ -168,6 +168,7 @@ suite.addTestSuite( MavenITmng2878DefaultReportXmlImportTest.class ); suite.addTestSuite( MavenITmng2871PrePackageSubartifactResolutionTest.class ); suite.addTestSuite( MavenITmng2861RelocationsAndRangesTest.class ); + suite.addTestSuite( MavenITmng2843PluginConfigPropertiesInjectionTest.class ); suite.addTestSuite( MavenITmng2790LastUpdatedMetadataTest.class ); suite.addTestSuite( MavenITmng2749ExtensionAvailableToPluginTest.class ); suite.addTestSuite( MavenITmng2744checksumVerificationTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java?rev=721545&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java Fri Nov 28 10:10:47 2008 @@ -0,0 +1,61 @@ +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-2843. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng2843PluginConfigPropertiesInjectionTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng2843PluginConfigPropertiesInjectionTest() + { + } + + /** + * Test that plugins can have the project properties injected via ${project.properties}. + */ + public void testitMNG2843() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2843" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties props = verifier.loadProperties( "target/project.properties" ); + assertEquals( "PASSED", props.getProperty( "key" ) ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/pom.xml?rev=721545&r1=721435&r2=721545&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/pom.xml (original) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2843/pom.xml Fri Nov 28 10:10:47 2008 @@ -1,8 +1,36 @@ + + + + 4.0.0 - org.apache.maven.its.it0117 + + org.apache.maven.its.mng2843 parent 1.0-SNAPSHOT + + Maven Integration Test :: MNG-2843 + + Test that plugins can have the project properties injected via ${project.properties}. + + @@ -20,8 +48,8 @@ + - bastille - sonambulist + PASSED