Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 26563 invoked from network); 27 Oct 2009 14:31:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Oct 2009 14:31:48 -0000 Received: (qmail 33167 invoked by uid 500); 27 Oct 2009 14:31:48 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 33076 invoked by uid 500); 27 Oct 2009 14:31:47 -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 33067 invoked by uid 99); 27 Oct 2009 14:31:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Oct 2009 14:31:47 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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; Tue, 27 Oct 2009 14:31:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D9BEE238885B; Tue, 27 Oct 2009 14:31:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r830203 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4408/ Date: Tue, 27 Oct 2009 14:31:24 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091027143124.D9BEE238885B@eris.apache.org> Author: bentmann Date: Tue Oct 27 14:31:24 2009 New Revision: 830203 URL: http://svn.apache.org/viewvc?rev=830203&view=rev Log: [MNG-4408] Missing settings.xml is silently ignores o Added IT Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java (with props) maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/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=830203&r1=830202&r2=830203&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 Tue Oct 27 14:31:24 2009 @@ -87,6 +87,7 @@ suite.addTestSuite( MavenITmng4411VersionInfoTest.class ); suite.addTestSuite( MavenITmng4410UsageHelpTest.class ); + suite.addTestSuite( MavenITmng4408NonExistentSettingsFileTest.class ); suite.addTestSuite( MavenITmng4405ValidPluginVersionTest.class ); suite.addTestSuite( MavenITmng4404UniqueProfileIdTest.class ); suite.addTestSuite( MavenITmng4403LenientDependencyPomParsingTest.class ); Added: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java?rev=830203&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java Tue Oct 27 14:31:24 2009 @@ -0,0 +1,100 @@ +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.List; + +/** + * This is a test set for MNG-4408. + * + * @author Benjamin Bentmann + */ +public class MavenITmng4408NonExistentSettingsFileTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng4408NonExistentSettingsFileTest() + { + super( "[3.0-alpha-3,)" ); + } + + /** + * Verify that the build fails when the user specifies a non-existing user settings file on the CLI. + */ + public void testitUserSettings() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4408" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.setLogFileName( "log-user.txt" ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "non-existing-settings.xml" ); + try + { + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + fail( "Missing settings file did not cause build error" ); + } + catch ( VerificationException e ) + { + // expected + } + finally + { + verifier.resetStreams(); + } + } + + /** + * Verify that the build fails when the user specifies a non-existing global settings file on the CLI. + */ + public void testitGlobalSettings() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4408" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.setLogFileName( "log-global.txt" ); + verifier.getCliOptions().add( "--global-settings" ); + verifier.getCliOptions().add( "non-existing-settings.xml" ); + try + { + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + fail( "Missing settings file did not cause build error" ); + } + catch ( VerificationException e ) + { + // expected + } + finally + { + verifier.resetStreams(); + } + } + +} Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml?rev=830203&view=auto ============================================================================== --- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml (added) +++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml Tue Oct 27 14:31:24 2009 @@ -0,0 +1,34 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng4408 + test + 0.1 + jar + + Maven Integration Test :: MNG-4408 + + Verify that the build fails when the user specifies a non-existing global/user settings file on the CLI. + + Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4408/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision