Author: bentmann
Date: Sun Nov 9 14:45:56 2008
New Revision: 712582
URL: http://svn.apache.org/viewvc?rev=712582&view=rev
Log:
o Renamed some ITs to match their corresponding JIRA issues
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
(contents, props changed)
- copied, changed from r712573,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
(contents, props changed)
- copied, changed from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0107Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
(contents, props changed)
- copied, changed from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0106Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2201/
(props changed)
- copied from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2201/pom.xml
- copied unchanged from r712573,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2293/
(props changed)
- copied from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0107/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2318/
(props changed)
- copied from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0106/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0106Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0107Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0104/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0106/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0107/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2201/src/
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=712582&r1=712581&r2=712582&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 Nov 9 14:45:56 2008
@@ -163,10 +163,13 @@
suite.addTestSuite( MavenITmng2695OfflinePluginSnapshotsTest.class );
suite.addTestSuite( MavenITmng2562TimestampTest.class );
suite.addTestSuite( MavenITmng2339BadProjectInterpolationTest.class );
+ suite.addTestSuite( MavenITmng2318LocalParentResolutionTest.class );
+ suite.addTestSuite( MavenITmng2293CustomPluginParamImplTest.class );
suite.addTestSuite(
MavenITmng2277AggregatorAndResolutionPluginsTest.class );
suite.addTestSuite( MavenITmng2254PomEncodingTest.class );
suite.addTestSuite( MavenITmng2234ActiveProfilesFromSettingsTest.class
);
suite.addTestSuite( MavenITmng2228ComponentInjectionTest.class );
+ suite.addTestSuite( MavenITmng2201PluginConfigInterpolationTest.class
);
suite.addTestSuite( MavenITmng2123VersionRangeDependencyTest.class );
suite.addTestSuite( MavenITmng2068ReactorRelativeParentsTest.class );
suite.addTestSuite(
MavenITmng2045testJarDependenciesBrokenInReactorTest.class );
@@ -193,9 +196,6 @@
suite.addTestSuite(
MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class );
suite.addTestSuite(
MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.class );
suite.addTestSuite(
MavenIT0110PluginDependenciesComeFromPluginReposTest.class );
- suite.addTestSuite( MavenIT0107Test.class );
- suite.addTestSuite( MavenIT0106Test.class );
- suite.addTestSuite( MavenIT0104Test.class );
suite.addTestSuite( MavenIT0103Test.class );
suite.addTestSuite( MavenIT0102Test.class );
suite.addTestSuite( MavenIT0101Test.class );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
(from r712573,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java&r1=712573&r2=712582&rev=712582&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0104Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
Sun Nov 9 14:45:56 2008
@@ -30,17 +30,17 @@
*
* @version $Id$
*/
-public class MavenIT0104Test
+public class MavenITmng2201PluginConfigInterpolationTest
extends AbstractMavenIntegrationTestCase
{
/**
* Verify that plugin configurations are correctly interpolated
*/
- public void testit0104()
+ public void testitMNG2201()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0104" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2201" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
(from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0107Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0107Test.java&r1=712530&r2=712582&rev=712582&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0107Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
Sun Nov 9 14:45:56 2008
@@ -27,26 +27,28 @@
import java.util.List;
/**
- * #it0107 requires a snapshot version of maven-plugin-plugin, which indicates
it doesn't belong here
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-2293";>MNG-2293</a>.
+ *
+ * @version $Id$
*/
-public class MavenIT0107Test
+public class MavenITmng2293CustomPluginParamImplTest
extends AbstractMavenIntegrationTestCase
{
+
/**
* Verify that default implementation of an implementation for a complex
object works as
* expected [MNG-2293]
*/
- public void testit0107()
+ public void testitMNG2293()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0107" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2293" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
(from r712530,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0106Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0106Test.java&r1=712530&r2=712582&rev=712582&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0106Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
Sun Nov 9 14:45:56 2008
@@ -25,24 +25,25 @@
import java.io.File;
/**
- * #it0106 MNG-2318 not yet fixed
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-2318";>MNG-2318</a>.
+ *
+ * @version $Id$
*/
-public class MavenIT0106Test
+public class MavenITmng2318LocalParentResolutionTest
extends AbstractMavenIntegrationTestCase
{
/**
* When a project has modules and its parent is not preinstalled [MNG-2318]
*/
- public void testit0106()
+ public void testitMNG2318()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0106" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2318" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
-
}
-}
+}
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2201/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2293/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2318/
------------------------------------------------------------------------------
svn:mergeinfo =
