You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/03/18 17:00:03 UTC
svn commit: r1457834 - in /sis/branches/JDK6: ./
sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
Author: desruisseaux
Date: Mon Mar 18 16:00:02 2013
New Revision: 1457834
URL: http://svn.apache.org/r1457834
Log:
Merged the Windows-specific test failure from the JDK7 branch.
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1457584-1457831
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java?rev=1457834&r1=1457833&r2=1457834&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java [UTF-8] Mon Mar 18 16:00:02 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/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java?rev=1457834&r1=1457833&r2=1457834&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] Mon Mar 18 16:00:02 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());
}
/**