Author: bentmann
Date: Tue Nov 11 06:29:05 2008
New Revision: 713047
URL: http://svn.apache.org/viewvc?rev=713047&view=rev
Log:
o Renamed it0141 to match corresponding issue MNG-3831
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
(contents, props changed)
- copied, changed from r713045,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3831/
(props changed)
- copied from r713046,
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0141/
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=713047&r1=713046&r2=713047&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 11 06:29:05 2008
@@ -88,6 +88,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+ suite.addTestSuite( MavenITmng3831PomInterpolationTest.class );
suite.addTestSuite( MavenITmng3827PluginConfigTest.class );
suite.addTestSuite(
MavenITmng3822BasedirAlignedInterpolationTest.class );
suite.addTestSuite( MavenITmng3821EqualPluginExecIdsTest.class );
@@ -180,7 +181,6 @@
suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class );
suite.addTestSuite( MavenITmng1323AntrunDependenciesTest.class );
suite.addTestSuite( MavenITmng0469ReportConfigTest.class );
- suite.addTestSuite( MavenIT0141Test.class );
suite.addTestSuite( MavenIT0140Test.class );
suite.addTestSuite( MavenIT0139Test.class );
suite.addTestSuite( MavenIT0138PluginLifecycleTest.class );
Copied:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
(from r713045,
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java)
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java?p2=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java&p1=maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java&r1=713045&r2=713047&rev=713047&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0141Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
Tue Nov 11 06:29:05 2008
@@ -26,21 +26,22 @@
import java.util.Properties;
/**
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3831";>MNG-3831</a>.
*
* @author Benjamin Bentmann
* @version $Id$
*/
-public class MavenIT0141Test
+public class MavenITmng3831PomInterpolationTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test that expressions of the form ${*} resolve correctly to POM values
(ugly but real).
*/
- public void testit0141()
+ public void testitMNG3831()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0141" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3831" );
File child = new File( testDir, "child" );
Verifier verifier = new Verifier( child.getAbsolutePath() );
@@ -53,7 +54,7 @@
assertEquals( child.getCanonicalFile(), new File( props.getProperty(
prefix + "projectDir" ) ).getCanonicalFile() );
- assertEquals( "org.apache.maven.its.it0141.child", props.getProperty(
prefix + "projectGroupId" ) );
+ assertEquals( "org.apache.maven.its.mng3831.child", props.getProperty(
prefix + "projectGroupId" ) );
assertEquals( "child", props.getProperty( prefix + "projectArtifactId"
) );
assertEquals( "2.0-alpha-1", props.getProperty( prefix +
"projectVersion" ) );
assertEquals( "jar", props.getProperty( prefix + "projectPackaging" )
);
@@ -72,7 +73,7 @@
assertEquals( "http://dist.org/";, props.getProperty( prefix +
"projectDistRepoUrl" ) );
assertEquals( "http://site.org/";, props.getProperty( prefix +
"projectDistSiteUrl" ) );
- assertEquals( "org.apache.maven.its.it0141", props.getProperty( prefix
+ "parentGroupId" ) );
+ assertEquals( "org.apache.maven.its.mng3831", props.getProperty(
prefix + "parentGroupId" ) );
assertEquals( "parent", props.getProperty( prefix + "parentArtifactId"
) );
assertEquals( "1.0", props.getProperty( prefix + "parentVersion" ) );
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3831/
------------------------------------------------------------------------------
svn:mergeinfo =
