+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 2000-2003, International Business Machines Corporation and
+ * Copyright (c) 2000-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
/*
*
* Date Name Description
* 08/05/2000 Yves Creation
-*******************************************************************************
+******************************************************************************
*/
#include "unicode/ucnv.h"
#include "unicode/ustring.h"
+#include "cmemory.h"
#include "cstring.h"
#include "cintltst.h"
-#define ARRAY_SIZE(array) (int32_t)(sizeof array / sizeof array[0])
-
static void TestStandardName(void);
static void TestStandardNames(void);
static void TestCanonicalName(void);
void
addStandardNamesTest(TestNode** root)
{
- addTest(root, &TestStandardName, "stdnmtst/TestStandardName");
- addTest(root, &TestStandardNames, "stdnmtst/TestStandardNames");
- addTest(root, &TestCanonicalName, "stdnmtst/TestCanonicalName");
+ addTest(root, &TestStandardName, "tsconv/stdnmtst/TestStandardName");
+ addTest(root, &TestStandardNames, "tsconv/stdnmtst/TestStandardNames");
+ addTest(root, &TestCanonicalName, "tsconv/stdnmtst/TestCanonicalName");
}
static int dotestname(const char *name, const char *standard, const char *expected) {
error = U_ZERO_ERROR;
tag = ucnv_getStandardName(name, standard, &error);
if (!tag && expected) {
- log_err("FAIL: could not find %s standard name for %s\n", standard, name);
+ log_err_status(error, "FAIL: could not find %s standard name for %s\n", standard, name);
res = 0;
} else if (expected && (name == tag || uprv_strcmp(expected, tag))) {
log_err("FAIL: expected %s for %s standard name for %s, got %s\n", expected, standard, name, tag);
if (dotestname("ibm-1208", "MIME", "UTF-8") &&
/*dotestname("cp1252", "MIME", "windows-1252") &&*/
dotestname("ascii", "MIME", "US-ASCII") &&
- dotestname("ISO_2022", "MIME", "ISO-2022") &&
- dotestname("ISO-2022", "MIME", "ISO-2022") &&
+ dotestname("csiso2022jp2", "MIME", "ISO-2022-JP-2") &&
+ dotestname("Iso20-22__cN", "IANA", "ISO-2022-CN") &&
dotestname("ascii", "IANA", "ANSI_X3.4-1968") &&
dotestname("cp850", "IANA", "IBM850") &&
dotestname("crazy", "MIME", NULL) &&
if (tag && !expected) {
log_err("FAIL: Unexpectedly found %s canonical name for %s, got %s\n", standard, name, tag);
res = 0;
- } else if (!tag && expected) {
- log_err("FAIL: could not find %s canonical name for %s\n", (standard ? "\"\"" : standard), name);
+ }
+ else if (!tag && expected) {
+ log_err_status(error, "FAIL: could not find %s canonical name for %s\n", (standard ? "\"\"" : standard), name);
res = 0;
- } else if (expected && (name == tag || uprv_strcmp(expected, tag)) && error == U_ZERO_ERROR) {
+ }
+ else if (expected && (name == tag || uprv_strcmp(expected, tag) != 0)) {
log_err("FAIL: expected %s for %s canonical name for %s, got %s\n", expected, standard, name, tag);
res = 0;
}
+ else {
+ log_verbose("PASS: (\"%s\", \"%s\") -> %s == %s \n", name, standard, tag, expected);
+ }
return res;
}
dotestconv("ibm-5305", "IANA", NULL) && /* mapping does not exist */
dotestconv("cp1208", "", "UTF-8") && /* default name due to ordering */
dotestconv("UTF16_BigEndian", "", "UTF-16BE") && /* non-default name due to ordering */
- dotestconv("ISO-2022", "MIME", "ISO_2022") &&/* default name */
- dotestconv("Shift_JIS", "MIME", "ibm-943_P14A-1999") &&/* ambiguous alias */
+ dotestconv("ISO-2022-CN", "IANA", "ISO_2022,locale=zh,version=0") &&/* default name */
+ dotestconv("Shift_JIS", "MIME", "ibm-943_P15A-2003") &&/* ambiguous alias */
dotestconv("Shift_JIS", "", "ibm-943_P130-1999") &&/* ambiguous alias */
- dotestconv("ibm-943", "", "ibm-943_P14A-1999") &&/* ambiguous alias */
+ dotestconv("ibm-943", "", "ibm-943_P15A-2003") &&/* ambiguous alias */
dotestconv("ibm-943", "IBM", "ibm-943_P130-1999") &&/* ambiguous alias */
dotestconv("ibm-1363", "", "ibm-1363_P11B-1998") &&/* ambiguous alias */
dotestconv("ibm-1363", "IBM", "ibm-1363_P110-1997") &&/* ambiguous alias */
static UBool doTestNames(const char *name, const char *standard, const char **expected, int32_t size) {
UErrorCode err = U_ZERO_ERROR;
UEnumeration *myEnum = ucnv_openStandardNames(name, standard, &err);
+ const char *enumName, *testName;
int32_t enumCount = uenum_count(myEnum, &err);
- int32_t idx, repeatTimes = 3;
+ int32_t idx, len, repeatTimes = 3;
+
+ if (err == U_FILE_ACCESS_ERROR) {
+ log_data_err("Unable to open standard names for %s of standard: %s\n", name, standard);
+ return 0;
+ }
if (size != enumCount) {
- log_err("FAIL: different size arrays. Got %d. Expected %d\n", enumCount, size);
+ log_err("FAIL: different size arrays for %s. Got %d. Expected %d\n", name, enumCount, size);
return 0;
}
if (size < 0 && myEnum) {
log_verbose("\n%s %s\n", name, standard);
while (repeatTimes-- > 0) {
for (idx = 0; idx < enumCount; idx++) {
- int32_t len;
- const char *enumName = uenum_next(myEnum, &len, &err);
- const char *testName = expected[idx];
+ enumName = uenum_next(myEnum, &len, &err);
+ testName = expected[idx];
if (uprv_strcmp(enumName, testName) != 0 || U_FAILURE(err)
|| len != (int32_t)uprv_strlen(expected[idx]))
{
log_verbose("%s\n", enumName);
err = U_ZERO_ERROR;
}
+ if (enumCount >= 0) {
+ /* one past the list of all names must return NULL */
+ enumName = uenum_next(myEnum, &len, &err);
+ if (enumName != NULL || len != 0 || U_FAILURE(err)) {
+ log_err("FAIL: uenum_next(past the list) did not return NULL[0] with U_SUCCESS(). name=%s standard=%s len=%d err=%s\n", name, standard, len, u_errorName(err));
+ }
+ }
log_verbose("\n reset\n");
uenum_reset(myEnum, &err);
if (U_FAILURE(err)) {
UEnumeration *myEnum = ucnv_openStandardNames(name, standard, &err);
int32_t enumCount = uenum_count(myEnum, &err);
int32_t idx, repeatTimes = 3;
+
+ if (err == U_FILE_ACCESS_ERROR) {
+ log_data_err("Unable to open standard names for %s of standard: %s\n", name, standard);
+ return 0;
+ }
+
if (size != enumCount) {
log_err("FAIL: different size arrays. Got %d. Expected %d\n", enumCount, size);
return 0;
UChar testName[256];
int32_t len;
const UChar *enumName = uenum_unext(myEnum, &len, &err);
- u_uastrncpy(testName, expected[idx], sizeof(testName)/sizeof(testName[0]));
+ u_uastrncpy(testName, expected[idx], UPRV_LENGTHOF(testName));
if (u_strcmp(enumName, testName) != 0 || U_FAILURE(err)
|| len != (int32_t)uprv_strlen(expected[idx]))
{
"csASCII",
"iso-ir-6",
"cp367",
+ "IBM367",
};
static const char *asciiMIME[] = {
"US-ASCII"
};
static const char *iso2022MIME[] = {
- "ISO-2022",
+ "ISO-2022-KR",
};
- doTestNames("ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
- doTestNames("US-ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
- doTestNames("ASCII", "MIME", asciiMIME, ARRAY_SIZE(asciiMIME));
- doTestNames("ascii", "mime", asciiMIME, ARRAY_SIZE(asciiMIME));
+ doTestNames("ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
+ doTestNames("US-ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
+ doTestNames("ASCII", "MIME", asciiMIME, UPRV_LENGTHOF(asciiMIME));
+ doTestNames("ascii", "mime", asciiMIME, UPRV_LENGTHOF(asciiMIME));
doTestNames("ASCII", "crazy", asciiMIME, -1);
doTestNames("crazy", "MIME", asciiMIME, -1);
doTestNames("LMBCS-1", "MIME", asciiMIME, 0);
- doTestNames("ISO_2022", "MIME", iso2022MIME, ARRAY_SIZE(iso2022MIME));
- doTestNames("ISO-2022", "MIME", iso2022MIME, ARRAY_SIZE(iso2022MIME));
+ doTestNames("ISO_2022,locale=ko,version=0", "MIME", iso2022MIME, UPRV_LENGTHOF(iso2022MIME));
+ doTestNames("csiso2022kr", "MIME", iso2022MIME, UPRV_LENGTHOF(iso2022MIME));
log_verbose(" Testing unext()\n");
- doTestUCharNames("ASCII", "IANA", asciiIANA, ARRAY_SIZE(asciiIANA));
+ doTestUCharNames("ASCII", "IANA", asciiIANA, UPRV_LENGTHOF(asciiIANA));
}
projects / apple / icu.git / blobdiff