You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/16 15:55:54 UTC
svn commit: r727060 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0058/ resources/it0059/
resources/it0061/ resources/it0062/ resources/it0065/ resources/it0066/
resources/it0067/ resources/it0...
Author: bentmann
Date: Tue Dec 16 06:55:52 2008
New Revision: 727060
URL: http://svn.apache.org/viewvc?rev=727060&view=rev
Log:
o Renamed ITs to match corresponding JIRA issue
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0065Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0058Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0067Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java (contents, props changed)
- copied, changed from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0066Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0666/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0059/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0680/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0065/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0731/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0061/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0761/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0062/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0768/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0069/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0773/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0058/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0814/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0067/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0851/ (props changed)
- copied from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0066/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0058Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0065Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0066Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0067Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0058/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0059/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0061/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0062/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0065/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0066/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0067/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0069/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.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=727060&r1=727059&r2=727060&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 Dec 16 06:55:52 2008
@@ -215,9 +215,17 @@
suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class );
suite.addTestSuite( MavenITmng1323AntrunDependenciesTest.class );
suite.addTestSuite( MavenITmng0866EvaluateDefaultValueTest.class );
+ suite.addTestSuite( MavenITmng0851CustomPomFilenameTest.class );
suite.addTestSuite( MavenITmng0848SystemPropOverridesDefaultValueTest.class );
suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class );
+ suite.addTestSuite( MavenITmng0814ExplicitProfileActivationTest.class );
+ suite.addTestSuite( MavenITmng0773SettingsProfileReactorPollutionTest.class );
+ suite.addTestSuite( MavenITmng0768OfflineModeTest.class );
+ suite.addTestSuite( MavenITmng0761MissingSnapshotDistRepoTest.class );
+ suite.addTestSuite( MavenITmng0731LegacyRepoLayoutTest.class );
+ suite.addTestSuite( MavenITmng0680ParentBasedirTest.class );
suite.addTestSuite( MavenITmng0674PluginParameterAliasTest.class );
+ suite.addTestSuite( MavenITmng0666IgnoreLegacyPomTest.class );
suite.addTestSuite( MavenITmng0557UserSettingsCliOptionTest.class );
suite.addTestSuite( MavenITmng0522PluginMgmtConfigTest.class );
suite.addTestSuite( MavenITmng0507ArtifactRelocationTest.class );
@@ -268,16 +276,8 @@
suite.addTestSuite( MavenIT0073Test.class );
suite.addTestSuite( MavenIT0072Test.class );
suite.addTestSuite( MavenIT0071Test.class );
- suite.addTestSuite( MavenIT0069Test.class );
- suite.addTestSuite( MavenIT0067Test.class );
- suite.addTestSuite( MavenIT0066Test.class );
- suite.addTestSuite( MavenIT0065Test.class );
suite.addTestSuite( MavenIT0064Test.class );
suite.addTestSuite( MavenIT0063Test.class );
- suite.addTestSuite( MavenIT0062Test.class );
- suite.addTestSuite( MavenIT0061Test.class );
- suite.addTestSuite( MavenIT0059Test.class );
- suite.addTestSuite( MavenIT0058Test.class );
suite.addTestSuite( MavenIT0056Test.class );
suite.addTestSuite( MavenIT0053Test.class );
suite.addTestSuite( MavenIT0052Test.class );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java?rev=727060&r1=727059&r2=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java Tue Dec 16 06:55:52 2008
@@ -25,7 +25,8 @@
import java.io.File;
/**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-249">MNG-249</a>.
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-249">MNG-249</a> and
+ * <a href="http://jira.codehaus.org/browse/MNG-870">MNG-870</a>.
*
* @author Brett Porter
* @version $Id$
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0059Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java Tue Dec 16 06:55:52 2008
@@ -27,7 +27,13 @@
import java.util.List;
import java.util.Properties;
-public class MavenIT0059Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-666">MNG-666</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0666IgnoreLegacyPomTest
extends AbstractMavenIntegrationTestCase
{
@@ -35,10 +41,10 @@
* Verify that maven-1 POMs will be ignored but not stop the resolution
* process.
*/
- public void testit0059()
+ public void testitMNG666()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0059" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0666" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifacts( "org.apache.maven.its.it0059" );
Properties verifierProperties = new Properties();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0065Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0065Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0065Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java Tue Dec 16 06:55:52 2008
@@ -24,17 +24,23 @@
import java.io.File;
-public class MavenIT0065Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-680">MNG-680</a>.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0680ParentBasedirTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that the basedir of the parent is set correctly.
*/
- public void testit0065()
+ public void testitMNG680()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0065" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0680" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.it0065", "plugin", "1.0", "maven-plugin" );
verifier.executeGoal( "install" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0061Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java Tue Dec 16 06:55:52 2008
@@ -24,7 +24,13 @@
import java.io.File;
-public class MavenIT0061Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-731">MNG-731</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0731LegacyRepoLayoutTest
extends AbstractMavenIntegrationTestCase
{
@@ -33,10 +39,10 @@
* results in a groupId directory of 'the.full.group.id' instead of
* 'the/full/group/id'.
*/
- public void testit0061()
+ public void testitMNG731()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0061" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0731" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0062Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java Tue Dec 16 06:55:52 2008
@@ -24,11 +24,17 @@
import java.io.File;
-public class MavenIT0062Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-761">MNG-761</a>.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0761MissingSnapshotDistRepoTest
extends AbstractMavenIntegrationTestCase
{
- public MavenIT0062Test()
+ public MavenITmng0761MissingSnapshotDistRepoTest()
{
super( "(2.0.2,)" );
}
@@ -37,10 +43,10 @@
* Test that a deployment of a snapshot falls back to a non-snapshot repository if no snapshot repository is
* specified.
*/
- public void testit0062()
+ public void testitMNG761()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0062" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0761" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-it-it0062-SNAPSHOT", "1.0", "jar" );
verifier.executeGoal( "deploy" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java Tue Dec 16 06:55:52 2008
@@ -26,17 +26,23 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0069Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-768">MNG-768</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0768OfflineModeTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test offline mode.
*/
- public void testit0069()
+ public void testitMNG768()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0069" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0768" );
{
// phase 1: run build in online mode to fill local repo
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0058Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0058Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0058Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java Tue Dec 16 06:55:52 2008
@@ -26,7 +26,13 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0058Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-773">MNG-773</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0773SettingsProfileReactorPollutionTest
extends AbstractMavenIntegrationTestCase
{
@@ -34,13 +40,13 @@
* Verify that profiles from settings.xml do not pollute module lists
* across projects in a reactorized build.
*/
- public void testit0058()
+ public void testitMNG773()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0058" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0773" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
- cliOptions.add( "--settings ./settings.xml" );
+ cliOptions.add( "--settings settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "subproject/target/subproject-1.0.jar" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0067Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0067Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0067Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java Tue Dec 16 06:55:52 2008
@@ -26,17 +26,23 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0067Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-814">MNG-814</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0814ExplicitProfileActivationTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test activation of a profile from the command line.
*/
- public void testit0067()
+ public void testitMNG814()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0067" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0814" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.0", "jar" );
List cliOptions = new ArrayList();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java (from r727036, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0066Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0066Test.java&r1=727036&r2=727060&rev=727060&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0066Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java Tue Dec 16 06:55:52 2008
@@ -26,17 +26,23 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0066Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-851">MNG-851</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0851CustomPomFilenameTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that nonstandard POM files will be installed correctly.
*/
- public void testit0066()
+ public void testitMNG851()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0066" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0851" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-f other-pom.xml" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0851CustomPomFilenameTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0666/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0680/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0731/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0761/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0768/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0773/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0814/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0851/
------------------------------------------------------------------------------
svn:mergeinfo =