From: Markus Scherer <markus.icu@gmail.com>
Date: Thu, 27 Feb 2014 23:31:01 +0000 (+0000)
Subject: ICU-10595 reenable TestNextSortKeyPartJaIdentical()
X-Git-Tag: milestone-59-0-1~2121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84f781e9fbc12ef709dd3066f7a5894e5ad28960;p=icu

ICU-10595 reenable TestNextSortKeyPartJaIdentical()

X-SVN-Rev: 35259
---

diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c
index 361b18a1449..41653bcef09 100644
--- a/icu4c/source/test/cintltst/cmsccoll.c
+++ b/icu4c/source/test/cintltst/cmsccoll.c
@@ -5788,10 +5788,6 @@ static void TestNextSortKeyPartJaIdentical(void)
     while (keyPartLen == KEY_PART_SIZE) {
         keyPartLen = ucol_nextSortKeyPart(coll, &iter, state, keyPart, KEY_PART_SIZE, &status);
         if (U_FAILURE(status)) {
-            if(log_knownIssue("10595", "Ignoring an error returned by ucol_nextSortKeyPart")) {
-                status = U_ZERO_ERROR;
-                continue;
-            }
             log_err_status(status, "ERROR: in iterating next sort key part: %s\n", myErrorName(status));
             break;
         }
diff --git a/icu4c/source/test/perf/collperf2/collperf2.cpp b/icu4c/source/test/perf/collperf2/collperf2.cpp
index 6376203b997..d0c0c129124 100644
--- a/icu4c/source/test/perf/collperf2/collperf2.cpp
+++ b/icu4c/source/test/perf/collperf2/collperf2.cpp
@@ -377,10 +377,6 @@ void NextSortKeyPart::call(UErrorCode* status)
             partLen = ucol_nextSortKeyPart(coll, &iter, state, part, bufSize, status);
             events++;
         }
-        // Workaround for #10595
-        if (U_FAILURE(*status)) {
-            *status = U_ZERO_ERROR;
-        }
     }
     free(part);
 }
@@ -448,10 +444,6 @@ void NextSortKeyPartUTF8::call(UErrorCode* status)
             partLen = ucol_nextSortKeyPart(coll, &iter, state, part, bufSize, status);
             events++;
         }
-        // Workaround for #10595
-        if (U_FAILURE(*status)) {
-            *status = U_ZERO_ERROR;
-        }
     }
     free(part);
 }