dion 2003/06/24 17:37:30
Modified: src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
Log:
Fix so that this works on windows and other operating systems.
- the project.xml file has ${basedir}/src/java note the '/' used, it's not operating
system dependent
- the basedir being passed in is not the same as the one for the newly created
project, as all projects have basedir set to the project.xml location by default.
Revision Changes Path
1.33 +2 -1
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ProjectInheritanceTest.java 25 Jun 2003 00:10:23 -0000 1.32
+++ ProjectInheritanceTest.java 25 Jun 2003 00:37:30 -0000 1.33
@@ -69,7 +69,7 @@
private String TEST_DOCUMENT = null;
private String TEST_DOCUMENT2 = null;
private String baseDir;
- private String FS = System.getProperty( "file.separator" );
+ private String FS = "/"; // note: same on windows and others
public ProjectInheritanceTest( String testName )
{
@@ -120,6 +120,7 @@
assertEquals( "1.4-dev-8",
( (Dependency) p.getDependencies().get( 1 ) ).getVersion() );
+ baseDir = p.getContext().findVariable("basedir").toString();
// Test Source Directories
assertEquals( baseDir + FS + "src/java", p.getBuild().getSourceDirectory()
);
// Unit Test Source Directories
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
