Author: jdcasey Date: Thu Sep 11 10:03:12 2008 New Revision: 694349 URL: http://svn.apache.org/viewvc?rev=694349&view=rev Log: correcting unit test for script roots, which have to stay relative for now due to a problem in the maven-plugin-tools-api that has been corrected but isn't widely used (or released, I think) yet.
Modified: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java Modified: maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java?rev=694349&r1=694348&r2=694349&view=diff ============================================================================== --- maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java (original) +++ maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectDynamismTest.java Thu Sep 11 10:03:12 2008 @@ -563,7 +563,7 @@ assertEquals( "First test source root should be absolute ref to src/test/java", new File( basedir, "src/test/java" ).getAbsolutePath(), project.getTestCompileSourceRoots().get( 0 ) ); assertEquals( "Before adding source roots, project should contain one script source root", 1, project.getScriptSourceRoots().size() ); - assertEquals( "First script source root should be absolute ref to src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get( 0 ) ); + assertEquals( "First script source root should be relative ref to src/main/scripts", "src/main/scripts", project.getScriptSourceRoots().get( 0 ) ); project.addCompileSourceRoot( new File( basedir, "target/generated/src/main/java" ).getAbsolutePath() ); project.addTestCompileSourceRoot( new File( basedir, "target/generated/src/test/java" ).getAbsolutePath() ); @@ -585,8 +585,8 @@ assertEquals( "Second test source root should be absolute ref to target/generated/src/test/java", new File( basedir, "target/generated/src/test/java" ).getAbsolutePath(), project.getTestCompileSourceRoots().get( 1 ) ); assertEquals( "After adding source roots and transitioning, project should contain two script source roots", 2, project.getScriptSourceRoots().size() ); - assertEquals( "First script source root should be absolute ref to src/main/scripts", new File( basedir, "src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get( 0 ) ); - assertEquals( "Second script source root should be absolute ref to target/generated/src/main/scripts", new File( basedir, "target/generated/src/main/scripts" ).getAbsolutePath(), project.getScriptSourceRoots().get( 1 ) ); + assertEquals( "First script source root should be relative ref to src/main/scripts", "src/main/scripts", project.getScriptSourceRoots().get( 0 ) ); + assertEquals( "Second script source root should be relative ref to target/generated/src/main/scripts", "target/generated/src/main/scripts", project.getScriptSourceRoots().get( 1 ) ); } public void testShouldInterpolatePluginLevelDependency()