svn commit: r1457836 - in /sis/trunk: ./ sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java

[desruisseaux]

Author: desruisseaux
Date: Mon Mar 18 16:01:37 2013
New Revision: 1457836

URL: http://svn.apache.org/r1457836
Log:
Merged the Windows-specific test failure from the JDK6 branch.

Modified:
    sis/trunk/   (props changed)
    
sis/trunk/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
    
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1457584-1457831
  Merged /sis/branches/JDK6:r1457601-1457835

Modified: 
sis/trunk/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1457836&r1=1457835&r2=1457836&view=diff
==============================================================================
--- 
sis/trunk/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
 [UTF-8] (original)
+++ 
sis/trunk/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
 [UTF-8] Mon Mar 18 16:01:37 2013
@@ -73,7 +73,7 @@ public final strictfp class PathConverte
     @Test
     public void testFile_String() {
         final ObjectConverter<File,String> c = new 
StringConverter.File().inverse();
-        runInvertibleConversion(c, new File("home/user/index.txt"), 
"home/user/index.txt".replace("/", File.separator));
+        runInvertibleConversion(c, new File("home/user/index.txt"), 
"home/user/index.txt".replace('/', File.separatorChar));
         assertSerializedEquals(c);
     }
 

Modified: 
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
URL: 
http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java?rev=1457836&r1=1457835&r2=1457836&view=diff
==============================================================================
--- 
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
 [UTF-8] (original)
+++ 
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
 [UTF-8] Mon Mar 18 16:01:37 2013
@@ -80,12 +80,12 @@ public final strictfp class TreeTablesTe
                 "  │       └─document\n" +
                 "  └─lib\n", NAME);
         ((DefaultTreeTable) 
table).setRoot(concatenateSingletons(table.getRoot()));
-        assertMultilinesEquals(
+        assertMultilinesEquals((
                 "root\n" +
                 "  ├─users/alice\n" +
                 "  │   ├─data/mercator\n" +
                 "  │   └─document\n" +
-                "  └─lib\n".replace("/", File.separator), table.toString());
+                "  └─lib\n").replace('/', File.separatorChar), 
table.toString());
     }
 
     /**