diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-20 23:00:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-20 23:00:17 +0100 |
| commit | 1bfce436ef24da5886a752f906628472ceb60a96 (patch) | |
| tree | ae4fc9bac597df81b4855a0fadbde552c978bbbf /java/test | |
| parent | edits to CHANGES & RELEASE_NOTES (diff) | |
| download | ice-1bfce436ef24da5886a752f906628472ceb60a96.tar.bz2 ice-1bfce436ef24da5886a752f906628472ceb60a96.tar.xz ice-1bfce436ef24da5886a752f906628472ceb60a96.zip | |
Fixed bug 4514 - Ice/facets test failure
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/Ice/facets/AllTests.java | 2 | ||||
| -rw-r--r-- | java/test/IceUtil/inputUtil/Client.java | 59 |
2 files changed, 60 insertions, 1 deletions
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 252a60f16dd..ea2e0971b9d 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -40,7 +40,7 @@ public class AllTests communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar"); String[] facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets"); test(facetFilter.length == 1 && facetFilter[0].equals("foobar")); - communicator.getProperties().setProperty("Ice.Admin.Facets", "foo'bar"); + communicator.getProperties().setProperty("Ice.Admin.Facets", "foo\\'bar"); facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets"); test(facetFilter.length == 1 && facetFilter[0].equals("foo'bar")); communicator.getProperties().setProperty("Ice.Admin.Facets", "'foo bar' toto 'titi'"); diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/IceUtil/inputUtil/Client.java index 24af63cda39..f8b4e64b0de 100644 --- a/java/test/IceUtil/inputUtil/Client.java +++ b/java/test/IceUtil/inputUtil/Client.java @@ -106,5 +106,64 @@ public class Client } System.out.println("ok"); + + System.out.print("checking string splitting... "); + System.out.flush(); + { + String[] arr; + + arr = IceUtilInternal.StringUtil.splitString("", ""); + test(arr.length == 0); + arr = IceUtilInternal.StringUtil.splitString("", ":"); + test(arr.length == 0); + arr = IceUtilInternal.StringUtil.splitString("a", ""); + test(arr.length == 1 && arr[0].equals("a")); + arr = IceUtilInternal.StringUtil.splitString("a", ":"); + test(arr.length == 1 && arr[0].equals("a")); + arr = IceUtilInternal.StringUtil.splitString("ab", ""); + test(arr.length == 1 && arr[0].equals("ab")); + arr = IceUtilInternal.StringUtil.splitString("ab:", ":"); + test(arr.length == 1 && arr[0].equals("ab")); + arr = IceUtilInternal.StringUtil.splitString(":ab", ":"); + test(arr.length == 1 && arr[0].equals("ab")); + arr = IceUtilInternal.StringUtil.splitString("a:b", ":"); + test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); + arr = IceUtilInternal.StringUtil.splitString(":a:b:", ":"); + test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); + + arr = IceUtilInternal.StringUtil.splitString("\"a\"", ":"); + test(arr.length == 1 && arr[0].equals("a")); + arr = IceUtilInternal.StringUtil.splitString("\"a\":b", ":"); + test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); + arr = IceUtilInternal.StringUtil.splitString("\"a\":\"b\"", ":"); + test(arr.length == 2 && arr[0].equals("a") && arr[1].equals("b")); + arr = IceUtilInternal.StringUtil.splitString("\"a:b\"", ":"); + test(arr.length == 1 && arr[0].equals("a:b")); + arr = IceUtilInternal.StringUtil.splitString("a=\"a:b\"", ":"); + test(arr.length == 1 && arr[0].equals("a=a:b")); + + arr = IceUtilInternal.StringUtil.splitString("'a'", ":"); + test(arr.length == 1 && arr[0].equals("a")); + arr = IceUtilInternal.StringUtil.splitString("'\"a'", ":"); + test(arr.length == 1 && arr[0].equals("\"a")); + arr = IceUtilInternal.StringUtil.splitString("\"'a\"", ":"); + test(arr.length == 1 && arr[0].equals("'a")); + + arr = IceUtilInternal.StringUtil.splitString("a\\'b", ":"); + test(arr.length == 1 && arr[0].equals("a'b")); + arr = IceUtilInternal.StringUtil.splitString("'a:b\\'c'", ":"); + test(arr.length == 1 && arr[0].equals("a:b'c")); + arr = IceUtilInternal.StringUtil.splitString("a\\\"b", ":"); + test(arr.length == 1 && arr[0].equals("a\"b")); + arr = IceUtilInternal.StringUtil.splitString("\"a:b\\\"c\"", ":"); + test(arr.length == 1 && arr[0].equals("a:b\"c")); + arr = IceUtilInternal.StringUtil.splitString("'a:b\"c'", ":"); + test(arr.length == 1 && arr[0].equals("a:b\"c")); + arr = IceUtilInternal.StringUtil.splitString("\"a:b'c\"", ":"); + test(arr.length == 1 && arr[0].equals("a:b'c")); + + test(IceUtilInternal.StringUtil.splitString("a\"b", ":") == null); + } + System.out.println("ok"); } } |