Author: bentmann
Date: Wed Nov 12 14:16:46 2008
New Revision: 713530
URL: http://svn.apache.org/viewvc?rev=713530&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/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
(contents, props changed)
- copied, changed from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0101Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
(contents, props changed)
- copied, changed from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
(contents, props changed)
- copied, changed from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0103Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2052/
(props changed)
- copied from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0101/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2136/
(props changed)
- copied from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0102/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/
(props changed)
- copied from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0103/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0101Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0103Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0101/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0102/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0103/
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=713530&r1=713529&r2=713530&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
Wed Nov 12 14:16:46 2008
@@ -174,8 +174,11 @@
suite.addTestSuite( MavenITmng2234ActiveProfilesFromSettingsTest.class
);
suite.addTestSuite( MavenITmng2228ComponentInjectionTest.class );
suite.addTestSuite( MavenITmng2201PluginConfigInterpolationTest.class
);
+ suite.addTestSuite( MavenITmng2196ParentResolutionTest.class );
+ suite.addTestSuite( MavenITmng2136ActiveByDefaultProfileTest.class );
suite.addTestSuite( MavenITmng2123VersionRangeDependencyTest.class );
suite.addTestSuite( MavenITmng2068ReactorRelativeParentsTest.class );
+ suite.addTestSuite(
MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.class );
suite.addTestSuite(
MavenITmng2045testJarDependenciesBrokenInReactorTest.class );
suite.addTestSuite( MavenITmng1999DefaultReportsInheritanceTest.class
);
suite.addTestSuite( MavenITmng1703PluginMgmtDepInheritanceTest.class );
@@ -199,9 +202,6 @@
suite.addTestSuite(
MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class );
suite.addTestSuite(
MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.class );
suite.addTestSuite(
MavenIT0110PluginDependenciesComeFromPluginReposTest.class );
- suite.addTestSuite( MavenIT0103Test.class );
- suite.addTestSuite( MavenIT0102Test.class );
- suite.addTestSuite( MavenIT0101Test.class );
suite.addTestSuite( MavenIT0100Test.class );
suite.addTestSuite( MavenIT0099Test.class );
suite.addTestSuite( MavenIT0098Test.class );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
(from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0101Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0101Test.java&r1=713525&r2=713530&rev=713530&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0101Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
Wed Nov 12 14:16:46 2008
@@ -26,7 +26,7 @@
import java.util.ArrayList;
import java.util.List;
-public class MavenIT0101Test
+public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
extends AbstractMavenIntegrationTestCase
{
@@ -35,10 +35,10 @@
* settings are available for interpolation of systemPath in a dependency.
* [MNG-2052]
*/
- public void testit0101()
+ public void testitMNG2052()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0101" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2052" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
(from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java&r1=713525&r2=713530&rev=713530&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
Wed Nov 12 14:16:46 2008
@@ -25,7 +25,7 @@
import java.io.File;
import java.util.Properties;
-public class MavenIT0102Test
+public class MavenITmng2136ActiveByDefaultProfileTest
extends AbstractMavenIntegrationTestCase
{
@@ -33,10 +33,10 @@
* Test that <activeByDefault/> calculations for profile activation
only
* use profiles defined in the POM. [MNG-2136]
*/
- public void testit0102()
+ public void testitMNG2136()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0102" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2136" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
(from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0103Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0103Test.java&r1=713525&r2=713530&rev=713530&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0103Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
Wed Nov 12 14:16:46 2008
@@ -25,7 +25,7 @@
import java.io.File;
-public class MavenIT0103Test
+public class MavenITmng2196ParentResolutionTest
extends AbstractMavenIntegrationTestCase
{
@@ -34,10 +34,10 @@
* a parent can build, even if that parent is not correctly referenced by
* <relativePath/> and is not in the local repository. [MNG-2196]
*/
- public void testit0103()
+ public void testitMNG2196()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0103" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2196" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2052/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2136/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2196/
------------------------------------------------------------------------------
svn:mergeinfo =
