tizen 2.4 release

[framework/base/tizen-locale.git] / localedata / tests-mbwc / dat_wcscoll.c

diff --git a/localedata/tests-mbwc/dat_wcscoll.c b/localedata/tests-mbwc/dat_wcscoll.c
index cfc3f85..5e2fbbe 100644 (file)
--- a/localedata/tests-mbwc/dat_wcscoll.c
+++ b/localedata/tests-mbwc/dat_wcscoll.c
@@ -104,18 +104,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
                         { 0x0041,0x0041,0x0043,0x0000 }, },  /* #4 */
            /*expect*/ { 0,0,0, -1,                       },
          },
-#ifdef SHOJI_IS_RIGHT
-         /* <WAIVER> */ /* assume ascii */
-         { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
-                        { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
-           /*expect*/ { 0,0,0, -1,                       },
-         },
-         /* <WAIVER> */ /* assume ascii */
-         { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 },
-                        { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
-           /*expect*/ { 0,0,0, +1,                       },
-         },
-#else
          /* XXX Correct order is lowercase before uppercase.  */
          { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
                         { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
@@ -125,7 +113,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
                         { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
            /*expect*/ { 0,0,0, -1,                       },
          },
-#endif
          { /*input.*/ { { 0x0041,0x0042,0x0000        },
                         { 0x0041,0x0042,0x0049,0x0000 }, },  /* #7 */
            /*expect*/ { 0,0,0, -1,                       },
@@ -134,16 +121,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
                         { 0x0041,0x0042,0x0000        }, },  /* #8 */
            /*expect*/ { 0,0,0, +1,                       },
          },
-#ifdef SHOJI_IS_RIGHT
-         { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
-                        { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
-           /*expect*/ { 0,0,0, +1,                    },
-         },
-         { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 },
-                        { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
-           /*expect*/ { 0,0,0, -1,                    },
-         },
-#else
          /* Do not assume position of character out of range.  */
          { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
                         { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
@@ -153,7 +130,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
                         { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
            /*expect*/ { 0,0,0, 0,                     },
          },
-#endif
          { .is_last = 1 }
        }
     },