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/10/26 12:56:45 UTC
svn commit: r707972 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/it0119-pluginprefixorder/
resources/it0121-transitiveDepManVersion/
resources/it0122-reactorDependencyResolution/ resources/it012...
Author: bentmann
Date: Sun Oct 26 04:56:44 2008
New Revision: 707972
URL: http://svn.apache.org/viewvc?rev=707972&view=rev
Log:
o Renamed some ITs to match their corresponding issue ids
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java (contents, props changed)
- copied, changed from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java (contents, props changed)
- copied, changed from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java (contents, props changed)
- copied, changed from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0612/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0125-newestConflictResolver/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2771/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3038/ (props changed)
- copied from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0119-pluginprefixorder/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0125-newestConflictResolver/
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=707972&r1=707971&r2=707972&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 Sun Oct 26 04:56:44 2008
@@ -72,8 +72,8 @@
/* Tests to be added
MavenIT0109ReleaseUpdateTest
-MavenIT0125NewestConflictResolverTest
-MavenIT0128DistMgmtSiteUrlParentCalculationTest
+MavenITmng0612NewestConflictResolverTest
+MavenITmng3134DistMgmtSiteUrlParentCalculationTest
MavenITmng2883LegacyRepoOfflineTest
MavenITmng3259DepsDroppedInMultiModuleBuild
MavenITmng3415JunkRepositoryMetadataTest
@@ -131,6 +131,7 @@
suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
suite.addTestSuite( MavenITmng3012Test.class );
suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
+ suite.addTestSuite( MavenITmng2926PluginPrefixOrder.class );
suite.addTestSuite( MavenITmng2921Test.class );
suite.addTestSuite( MavenITmng2892Test.class );
suite.addTestSuite( MavenITmng2878Test.class );
@@ -155,6 +156,7 @@
suite.addTestSuite( MavenITmng1493NonStandardModulePomNames.class );
suite.addTestSuite( MavenITmng1491ReactorArtifactIdCollision.class );
suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class );
+ suite.addTestSuite( MavenITmng1323AntrunDependencies.class );
suite.addTestSuite( MavenITmng0469Test.class );
suite.addTestSuite( MavenIT0141Test.class );
suite.addTestSuite( MavenIT0140Test.class );
@@ -169,8 +171,6 @@
suite.addTestSuite( MavenIT0131SiteLifecycleTest.class );
suite.addTestSuite( MavenIT0130CleanLifecycleTest.class );
suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class );
- suite.addTestSuite( MavenIT0127AntrunDependencies.class );
- suite.addTestSuite( MavenIT0119PluginPrefixOrder.class );
suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );
suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class );
suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class );
@@ -282,10 +282,10 @@
// suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
- // suite.addTestSuite( MavenIT0121TransitiveDepManVersion.class ); -- MNG-3038
- // suite.addTestSuite( MavenIT0122ReactorDependencyResolutionTest.class ); -- MNG-3023
- // suite.addTestSuite( MavenIT0123SnapshotRangeRepositoryTest.class ); -- MNG-2994
- // suite.addTestSuite( MavenIT0124PomExtensionComponentOverrideTest.class ); -- MNG-2771
+ // suite.addTestSuite( MavenITmng3038TransitiveDepManVersion.class ); -- MNG-3038
+ // suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class ); -- MNG-3023
+ // suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class ); -- MNG-2994
+ // suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class ); -- MNG-2771
return suite;
}
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java Sun Oct 26 04:56:44 2008
@@ -24,30 +24,34 @@
import java.io.File;
-public class MavenIT0125NewestConflictResolverTest
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-612">MNG-612</a>.
+ *
+ * @author Mark Hobson
+ * @version $Id$
+ */
+public class MavenITmng0612NewestConflictResolverTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that ensures the newest-wins conflict resolver is used.
- *
- * @throws Exception
- * @see <a href="http://jira.codehaus.org/browse/MNG-612">MNG-612</a>
*/
- public void testit0125() throws Exception
+ public void testitMNG612()
+ throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/dependency" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/plugin" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/project" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java (from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java&r1=707866&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java Sun Oct 26 04:56:44 2008
@@ -31,11 +31,11 @@
* @author Benjamin Bentmann
* @version $Id$
*/
-public class MavenIT0127AntrunDependencies
+public class MavenITmng1323AntrunDependencies
extends AbstractMavenIntegrationTestCase
{
- public MavenIT0127AntrunDependencies()
+ public MavenITmng1323AntrunDependencies()
{
super( "(2.999,)" );
}
@@ -47,7 +47,7 @@
public void testitMNG1323()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0127-antrunDependencies" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1323" );
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/MavenITmng1323AntrunDependencies.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java Sun Oct 26 04:56:44 2008
@@ -24,30 +24,34 @@
import java.io.File;
-public class MavenIT0124PomExtensionComponentOverrideTest
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2771">MNG-2771</a>
+ *
+ * @author Mark Hobson
+ * @version $Id$
+ */
+public class MavenITmng2771PomExtensionComponentOverrideTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that ensures the POM extensions can override default component implementations.
- *
- * @throws Exception
- * @see <a href="http://jira.codehaus.org/browse/MNG-2771">MNG-2771</a>
*/
- public void testit0124() throws Exception
+ public void testitMNG2771()
+ throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/extension" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/extension" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/plugin" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/plugin" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/project" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/project" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "verify" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java Sun Oct 26 04:56:44 2008
@@ -25,13 +25,19 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-public class MavenIT0119PluginPrefixOrder
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2926">MNG-2926</a>
+ *
+ * @author Brian Fox
+ * @version $Id$
+ */
+public class MavenITmng2926PluginPrefixOrder
extends AbstractMavenIntegrationTestCase
{
- public void testit0119()
+ public void testitMNG2926()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926" );
Verifier verifier;
//use my custom settings upon invocation.
@@ -48,7 +54,7 @@
// default order will be changed. Artificially make currently set groups disappear
// now run the test. Since we have apache and codehaus, i should get the apache one first
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926/test-project" );
cli.add("-s '" +testDir.getAbsolutePath()+"/settings-apache.xml'");
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setCliOptions( cli );
@@ -57,7 +63,7 @@
cli.clear();
// now run the test. Since we have apache and codehaus and a prefix in my settings, i should get the custom one first
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926/test-project" );
verifier = new Verifier( testDir.getAbsolutePath() );
cli.add("-s '" +testDir.getAbsolutePath()+"/settings.xml'");
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java Sun Oct 26 04:56:44 2008
@@ -24,18 +24,22 @@
import java.io.File;
-public class MavenIT0123SnapshotRangeRepositoryTest
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2994">MNG-2994</a>
+ *
+ * @author Mark Hobson
+ * @version $Id$
+ */
+public class MavenITmng2994SnapshotRangeRepositoryTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that snapshot repositories are checked for ranges with snapshot boundaries.
- *
- * @throws Exception
- * @see <a href="http://jira.codehaus.org/browse/MNG-2994">MNG-2994</a>
*/
- public void testit0123() throws Exception
+ public void testitMNG2994()
+ throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0123-snapshotRangeRepository" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "compile" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java Sun Oct 26 04:56:44 2008
@@ -24,23 +24,28 @@
import java.io.File;
-public class MavenIT0122ReactorDependencyResolutionTest
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3023">MNG-3023</a>
+ *
+ * @author Mark Hobson
+ * @version $Id$
+ */
+public class MavenITmng3023ReactorDependencyResolutionTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that reactor projects are included in dependency resolution.
- *
- * @throws Exception
*/
- public void testit0122() throws Exception
+ public void testitMNG3023()
+ throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/plugin" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023/plugin" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/project" );
+ testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023/project" );
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java (from r707955, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java&r1=707955&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java Sun Oct 26 04:56:44 2008
@@ -26,13 +26,19 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-public class MavenIT0121TransitiveDepManVersion
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3038">MNG-3038</a>
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class MavenITmng3038TransitiveDepManVersion
extends AbstractMavenIntegrationTestCase
{
- public void testit0121()
+ public void testitMNG3038()
throws Exception
{
- File testDirBase = ResourceExtractor.simpleExtractResources( getClass(), "/it0121-transitiveDepManVersion" );
+ File testDirBase = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3038" );
compileDDep( testDirBase, "D1", "1.0" );
compileDDep( testDirBase, "D2", "2.0" );
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java (from r707866, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java&r1=707866&r2=707972&rev=707972&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java Sun Oct 26 04:56:44 2008
@@ -24,17 +24,23 @@
import java.io.File;
-public class MavenIT0128DistMgmtSiteUrlParentCalculationTest
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3134">MNG-3134</a>.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng3134DistMgmtSiteUrlParentCalculationTest
extends AbstractMavenIntegrationTestCase
{
/**
- * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent. (MNG-3134)
+ * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent.
*/
- public void testit0128()
+ public void testitMNG3134()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3134" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "integration-test" );
verifier.verifyErrorFreeLog();
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0612/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2771/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2926/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3023/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3038/
------------------------------------------------------------------------------
svn:mergeinfo =