jvanzyl 2003/06/24 15:14:05 Modified: src/test/java/org/apache/maven/project ProjectInheritanceTest.java Log: o Need to use basedir. Revision Changes Path 1.30 +8 -6 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ProjectInheritanceTest.java 13 Apr 2003 00:56:02 -0000 1.29 +++ ProjectInheritanceTest.java 24 Jun 2003 22:14:05 -0000 1.30 @@ -68,7 +68,9 @@ { private String TEST_DOCUMENT = null; private String TEST_DOCUMENT2 = null; - + private String basedir; + private String PS = System.getProperty( "path.separator" ); + public ProjectInheritanceTest( String testName ) { super( testName ); @@ -86,7 +88,7 @@ protected void setUp() throws Exception { super.setUp(); - String baseDir = System.getProperty( "basedir" ); + baseDir = System.getProperty( "basedir" ); assertNotNull( "The system property basedir was not defined.", baseDir ); String fs = System.getProperty( "file.separator" ); assertNotNull( "The system property file.separator was not defined.", fs ); @@ -117,17 +119,17 @@ assertEquals( "1.4-dev-8", ( (Dependency) p.getDependencies().get( 1 ) ).getVersion() ); - + // Test Source Directories - assertEquals( "src/java", p.getBuild().getSourceDirectory() ); + assertEquals( basedir + PS + "src/java", p.getBuild().getSourceDirectory() ); // Unit Test Source Directories - assertEquals( "src/test/java", p.getBuild().getUnitTestSourceDirectory() ); + assertEquals( basedir + PS + "src/test/java", p.getBuild().getUnitTestSourceDirectory() ); // Test Aspect Source Directories //assertEquals("src/aspect", p.getBuild().getAspectSourceDirectory()); // Test Test Source Directories ;-) - assertEquals( "src/test/java", p.getBuild().getUnitTestSourceDirectory() ); + assertEquals( basedir + PS + "src/test/java", p.getBuild().getUnitTestSourceDirectory() ); String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory(); assertTrue( "Should be empty in maven's project descriptor: [" + iuSrc + "]", StringUtils.isEmpty( iuSrc ) );
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]