From 8868b9e70cdbe72ed8c32207dddf10c56367f644 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sat, 6 Dec 2008 21:26:29 +0000 Subject: [PATCH] o Renamed IT to match their corresponding JIRA issue git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@724040 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/it/IntegrationTestSuite.java | 2 +- ... => MavenITmng0479OverrideCentralRepoTest.java} | 14 ++++++++++---- .../resources/{it0043 => mng-0479}/setup/pom.xml | 0 .../resources/{it0043 => mng-0479}/test/pom.xml | 0 .../{it0043 => mng-0479}/test/settings.xml | 0 5 files changed, 11 insertions(+), 5 deletions(-) rename its/core-it-suite/src/test/java/org/apache/maven/it/{MavenIT0043Test.java => MavenITmng0479OverrideCentralRepoTest.java} (90%) rename its/core-it-suite/src/test/resources/{it0043 => mng-0479}/setup/pom.xml (100%) rename its/core-it-suite/src/test/resources/{it0043 => mng-0479}/test/pom.xml (100%) rename its/core-it-suite/src/test/resources/{it0043 => mng-0479}/test/settings.xml (100%) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index f419acdac2..beaa20c132 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -219,6 +219,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng0507ArtifactRelocationTest.class ); suite.addTestSuite( MavenITmng0505VersionRangeTest.class ); suite.addTestSuite( MavenITmng0496IgnoreUnknownPluginParametersTest.class ); + suite.addTestSuite( MavenITmng0479OverrideCentralRepoTest.class ); suite.addTestSuite( MavenITmng0471CustomLifecycleTest.class ); suite.addTestSuite( MavenITmng0469ReportConfigTest.class ); suite.addTestSuite( MavenITmng0377PluginLookupFromPrefixTest.class ); @@ -277,7 +278,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0052Test.class ); suite.addTestSuite( MavenIT0051Test.class ); suite.addTestSuite( MavenIT0047Test.class ); - suite.addTestSuite( MavenIT0043Test.class ); suite.addTestSuite( MavenIT0041Test.class ); suite.addTestSuite( MavenIT0040Test.class ); suite.addTestSuite( MavenIT0039Test.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java similarity index 90% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index fd25a40158..ab6715f56d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -26,17 +26,23 @@ import java.io.File; import java.util.Collections; import java.util.Properties; -public class MavenIT0043Test +/** + * This is a test set for MNG-479. + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng0479OverrideCentralRepoTest extends AbstractMavenIntegrationTestCase { /** - * Test for repository inheritence - ensure using the same id overrides the defaults + * Test for repository inheritance - ensure using the same id overrides the defaults */ - public void testit0043() + public void testitMNG479() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0043" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0479" ); // Phase 1: Ensure the test plugin is downloaded before the test cuts off access to central File child1 = new File( testDir, "setup" ); diff --git a/its/core-it-suite/src/test/resources/it0043/setup/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0043/setup/pom.xml rename to its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0043/test/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0043/test/pom.xml rename to its/core-it-suite/src/test/resources/mng-0479/test/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0043/test/settings.xml b/its/core-it-suite/src/test/resources/mng-0479/test/settings.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0043/test/settings.xml rename to its/core-it-suite/src/test/resources/mng-0479/test/settings.xml