Author: bentmann Date: Thu May 27 06:37:07 2010 New Revision: 948687 URL: http://svn.apache.org/viewvc?rev=948687&view=rev Log: o Fixed tests to account for the discrepancy that OSX has a case-insensitive file system yet java.io.File compares case-sensitively
Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -64,6 +64,6 @@ public class ProjectInheritanceTest MavenProject project0 = getProject( pom0 ); MavenProject project1 = getProject( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); } } Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -65,7 +65,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Set set = project1.getArtifacts(); assertNotNull( "No artifacts", set ); assertTrue( "No Artifacts", set.size() > 0 ); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -61,7 +61,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Set set = project1.getArtifacts(); assertNotNull( "No artifacts", set ); assertTrue( "No Artifacts", set.size() > 0 ); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -61,7 +61,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Set set = project1.getArtifacts(); assertNotNull( "No artifacts", set ); assertTrue( "No Artifacts", set.size() > 0 ); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -60,7 +60,7 @@ public class ProjectInheritanceTest // load everything... MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); System.out.println("Project " + project1.getId() + " " + project1); Set set = project1.getArtifacts(); assertNotNull("No artifacts", set); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -61,7 +61,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); System.out.println( "Project " + project1.getId() + " " + project1 ); Set set = project1.getArtifacts(); assertNotNull( "No artifacts", set ); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -71,7 +71,7 @@ public class ProjectInheritanceTest MavenProject project1 = getProjectWithDependencies( pom1 ); assertNotNull("Parent is null", project1.getParent()); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); Map map = project1.getArtifactMap(); assertNotNull("No artifacts", map); @@ -106,7 +106,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project2 = getProjectWithDependencies( pom2 ); - assertEquals( pom0Basedir, project2.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project2.getParent().getBasedir() ); Map map = project2.getArtifactMap(); assertNotNull( "No artifacts", map ); assertTrue( "No Artifacts", map.size() > 0 ); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -66,7 +66,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); System.out.println("Project " + project1.getId() + " " + project1); Map map = project1.getArtifactMap(); assertNotNull("No artifacts", map); Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java?rev=948687&r1=948686&r2=948687&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (original) +++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java Thu May 27 06:37:07 2010 @@ -58,7 +58,7 @@ public class ProjectInheritanceTest MavenProject project0 = getProjectWithDependencies( pom0 ); MavenProject project1 = getProjectWithDependencies( pom1 ); - assertEquals( pom0Basedir, project1.getParent().getBasedir().getCanonicalFile() ); + assertEquals( pom0Basedir, project1.getParent().getBasedir() ); assertNull( "dependencyManagement has overwritten the scope of the currently building child project", project1.getArtifact().getScope() ); }