brett 2004/09/28 03:52:40
Modified: src/test/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtilsTest.java
Log:
real sys property was interfering
Revision Changes Path
No revision
No revision
1.14.4.5 +4 -4 maven/src/test/java/org/apache/maven/MavenUtilsTest.java
Index: MavenUtilsTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/MavenUtilsTest.java,v
retrieving revision 1.14.4.4
retrieving revision 1.14.4.5
diff -u -r1.14.4.4 -r1.14.4.5
--- MavenUtilsTest.java 26 Jun 2004 14:55:46 -0000 1.14.4.4
+++ MavenUtilsTest.java 28 Sep 2004 10:52:40 -0000 1.14.4.5
@@ -168,7 +168,7 @@
Properties driverProperties = new Properties();
// System properties
- systemProperties.setProperty( "maven.home", "/projects/maven" );
+ systemProperties.setProperty( "mavenHome", "/projects/maven" );
// User build properties
userBuildProperties.setProperty( "maven.username", "jvanzyl" );
@@ -193,7 +193,7 @@
driverProperties.setProperty( "maven.repo.remote",
"http://www.ibiblio.org/maven"; );
driverProperties.setProperty( "maven.final.name", "maven-1.0" );
driverProperties.setProperty( "maven.repo.remote.enabled", "true" );
- driverProperties.setProperty( "maven.repo.local",
"${maven.home}/repository" );
+ driverProperties.setProperty( "maven.repo.local", "${mavenHome}/repository"
);
Map result = MavenUtils.mergeMaps( new Map[]
{
@@ -208,7 +208,7 @@
MavenUtils.integrateMapInContext( result, context );
// Values that should be taken from systemProperties.
- assertEquals( "/projects/maven", ( String ) context.getVariable(
"maven.home" ) );
+ assertEquals( "/projects/maven", ( String ) context.getVariable(
"mavenHome" ) );
// Values that should be taken from userBuildProperties.
assertEquals( "/opt/maven/repository", ( String ) context.getVariable(
"maven.repo.local" ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
