ICU-491.11.3.tar.gz

[apple/icu.git] / icuSources / test / intltest / thcoll.cpp

diff --git a/icuSources/test/intltest/thcoll.cpp b/icuSources/test/intltest/thcoll.cpp
index 1fe5be789687884b3e264ed8faf54841c21525f2..1199b993b544196a28adef2c1f5333c3001faa56 100644 (file)
--- a/icuSources/test/intltest/thcoll.cpp
+++ b/icuSources/test/intltest/thcoll.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1999-2004, International Business Machines
+*   Copyright (C) 1999-2009, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -52,8 +52,8 @@ void CollationThaiTest::runIndexedTest(int32_t index, UBool exec, const char* &n
                                        char* /*par*/) {
 
     if((!coll) && exec) {
-      errln(__FILE__ " cannot test - failed to create collator.");
-      name = "";
+      dataerrln(__FILE__ " cannot test - failed to create collator.");
+      name = "some test";
       return;
     }
 
@@ -412,8 +412,9 @@ void CollationThaiTest::TestReordering(void) {
                           "\\u0E41\\uD87E\\uDC02", "=", "\\u0E41\\u4E41", // supplementary composition decomps to BMP
                           "\\u0E41\\u0301",        "=", "\\u0E41\\u0301", // unsafe (just checking backwards iteration)
                           "\\u0E41\\u0301\\u0316", "=", "\\u0E41\\u0316\\u0301",
-                          "\\u0e24\\u0e41",        "=", "\\u0e41\\u0e24", // exiting contraction bug
-                          "\\u0e3f\\u0e3f\\u0e24\\u0e41", "=", "\\u0e3f\\u0e3f\\u0e41\\u0e24",
+                          // after UCA 4.1, the two lines below are not equal anymore do not have equal sign
+                          "\\u0e24\\u0e41",        "<", "\\u0e41\\u0e24", // exiting contraction bug
+                          "\\u0e3f\\u0e3f\\u0e24\\u0e41", "<", "\\u0e3f\\u0e3f\\u0e41\\u0e24",
 
                           "abc\\u0E41c\\u0301",       "=", "abc\\u0E41\\u0107", // composition
                           "abc\\u0E41\\uD834\\uDC00", "<", "abc\\u0E41\\uD834\\uDC01", // supplementaries
@@ -440,7 +441,7 @@ void CollationThaiTest::TestReordering(void) {
   compareArray(*coll, tests, sizeof(tests)/sizeof(tests[0]));
  
   const char *rule = "& c < ab";
-  const char *testcontraction[] = { "\\u0E41ab", "<", "\\u0E41c"};
+  const char *testcontraction[] = { "\\u0E41ab", ">", "\\u0E41c"}; // After UCA 4.1 Thai are normal so won't break a contraction
   UnicodeString rules;
   UErrorCode status = U_ZERO_ERROR;
   parseChars(rules, rule);