Repository: maven-integration-testing Updated Branches: refs/heads/master da436b95b -> c09aaa355
Use the proper term for char U+002D (-) hyphen(-minus) instead of dash Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/c09aaa35 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/c09aaa35 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/c09aaa35 Branch: refs/heads/master Commit: c09aaa3554b0b67ebedabbfc7821c55d1aecb1da Parents: da436b9 Author: Michael Osipov <1983-01...@gmx.net> Authored: Tue Dec 29 01:18:28 2015 +0100 Committer: Michael Osipov <1983-01...@gmx.net> Committed: Tue Dec 29 01:18:28 2015 +0100 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 2 +- ...enITmng3268MultipleDashPCommandLineTest.java | 63 -------------------- ...ITmng3268MultipleHyphenPCommandLineTest.java | 63 ++++++++++++++++++++ .../MavenITmng3545ProfileDeactivationTest.java | 2 +- 4 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c09aaa35/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index bd1f77b..f659413 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -497,7 +497,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3284UsingCachedPluginsTest.class ); suite.addTestSuite( MavenITmng3271DefaultReportsSuppressionTest.class ); suite.addTestSuite( MavenITmng3221InfiniteForkingTest.class ); - suite.addTestSuite( MavenITmng3268MultipleDashPCommandLineTest.class ); + suite.addTestSuite( MavenITmng3268MultipleHyphenPCommandLineTest.class ); suite.addTestSuite( MavenITmng3259DepsDroppedInMultiModuleBuildTest.class ); suite.addTestSuite( MavenITmng3220ImportScopeTest.class ); suite.addTestSuite( MavenITmng3217InterPluginDependencyTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c09aaa35/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java deleted file mode 100644 index d97b33e..0000000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java +++ /dev/null @@ -1,63 +0,0 @@ -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 <a href="https://issues.apache.org/jira/browse/MNG-3268";>MNG-3268</a>. - * - * @version $Id$ - */ -public class MavenITmng3268MultipleDashPCommandLineTest - extends AbstractMavenIntegrationTestCase -{ - - public MavenITmng3268MultipleDashPCommandLineTest() - { - super( "(2.0.9,)" ); - } - - public void testMultipleProfileParams() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3268" ); - - Verifier verifier; - - verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); - - verifier.addCliOption( "-Pprofile1,profile2" ); - verifier.addCliOption( "-Pprofile3" ); - verifier.addCliOption( "-P profile4" ); - verifier.executeGoal( "package" ); - - verifier.verifyErrorFreeLog(); - verifier.assertFilePresent( "target/profile1/touch.txt" ); - verifier.assertFilePresent( "target/profile2/touch.txt" ); - verifier.assertFilePresent( "target/profile3/touch.txt" ); - verifier.assertFilePresent( "target/profile4/touch.txt" ); - verifier.resetStreams(); - } - -} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c09aaa35/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java new file mode 100644 index 0000000..1237c1e --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -0,0 +1,63 @@ +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 <a href="https://issues.apache.org/jira/browse/MNG-3268";>MNG-3268</a>. + * + * @version $Id$ + */ +public class MavenITmng3268MultipleHyphenPCommandLineTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng3268MultipleDashPCommandLineTest() + { + super( "(2.0.9,)" ); + } + + public void testMultipleProfileParams() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3268" ); + + Verifier verifier; + + verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); + + verifier.addCliOption( "-Pprofile1,profile2" ); + verifier.addCliOption( "-Pprofile3" ); + verifier.addCliOption( "-P profile4" ); + verifier.executeGoal( "package" ); + + verifier.verifyErrorFreeLog(); + verifier.assertFilePresent( "target/profile1/touch.txt" ); + verifier.assertFilePresent( "target/profile2/touch.txt" ); + verifier.assertFilePresent( "target/profile3/touch.txt" ); + verifier.assertFilePresent( "target/profile4/touch.txt" ); + verifier.resetStreams(); + } + +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c09aaa35/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index 9317194..2b65780 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -68,7 +68,7 @@ public class MavenITmng3545ProfileDeactivationTest * Test command line deactivation of active by default profiles. * */ - public void testDeactivateDefaultProfilesDash() + public void testDeactivateDefaultProfilesHyphen() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3545" );
