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/11/18 22:56:25 UTC
svn commit: r718729 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0091/ resources/it0096/ resources/mng-1995/ resources/mng-2054/

Author: bentmann
Date: Tue Nov 18 13:56:25 2008
New Revision: 718729

URL: http://svn.apache.org/viewvc?rev=718729&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/MavenITmng1995InterpolateBooleanModelElementsTest.java   (contents, props changed)
      - copied, changed from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0091Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java   (contents, props changed)
      - copied, changed from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0096Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1995/   (props changed)
      - copied from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0091/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2054/   (props changed)
      - copied from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0096/
Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0091Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0096Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0091/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0096/
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/MavenIT0097Test.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=718729&r1=718728&r2=718729&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 Nov 18 13:56:25 2008
@@ -186,10 +186,12 @@
         suite.addTestSuite( MavenITmng2124PomInterpolationWithParentValuesTest.class );
         suite.addTestSuite( MavenITmng2123VersionRangeDependencyTest.class );
         suite.addTestSuite( MavenITmng2068ReactorRelativeParentsTest.class );
+        suite.addTestSuite( MavenITmng2054PluginExecutionInheritanceTest.class );
         suite.addTestSuite( MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.class );
         suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class );
         suite.addTestSuite( MavenITmng2006ChildPathAwareUrlInheritanceTest.class );
         suite.addTestSuite( MavenITmng1999DefaultReportsInheritanceTest.class );
+        suite.addTestSuite( MavenITmng1995InterpolateBooleanModelElementsTest.class );
         suite.addTestSuite( MavenITmng1703PluginMgmtDepInheritanceTest.class );
         suite.addTestSuite( MavenITmng1493NonStandardModulePomNamesTest.class );
         suite.addTestSuite( MavenITmng1491ReactorArtifactIdCollisionTest.class );
@@ -213,9 +215,7 @@
         suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.class );
         suite.addTestSuite( MavenIT0110PluginDependenciesComeFromPluginReposTest.class );
         suite.addTestSuite( MavenIT0097Test.class );
-        suite.addTestSuite( MavenIT0096Test.class );
         suite.addTestSuite( MavenIT0092Test.class );
-        suite.addTestSuite( MavenIT0091Test.class );
         suite.addTestSuite( MavenIT0090Test.class );
         suite.addTestSuite( MavenIT0088Test.class );
         suite.addTestSuite( MavenIT0087Test.class );

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java?rev=718729&r1=718728&r2=718729&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0097Test.java Tue Nov 18 13:56:25 2008
@@ -30,7 +30,7 @@
 
     /**
      * Test that the implied relative path for the parent POM works, even two
-     * levels deep.
+     * levels deep (c.f. MNG-2068).
      */
     public void testit0097()
         throws Exception

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java (from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0091Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0091Test.java&r1=718712&r2=718729&rev=718729&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0091Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java Tue Nov 18 13:56:25 2008
@@ -31,11 +31,11 @@
  * @author Benjamin Bentmann
  * @version $Id$
  */
-public class MavenIT0091Test
+public class MavenITmng1995InterpolateBooleanModelElementsTest
     extends AbstractMavenIntegrationTestCase
 {
 
-    public MavenIT0091Test()
+    public MavenITmng1995InterpolateBooleanModelElementsTest()
     {
         super( "(2.999.0,)" );
     }
@@ -46,7 +46,7 @@
     public void testitMNG1995()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0091" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1995" );
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
 

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java (from r718712, maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0096Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0096Test.java&r1=718712&r2=718729&rev=718729&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0096Test.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java Tue Nov 18 13:56:25 2008
@@ -24,22 +24,26 @@
 
 import java.io.File;
 
-public class MavenIT0096Test
+/**
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2054">MNG-2054</a>.
+ * 
+ * @version $Id$
+ */
+public class MavenITmng2054PluginExecutionInheritanceTest
     extends AbstractMavenIntegrationTestCase
 {
 
     /**
      * Test that plugin executions from &gt;1 step of inheritance don't run multiple times.
      */
-    public void testit0096()
+    public void testitMNG2054()
         throws Exception
     {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0096" );
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2054" );
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
         verifier.executeGoal( "package" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-
     }
-}
 
+}

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-1995/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2054/
------------------------------------------------------------------------------
    svn:mergeinfo =