Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 61199 invoked from network); 8 Jan 2011 19:17:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Jan 2011 19:17:46 -0000 Received: (qmail 94392 invoked by uid 500); 8 Jan 2011 19:17:46 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 94309 invoked by uid 500); 8 Jan 2011 19:17:45 -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 94302 invoked by uid 99); 8 Jan 2011 19:17:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Jan 2011 19:17:45 +0000 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; Sat, 08 Jan 2011 19:17:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BEA3823888E4; Sat, 8 Jan 2011 19:17:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056769 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4960/ resources/mng-4960/mod-a/ resources/mng-4960/mod-b/ Date: Sat, 08 Jan 2011 19:17:23 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110108191723.BEA3823888E4@eris.apache.org> Author: bentmann Date: Sat Jan 8 19:17:23 2011 New Revision: 1056769 URL: http://svn.apache.org/viewvc?rev=1056769&view=rev Log: [MNG-4960] [regression] Make-like reactor mode does not build selected project when resuming from one of its prerequisites o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/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=1056769&r1=1056768&r2=1056769&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 Sat Jan 8 19:17:23 2011 @@ -84,6 +84,7 @@ public class IntegrationTestSuite // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 suite.addTestSuite( MavenITmng4966AbnormalUrlPreservationTest.class ); + suite.addTestSuite( MavenITmng4960MakeLikeReactorResumeTest.class ); suite.addTestSuite( MavenITmng4955LocalVsRemoteSnapshotResolutionTest.class ); suite.addTestSuite( MavenITmng4952MetadataReleaseInfoUpdateTest.class ); suite.addTestSuite( MavenITmng4936EventSpyTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java?rev=1056769&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java Sat Jan 8 19:17:23 2011 @@ -0,0 +1,99 @@ +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; + +/** + * This is a test set for MNG-4960. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4960MakeLikeReactorResumeTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4960MakeLikeReactorResumeTest() + { + super( "[2.1.0,3.0-alpha-1),[3.0.2,)" ); + } + + /** + * Verify that the make-like reactor mode doesn't omit the selected projects when building their prerequisites + * as well and resuming from one of them. + */ + public void testitFromUpstream() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4960" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteDirectory( "mod-a/target" ); + verifier.deleteDirectory( "mod-b/target" ); + verifier.getCliOptions().add( "--projects" ); + verifier.getCliOptions().add( "mod-b" ); + verifier.getCliOptions().add( "--also-make" ); + verifier.getCliOptions().add( "--resume-from" ); + verifier.getCliOptions().add( "mod-a" ); + verifier.setLogFileName( "log-up.txt" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFilePresent( "mod-a/target/touch.txt" ); + verifier.assertFilePresent( "mod-b/target/touch.txt" ); + verifier.assertFileNotPresent( "target/touch.txt" ); + } + + /** + * Verify that the make-like reactor mode omits the selected project when building its dependents + * as well and resuming from one of them. + */ + public void testitFromDownstream() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4960" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteDirectory( "mod-a/target" ); + verifier.deleteDirectory( "mod-b/target" ); + verifier.getCliOptions().add( "--projects" ); + verifier.getCliOptions().add( "mod-a" ); + verifier.getCliOptions().add( "--also-make-dependents" ); + verifier.getCliOptions().add( "--resume-from" ); + verifier.getCliOptions().add( "mod-b" ); + verifier.setLogFileName( "log-down.txt" ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFileNotPresent( "mod-a/target/touch.txt" ); + verifier.assertFilePresent( "mod-b/target/touch.txt" ); + verifier.assertFileNotPresent( "target/touch.txt" ); + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml?rev=1056769&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml Sat Jan 8 19:17:23 2011 @@ -0,0 +1,56 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4960 + mod-a + 0.2-SNAPSHOT + jar + + Maven Integration Test :: MNG-4960 :: Module A + + Verify that the make-like reactor mode properly resumes. + + + + + + org.apache.maven.its.plugins + maven-it-plugin-log-file + 2.1-SNAPSHOT + + + default + validate + + reset + + + target/touch.txt + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-a/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml?rev=1056769&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml Sat Jan 8 19:17:23 2011 @@ -0,0 +1,64 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4960 + mod-b + 0.2-SNAPSHOT + jar + + Maven Integration Test :: MNG-4960 :: Module B + + Verify that the make-like reactor mode properly resumes. + + + + + org.apache.maven.its.mng4960 + mod-a + 0.2-SNAPSHOT + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-log-file + 2.1-SNAPSHOT + + + default + validate + + reset + + + target/touch.txt + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/mod-b/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml?rev=1056769&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml Sat Jan 8 19:17:23 2011 @@ -0,0 +1,61 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4960 + aggregator + 0.2-SNAPSHOT + pom + + Maven Integration Test :: MNG-4960 :: Aggregator + + Verify that the make-like reactor mode properly resumes. + + + + mod-a + mod-b + + + + + + org.apache.maven.its.plugins + maven-it-plugin-log-file + 2.1-SNAPSHOT + + + default + validate + + reset + + + target/touch.txt + + + + + + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4960/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision