Author: brett
Date: Mon Aug 1 15:51:29 2011
New Revision: 1152842
URL: http://svn.apache.org/viewvc?rev=1152842&view=rev
Log:
use a canonical test dir in tests that require comparing to a properties file,
to match expected behaviour
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
Mon Aug 1 15:51:29 2011
@@ -46,6 +46,9 @@ public class MavenITmng0680ParentBasedir
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0680" );
+
+ testDir = testDir.getCanonicalFile();
+
File subDir = new File( testDir, "subproject" );
Verifier verifier = newVerifier( subDir.getAbsolutePath() );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
Mon Aug 1 15:51:29 2011
@@ -53,6 +53,8 @@ public class MavenITmng2201PluginConfigI
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties props = verifier.loadProperties( "target/config.properties"
);
assertEquals( new File( testDir, "target" ), new File(
props.getProperty( "stringParam" ) ) );
assertEquals( new File( testDir, "target" ), new File(
props.getProperty( "propertiesParam.buildDir" ) ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
Mon Aug 1 15:51:29 2011
@@ -56,6 +56,8 @@ public class MavenITmng3475BaseAlignedDi
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties configProps = verifier.loadProperties(
"target/config.properties" );
assertPathEquals( testDir, "target", configProps.getProperty(
"mapParam.buildDirectory" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java
Mon Aug 1 15:51:29 2011
@@ -54,6 +54,8 @@ public class MavenITmng3747PrefixedPathE
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties props = verifier.loadProperties( "target/config.properties"
);
assertEquals( "path is: " + new File( testDir, "relative"
).getAbsolutePath() + "/somepath",
props.getProperty( "stringParam" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
Mon Aug 1 15:51:29 2011
@@ -54,6 +54,8 @@ public class MavenITmng3760BaseUriProper
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties props = verifier.loadProperties(
"target/profile.properties" );
// set via project
assertEquals( testDir.toURI().toString(), props.getProperty(
"project.properties.pomProperty" ) );
@@ -76,6 +78,8 @@ public class MavenITmng3760BaseUriProper
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties props = verifier.loadProperties(
"target/profile.properties" );
// set via project
assertEquals( testDir.toURI().toString(), props.getProperty(
"project.properties.pomProperty" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
Mon Aug 1 15:51:29 2011
@@ -57,6 +57,8 @@ public class MavenITmng3827PluginConfigT
Properties props = verifier.loadProperties(
"target/plugin-config.properties" );
+ testDir = testDir.getCanonicalFile();
+
assertEquals( new File( testDir, "pom.xml" ), new File(
props.getProperty( "fileParam" ) ) );
assertEquals( "true", props.getProperty( "booleanParam" ) );
assertEquals( "42", props.getProperty( "byteParam" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
Mon Aug 1 15:51:29 2011
@@ -51,6 +51,8 @@ public class MavenITmng3843PomInheritanc
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3843" );
+ testDir = testDir.getCanonicalFile();
+
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "test-1/target" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
Mon Aug 1 15:51:29 2011
@@ -57,6 +57,8 @@ public class MavenITmng3864PerExecPlugin
Properties props = verifier.loadProperties(
"target/plugin-config.properties" );
+ testDir = testDir.getCanonicalFile();
+
assertEquals( new File( testDir, "pom.xml" ), new File(
props.getProperty( "fileParam" ) ) );
assertEquals( "true", props.getProperty( "booleanParam" ) );
assertEquals( "42", props.getProperty( "byteParam" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
Mon Aug 1 15:51:29 2011
@@ -55,6 +55,8 @@ public class MavenITmng3877BasedirAligne
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties modelProps = verifier.loadProperties(
"target/model.properties" );
assertPathEquals( testDir, "target", modelProps.getProperty(
"project.build.directory" ) );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java?rev=1152842&r1=1152841&r2=1152842&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
Mon Aug 1 15:51:29 2011
@@ -56,6 +56,8 @@ public class MavenITmng3904NestedBuildDi
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ testDir = testDir.getCanonicalFile();
+
Properties props = verifier.loadProperties( "target/pom.properties" );
assertEquals( new File( testDir, "target/classes/dir0" ),
new File( props.getProperty( "project.properties.dir0" ) ) );
