Author: bentmann
Date: Wed Nov 12 13:55:34 2008
New Revision: 713526
URL: http://svn.apache.org/viewvc?rev=713526&view=rev
Log:
o Renamed IT to match corresponding issue id
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
(contents, props changed)
- copied, changed from r713514,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0060Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/
(props changed)
- copied from r713525,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0060/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0060Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0060/
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=713526&r1=713525&r2=713526&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 13:55:34 2008
@@ -164,6 +164,7 @@
suite.addTestSuite( MavenITmng2744checksumVerificationTest.class );
suite.addTestSuite( MavenITmng2739RequiredRepositoryElementsTest.class
);
suite.addTestSuite( MavenITmng2695OfflinePluginSnapshotsTest.class );
+ suite.addTestSuite( MavenITmng2591MergeInheritedPluginConfigTest.class
);
suite.addTestSuite( MavenITmng2562TimestampTest.class );
suite.addTestSuite( MavenITmng2339BadProjectInterpolationTest.class );
suite.addTestSuite( MavenITmng2318LocalParentResolutionTest.class );
@@ -237,7 +238,6 @@
suite.addTestSuite( MavenIT0063Test.class );
suite.addTestSuite( MavenIT0062Test.class );
suite.addTestSuite( MavenIT0061Test.class );
- suite.addTestSuite( MavenIT0060Test.class );
suite.addTestSuite( MavenIT0059Test.class );
suite.addTestSuite( MavenIT0058Test.class );
suite.addTestSuite( MavenIT0057Test.class );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
(from r713514,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0060Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0060Test.java&r1=713514&r2=713526&rev=713526&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0060Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
Wed Nov 12 13:55:34 2008
@@ -25,18 +25,24 @@
import java.io.File;
import java.util.Properties;
-public class MavenIT0060Test
+/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-2591";>MNG-2591</a>.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng2591MergeInheritedPluginConfigTest
extends AbstractMavenIntegrationTestCase
{
/**
- * Test aggregation of list configuration items when using
+ * Test aggregation of list configuration items for build plugins when
using
* 'combine.children=append' attribute.
*/
- public void testit0060()
+ public void testitMNG2591()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0060" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2591" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "subproject/target" );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2591/
------------------------------------------------------------------------------
svn:mergeinfo =
