svn commit: r744582 - /maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java

[be...@apache.org]

Author: bentmann
Date: Sat Feb 14 23:20:23 2009
New Revision: 744582

URL: http://svn.apache.org/viewvc?rev=744582&view=rev
Log:
o Fixed test to use normalized path names or TestIncrementalBuildContext freaks out on Windowx

Modified:
    maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java   (contents, props changed)

Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java?rev=744582&r1=744581&r2=744582&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java Sat Feb 14 23:20:23 2009
@@ -23,7 +23,7 @@
 
     File outputDirectory = new File( getBasedir(), "target/IncrementalResourceFilteringTest" );
 
-    String unitDirectory = getBasedir() + "/src/test/units-files/incremental";
+    File unitDirectory = new File( getBasedir(), "src/test/units-files/incremental" );
 
     protected void setUp()
         throws Exception
@@ -49,7 +49,7 @@
         HashSet changedFiles = new HashSet();
         changedFiles.add( "file01.txt" );
 
-        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( new File(unitDirectory), changedFiles, new HashMap() );
+        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, changedFiles, new HashMap() );
         ThreadBuildContext.setThreadBuildContext( ctx );
 
         filter( "notime" );
@@ -62,7 +62,7 @@
         HashSet deletedFiles = new HashSet();
         deletedFiles.add( "file01.txt" );
 
-        ctx = new TestIncrementalBuildContext( new File(unitDirectory), new HashSet(), changedFiles, new HashMap() );
+        ctx = new TestIncrementalBuildContext( unitDirectory, new HashSet(), changedFiles, new HashMap() );
         ThreadBuildContext.setThreadBuildContext( ctx );
 
         filter( "moretime" );
@@ -82,7 +82,7 @@
         // all files are reprocessed after content of filters changes 
         HashSet changedFiles = new HashSet();
         changedFiles.add( "filters.txt" );
-        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( new File(unitDirectory),  changedFiles, new HashMap() );
+        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, changedFiles, new HashMap() );
         ThreadBuildContext.setThreadBuildContext( ctx );
 
         filter( "notime" );
@@ -103,7 +103,7 @@
         // all files are reprocessed after content of filters changes 
         HashSet deletedFiles = new HashSet();
         deletedFiles.add( "filters.txt" );
-        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( new File(unitDirectory), new HashSet(), deletedFiles, new HashMap() );
+        TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, new HashSet(), deletedFiles, new HashMap() );
         ThreadBuildContext.setThreadBuildContext( ctx );
 
         filter( "notime" );
@@ -148,7 +148,7 @@
         MavenResourcesFiltering mavenResourcesFiltering =
             (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
 
-        String unitFilesDir = unitDirectory + "/files";
+        String unitFilesDir = new File( unitDirectory, "files" ).getPath();
 
         Resource resource = new Resource();
         List resources = new ArrayList();
@@ -157,7 +157,7 @@
         resource.setFiltering( true );
 
         List filtersFile = new ArrayList();
-        filtersFile.add( unitDirectory + "/filters.txt" );
+        filtersFile.add( new File( unitDirectory, "filters.txt" ).getPath() );
 
         mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
                                                  new ArrayList(), new StubMavenSession() );

Propchange: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat Feb 14 23:20:23 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision