Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 90800 invoked from network); 7 Nov 2008 18:40:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2008 18:40:29 -0000 Received: (qmail 62449 invoked by uid 500); 7 Nov 2008 18:40:36 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 62296 invoked by uid 500); 7 Nov 2008 18:40:35 -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 62287 invoked by uid 99); 7 Nov 2008 18:40:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2008 10:40:35 -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, 07 Nov 2008 18:39:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E1833238889E; Fri, 7 Nov 2008 10:39:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712220 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-3822/ Date: Fri, 07 Nov 2008 18:39:49 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081107183957.E1833238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Fri Nov 7 10:39:30 2008 New Revision: 712220 URL: http://svn.apache.org/viewvc?rev=712220&view=rev Log: [MNG-3822] POM interpolation does not use basedir-aligned build directories o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml (with props) Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.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=712220&r1=712219&r2=712220&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 7 10:39:30 2008 @@ -88,6 +88,7 @@ // suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng3822BasedirAlignedInterpolationTest.class ); suite.addTestSuite( MavenITmng3821EqualPluginExecIdsTest.class ); suite.addTestSuite( MavenITmng3818PluginDepPlexusUtilsTest.class ); suite.addTestSuite( MavenITmng3813PluginClassPathOrderingTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java?rev=712220&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java Fri Nov 7 10:39:30 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-3822. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng3822BasedirAlignedInterpolationTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng3822BasedirAlignedInterpolationTest() + { + super( "[2.1.0-M1,)"); + } + + /** + * Verify that POM interpolation uses basedir-aligned build directories. + */ + public void testitMNG3822() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3822" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.executeGoal( "initialize" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + Properties pomProps = verifier.loadProperties( "target/interpolated.properties" ); + assertEquals( testDir, "src/main/java", pomProps.getProperty( "project.properties.buildMainSrc" ) ); + assertEquals( testDir, "src/test/java", pomProps.getProperty( "project.properties.buildTestSrc" ) ); + assertEquals( testDir, "src/main/scripts", pomProps.getProperty( "project.properties.buildScriptSrc" ) ); + assertEquals( testDir, "target", pomProps.getProperty( "project.properties.buildOut" ) ); + assertEquals( testDir, "target/classes", pomProps.getProperty( "project.properties.buildMainOut" ) ); + assertEquals( testDir, "target/test-classes", pomProps.getProperty( "project.properties.buildTestOut" ) ); + assertEquals( testDir, "target/site", pomProps.getProperty( "project.properties.siteOut" ) ); + } + + private void assertEquals( File testDir, String buildDir, String interpolatedPath ) + throws Exception + { + File actual = new File( interpolatedPath ); + File expected = new File( testDir, buildDir ); + + assertTrue( actual.isAbsolute() ); + assertEquals( expected.getCanonicalFile(), actual.getCanonicalFile() ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml?rev=712220&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml Fri Nov 7 10:39:30 2008 @@ -0,0 +1,81 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3822 + test1 + 1.0-SNAPSHOT + + Maven Integration Test :: MNG-3822 + + Verify that POM interpolation uses basedir-aligned build directories. + + + + + ${project.build.sourceDirectory} + ${project.build.testSourceDirectory} + ${project.build.scriptSourceDirectory} + ${project.build.directory} + ${project.build.outputDirectory} + ${project.build.testOutputDirectory} + ${project.reporting.outputDirectory} + + + + + + org.apache.maven.its.plugins + maven-it-plugin-expression + 2.1-SNAPSHOT + + + initialize + + eval + + + target/interpolated.properties + + project/properties + + + + + + + + src/main/java + src/test/java + src/main/scripts + target + target/classes + target/test-classes + + + + target/site + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3822/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision