Repository: maven-integration-testing Updated Branches: refs/heads/master 2e74409fc -> 3311f4e34
MNG-5889 moved IT to its own test suite to run it only with 3.4.0 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/3311f4e3 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3311f4e3 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3311f4e3 Branch: refs/heads/master Commit: 3311f4e345fe7e6c343fae737631b727aba5b910 Parents: 2e74409 Author: Hervé Boutemy <[email protected]> Authored: Mon Nov 14 01:00:49 2016 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Mon Nov 14 01:00:49 2016 +0100 ---------------------------------------------------------------------- .../apache/maven/it/IntegrationTestSuite.java | 1 + .../it/MavenITmng5771CoreExtensionsTest.java | 29 +++---------- .../it/MavenITmng5889CoreExtensionsTest.java | 44 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/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 3713aa7..2f288fa 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 @@ -105,6 +105,7 @@ public class IntegrationTestSuite // ------------------------------------------------------------------------------------------------------------- // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 + suite.addTestSuite( MavenITmng5889CoreExtensionsTest.class ); suite.addTestSuite( MavenITmng6079DependencyManagementImportInterpolationTest.class ); suite.addTestSuite( MavenITmng6049VersionRangeResultFilterExtensionTest.class ); suite.addTestSuite( MavenITmng5527DependencyManagementImportRelocationsTest.class ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index 9462bba..fb149a4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -5,6 +5,11 @@ import java.util.Properties; import org.apache.maven.it.util.ResourceExtractor; +/** + * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-5771";>MNG-5771</a>: + * check that Maven loads core extensions and components contributed by <code>.mvn/extensions.xml</code> + * are available to regular plugins. + */ public class MavenITmng5771CoreExtensionsTest extends AbstractMavenIntegrationTestCase { @@ -83,28 +88,4 @@ public class MavenITmng5771CoreExtensionsTest server.stop(); } - - /** - * check that <code>.mvn/</code> is found when current dir does not contain <code>pom.xml</code> - * but path to POM set by <code>--file path/to/pom.xml</code> - */ - public void testCoreExtensionMNG5889File() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" ); - - Verifier verifier = newVerifier( testDir.getAbsolutePath() ); // not client directory - verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); - - verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.deleteDirectory( "client/target" ); - verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" ); - verifier.getCliOptions().add( "-s" ); - verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() ); - verifier.getCliOptions().add( "-f" ); // --file client/pom.xml - verifier.getCliOptions().add( new File( testDir, "client/pom.xml" ).getAbsolutePath() ); - verifier.executeGoal( "validate" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } } http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3311f4e3/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889CoreExtensionsTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889CoreExtensionsTest.java new file mode 100644 index 0000000..e7df86e --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889CoreExtensionsTest.java @@ -0,0 +1,44 @@ +package org.apache.maven.it; + +import java.io.File; + +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-5889";>MNG-5889</a>: + * check that extensions in <code>.mvn/</code> are found when Maven is run with <code>-f path/to/pom.xml</code>. + * Reuses MNG-5771 core extensions IT to run the test in new conditions. + * + * @see MavenITmng5771CoreExtensionsTest + */ +public class MavenITmng5889CoreExtensionsTest + extends AbstractMavenIntegrationTestCase +{ + public MavenITmng5889CoreExtensionsTest() + { + super( "(3.4.0-alpha,)" ); + } + /** + * check that <code>.mvn/</code> is found when current dir does not contain <code>pom.xml</code> + * but path to POM set by <code>--file path/to/pom.xml</code> + */ + public void testCoreExtensionFile() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5771-core-extensions" ); + + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); // not client directory + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + + verifier = newVerifier( testDir.getAbsolutePath() ); + verifier.deleteDirectory( "client/target" ); + verifier.deleteArtifacts( "org.apache.maven.its.it-core-extensions" ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() ); + verifier.getCliOptions().add( "-f" ); // --file client/pom.xml + verifier.getCliOptions().add( new File( testDir, "client/pom.xml" ).getAbsolutePath() ); + verifier.executeGoal( "validate" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +}
