From 1f13390e2276cb25ef9dfe545791cecf738f19ce Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Mon, 19 Jun 2006 11:43:08 +0000 Subject: [PATCH] Additional test for round tripping - to debug linux failures git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/util/ISO9075.java | 2 +- .../java/org/alfresco/util/ISO9075Test.java | 46 +++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/util/ISO9075.java b/source/java/org/alfresco/util/ISO9075.java index a5da8d8b52..caf65ae9e6 100644 --- a/source/java/org/alfresco/util/ISO9075.java +++ b/source/java/org/alfresco/util/ISO9075.java @@ -174,7 +174,7 @@ public class ISO9075 if (matchesEncodedPattern(toDecode, i)) { decoded.append(((char) Integer.parseInt(toDecode.substring(i + 2, i + 6), 16))); - i += 6; + i += 6;// then one added for the loop to mkae the length of 7 } else { diff --git a/source/java/org/alfresco/util/ISO9075Test.java b/source/java/org/alfresco/util/ISO9075Test.java index e23cfb3a44..fa766ba924 100644 --- a/source/java/org/alfresco/util/ISO9075Test.java +++ b/source/java/org/alfresco/util/ISO9075Test.java @@ -33,7 +33,7 @@ public class ISO9075Test extends TestCase public void testEncoding() { - assertEquals("MyDocuments", ISO9075.encode("MyDocuments")); + assertEquals("My2Documents", ISO9075.encode("My2Documents")); assertEquals("My_x002f_Documents", ISO9075.encode("My/Documents")); assertEquals("My_Documents", ISO9075.encode("My_Documents")); assertEquals("My_x0020_Documents", ISO9075.encode("My Documents")); @@ -46,7 +46,8 @@ public class ISO9075Test extends TestCase assertEquals( "_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_", ISO9075.encode(" `\u00ac\u00a6!\"\u00a3$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|")); - assertEquals("\u0123_x4567_\u8900_xabcd__xefff__xT65A_", ISO9075.encode("\u0123\u4567\u8900\uabcd\uefff_xT65A_")); + assertEquals("\u0123_x4567_\u8900_xabcd__xefff__xT65A_", ISO9075 + .encode("\u0123\u4567\u8900\uabcd\uefff_xT65A_")); assertEquals("_x003a_", ISO9075.encode(":")); } @@ -67,7 +68,46 @@ public class ISO9075Test extends TestCase " `\u00ac\u00a6!\"\u00a3$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|", ISO9075 .decode("_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_")); - assertEquals("\u0123\u4567\u8900\uabcd\uefff_xT65A_", ISO9075.decode("\u0123_x4567_\u8900_xabcd__xefff__xT65A_")); + assertEquals("\u0123\u4567\u8900\uabcd\uefff_xT65A_", ISO9075 + .decode("\u0123_x4567_\u8900_xabcd__xefff__xT65A_")); + } + + public void testRoundTrip1() + { + assertEquals("MyDocuments", ISO9075.decode(ISO9075.encode("MyDocuments"))); + assertEquals("My_Documents", ISO9075.decode(ISO9075.encode("My_Documents"))); + assertEquals("My Documents", ISO9075.decode(ISO9075.encode("My Documents"))); + assertEquals("My_x0020Documents", ISO9075.decode(ISO9075.encode("My_x0020Documents"))); + assertEquals("My_x0020_Documents", ISO9075.decode(ISO9075.encode("My_x0020_Documents"))); + assertEquals("_x0020_Documents", ISO9075.decode(ISO9075.encode("_x0020_Documents"))); + assertEquals("@_x0020_Documents", ISO9075.decode(ISO9075.encode("@_x0020_Documents"))); + assertEquals("Andy's Bits & Bobs \uabcd", ISO9075.decode(ISO9075.encode("Andy's Bits & Bobs \uabcd"))); + assertEquals("Andy's Bits & Bobs \uabcd\\", ISO9075.decode(ISO9075.encode("Andy's Bits & Bobs \uabcd\\"))); + assertEquals( + " `\u00ac\u00a6!\"\u00a3$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|", + ISO9075.decode(ISO9075.encode(" `\u00ac\u00a6!\"\u00a3$%^&*()-_=+\t\n\\\u0000[]{};'#:@~,./<>?\\|"))); + assertEquals("\u0123\u4567\u8900\uabcd\uefff_xT65A_", ISO9075.decode(ISO9075.encode("\u0123\u4567\u8900\uabcd\uefff_xT65A_"))); + } + + public void testRoundTrip2() + { + assertEquals("MyDocuments", ISO9075.encode(ISO9075.decode("MyDocuments"))); + assertEquals("My_Documents", ISO9075.encode(ISO9075.decode("My_Documents"))); + assertEquals("My_x0020_Documents", ISO9075.encode(ISO9075.decode("My_x0020_Documents"))); + assertEquals("My_x0020Documents", ISO9075.encode(ISO9075.decode("My_x0020Documents"))); + assertEquals("My_x005f_x0020_Documents", ISO9075.encode(ISO9075.decode("My_x005f_x0020_Documents"))); + assertEquals("_x005f_x0020_Documents", ISO9075.encode(ISO9075.decode("_x005f_x0020_Documents"))); + assertEquals("_x0040__x005f_x0020_Documents", ISO9075.encode(ISO9075.decode("_x0040__x005f_x0020_Documents"))); + assertEquals("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd_", ISO9075.encode(ISO9075 + .decode("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd_"))); + assertEquals("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd__x005c_", ISO9075.encode(ISO9075 + .decode("Andy_x0027_s_x0020_Bits_x0020__x0026__x0020_Bobs_x0020__xabcd__x005c_"))); + assertEquals( + "_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_", + ISO9075.encode(ISO9075 + .decode("_x0020__x0060__x00ac__x00a6__x0021__x0022__x00a3__x0024__x0025__x005e__x0026__x002a__x0028__x0029_-__x003d__x002b__x0009__x000a__x005c__x0000__x005b__x005d__x007b__x007d__x003b__x0027__x0023__x003a__x0040__x007e__x002c_._x002f__x003c__x003e__x003f__x005c__x007c_"))); + assertEquals("\u0123_x4567_\u8900_xabcd__xefff__xT65A_", ISO9075.encode(ISO9075 + .decode("\u0123_x4567_\u8900_xabcd__xefff__xT65A_"))); } }