+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/********************************************************************
* COPYRIGHT:
- * Copyright (c) 1997-2004, International Business Machines Corporation and
+ * Copyright (c) 1997-2016, International Business Machines Corporation and
* others. All Rights Reserved.
********************************************************************/
-/********************************************************************************
+/*****************************************************************************
*
-* File CCONVTST.C
+* File ncnvtst.c
*
* Modification History:
* Name Description
* Madhu Katragadda 7/7/2000 Converter Tests for extended code coverage
-*********************************************************************************
+******************************************************************************
*/
#include <stdio.h>
#include <stdlib.h>
#include "unicode/utypes.h"
#include "unicode/ustring.h"
#include "unicode/uset.h"
+#include "unicode/utf8.h"
+#include "unicode/utf16.h"
#include "cintltst.h"
+#include "cmemory.h"
#define MAX_LENGTH 999
static char gNuConvTestName[1024];
#define nct_min(x,y) ((x<y) ? x : y)
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
static void printSeq(const unsigned char* a, int len);
static void printSeqErr(const unsigned char* a, int len);
static void TestSurrogateBehaviour(void);
static void TestErrorBehaviour(void);
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
static void TestToUnicodeErrorBehaviour(void);
static void TestGetNextErrorBehaviour(void);
+#endif
+
static void TestRegressionUTF8(void);
static void TestRegressionUTF32(void);
static void TestAvailableConverters(void);
{
addTest(root, &TestSurrogateBehaviour, "tsconv/ncnvtst/TestSurrogateBehaviour");
addTest(root, &TestErrorBehaviour, "tsconv/ncnvtst/TestErrorBehaviour");
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
addTest(root, &TestToUnicodeErrorBehaviour, "tsconv/ncnvtst/ToUnicodeErrorBehaviour");
addTest(root, &TestGetNextErrorBehaviour, "tsconv/ncnvtst/TestGetNextErrorBehaviour");
+#endif
+
addTest(root, &TestAvailableConverters, "tsconv/ncnvtst/TestAvailableConverters");
addTest(root, &TestFlushInternalBuffer, "tsconv/ncnvtst/TestFlushInternalBuffer");
addTest(root, &TestResetBehaviour, "tsconv/ncnvtst/TestResetBehaviour");
{
UChar sampleText[] = {0x0031, 0xd801, 0xdc01, 0x0032};
const uint8_t expected[] = {0x31, 0x1a, 0x32};
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
/*SBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-920", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] not match.\n");
+#endif
/*LATIN_1*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "LATIN_1", 0, TRUE, U_ZERO_ERROR ))
log_err("u-> LATIN_1 not match.\n");
}
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
log_verbose("Testing for DBCS and MBCS\n");
{
UChar sampleText[] = {0x00a1, 0xd801, 0xdc01, 0x00a4};
int32_t offsets[] = {0x00, 0x00, 0x01, 0x01, 0x03, 0x03 };
/*DBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
/*MBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
}
+
log_verbose("Testing for ISO-2022-jp\n");
{
UChar sampleText[] = { 0x4e00, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
int32_t offsets[] = {0,0,0,0,0,1,1,2,2,2,2,3,5 };
/*iso-2022-jp*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
}
+
log_verbose("Testing for ISO-2022-cn\n");
{
static const UChar sampleText[] = { 0x4e00, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
5, };
/*iso-2022-CN*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> not match.\n");
}
+
log_verbose("Testing for ISO-2022-kr\n");
{
static const UChar sampleText[] = { 0x4e00,0xd801, 0xdc01, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
};
/*iso-2022-kr*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", 0 , TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", offsets , TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
}
+
log_verbose("Testing for HZ\n");
{
static const UChar sampleText[] = { 0x4e00, 0xd801, 0xdc01, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
7,};
/*hz*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", 0 , TRUE, U_ZERO_ERROR))
- log_err("u-> not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ log_err("u-> HZ not match.\n");
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", offsets , TRUE, U_ZERO_ERROR))
- log_err("u-> not match.\n");
+ log_err("u-> HZ not match.\n");
}
+#endif
+
/*UTF-8*/
log_verbose("Testing for UTF8\n");
{
static const int32_t fromOffsets[] = { 0x0000, 0x0003, 0x0005, 0x0006, 0x0009, 0x0009, 0x000D };
/*UTF-8*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", offsets, TRUE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", 0, TRUE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", offsets, FALSE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", 0, FALSE, U_ZERO_ERROR ))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!convertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", 0, TRUE, U_ZERO_ERROR ))
- log_err("UTF8 -> did not match.\n");
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", 0, TRUE, U_ZERO_ERROR ))
+ log_err("UTF8 -> u did not match.\n");
if(!convertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", 0, FALSE, U_ZERO_ERROR ))
- log_err("UTF8 -> did not match.\n");
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", 0, FALSE, U_ZERO_ERROR ))
+ log_err("UTF8 -> u did not match.\n");
if(!convertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", fromOffsets, TRUE, U_ZERO_ERROR ))
- log_err("UTF8 -> did not match.\n");
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", fromOffsets, TRUE, U_ZERO_ERROR ))
+ log_err("UTF8 ->u did not match.\n");
if(!convertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", fromOffsets, FALSE, U_ZERO_ERROR ))
- log_err("UTF8 -> did not match.\n");
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", fromOffsets, FALSE, U_ZERO_ERROR ))
+ log_err("UTF8 -> u did not match.\n");
}
-
-
-
}
/*test various error behaviours*/
static const uint8_t expected[] = { 0x31, 0x1a};
static const uint8_t expected2[] = { 0x31, 0x1a, 0x32};
+#if !UCONFIG_NO_LEGACY_CONVERSION
/*SBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-920", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected0, sizeof(expected0), "ibm-920", 0, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-920", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-920 [UCNV_SBCS] did not match\n");
-
+#endif
/*LATIN_1*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "LATIN_1", 0, TRUE, U_ZERO_ERROR))
log_err("u-> LATIN_1 is supposed to fail\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected0, sizeof(expected0), "LATIN_1", 0, FALSE, U_ZERO_ERROR))
log_err("u-> LATIN_1 is supposed to fail\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "LATIN_1", 0, TRUE, U_ZERO_ERROR))
log_err("u-> LATIN_1 did not match\n");
}
-
+#if !UCONFIG_NO_LEGACY_CONVERSION
log_verbose("Testing for DBCS and MBCS\n");
{
static const UChar sampleText[] = { 0x00a1, 0xd801};
static const uint8_t expected3MBCS[] = { 0x01, 0xa2, 0xb4, 0xa1, 0xe0};
static const int32_t offsets3MBCS[] = { 0x00, 0x01, 0x01, 0x02, 0x02};
- static const UChar sampleText4MBCS[] = { 0x0061, 0x00a6, 0xdc01};
+ static const UChar sampleText4MBCS[] = { 0x0061, 0xFFE4, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x61, 0x8f, 0xa2, 0xc3, 0xf4, 0xfe};
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01, 0x01, 0x02, 0x02 };
-
-
-
-
/*DBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
+ expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", offsetsSUB, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", offsets, FALSE, U_ZERO_ERROR))
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
+ expected, sizeof(expected), "ibm-1363", offsets, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_DBCS portion] is supposed to fail\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] did not match \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", offsets2, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS portion] did not match \n");
/*MBCS*/
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
+ expected, sizeof(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", 0, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "ibm-1363", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "ibm-1363", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "ibm-1363", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
- expected4MBCS, sizeof(expected4MBCS), "euc-jp", offsets4MBCS, TRUE, U_ZERO_ERROR))
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
+ expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
- expected4MBCS, sizeof(expected4MBCS), "euc-jp", offsets4MBCS, FALSE, U_ZERO_ERROR))
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
+ expected4MBCS, sizeof(expected4MBCS), "IBM-eucJP", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> euc-jp [UCNV_MBCS] \n");
}
+
/*iso-2022-jp*/
log_verbose("Testing for iso-2022-jp\n");
{
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x61, 0x1b, 0x24, 0x42, 0x30, 0x6c,0x1b,0x28,0x42,0x1a};
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01 ,0x01, 0x01, 0x01,0x02,0x02,0x02,0x02 };
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-jp", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
- expected, sizeof(expected), "iso-2022-jp", offsets, FALSE, U_ZERO_ERROR))
- log_err("u-> ibm-1363 [UCNV_MBCS] \n");
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
+ expected, sizeof(expected), "iso-2022-jp", offsets, FALSE, U_AMBIGUOUS_ALIAS_WARNING))
+ log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-jp[UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-jp", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-jp", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-jp", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-jp [UCNV_MBCS] \n");
}
+
/*iso-2022-cn*/
log_verbose("Testing for iso-2022-cn\n");
{
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x61, 0x1b, 0x24, 0x29, 0x41, 0x0e, 0x52, 0x3b, 0x0f, 0x1a };
static const int32_t offsets4MBCS[] = { 0x00, 0x01, 0x01 ,0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02 };
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-cn", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-cn[UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-cn", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-cn", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-cn [UCNV_MBCS] \n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-cn", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn[UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-cn", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "iso-2022-cn", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-cn [UCNV_MBCS] \n");
}
+
/*iso-2022-kr*/
log_verbose("Testing for iso-2022-kr\n");
{
static const uint8_t expected3MBCS[] = { 0x1b, 0x24, 0x29, 0x43, 0x51, 0x50, 0x1A };
static const int32_t offsets3MBCS[] = { -1, -1, -1, -1, 0x00, 0x01, 0x02, 0x02 };
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "iso-2022-kr", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_MBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-kr[UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "iso-2022-kr", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-kr", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->iso-2022-kr [UCNV_MBCS] \n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "iso-2022-kr", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> iso-2022-kr[UCNV_MBCS] \n");
}
static const UChar sampleText4MBCS[] = { 0x0061, 0x4e00, 0xdc01};
static const uint8_t expected4MBCS[] = { 0x7e, 0x7d, 0x61, 0x7e, 0x7b, 0x52, 0x3b, 0x7e, 0x7d, 0x1a };
static const int32_t offsets4MBCS[] = { 0x00, 0x00, 0x00, 0x01, 0x01, 0x01 ,0x01, 0x02, 0x02, 0x02 };
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedSUB, sizeof(expectedSUB), "HZ", offsets, TRUE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
- if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", offsets, FALSE, U_ZERO_ERROR))
log_err("u-> ibm-1363 [UCNV_MBCS] \n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, TRUE, U_ZERO_ERROR))
log_err("u->HZ[UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText2, sizeof(sampleText2)/sizeof(sampleText2[0]),
+ if(!convertFromU(sampleText2, UPRV_LENGTHOF(sampleText2),
expected2, sizeof(expected2), "HZ", offsets2, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_DBCS] did not match\n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "HZ", offsets3MBCS, TRUE, U_ZERO_ERROR))
log_err("u->HZ [UCNV_MBCS] \n");
- if(!convertFromU(sampleText3MBCS, sizeof(sampleText3MBCS)/sizeof(sampleText3MBCS[0]),
+ if(!convertFromU(sampleText3MBCS, UPRV_LENGTHOF(sampleText3MBCS),
expected3MBCS, sizeof(expected3MBCS), "HZ", offsets3MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> HZ[UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "HZ", offsets4MBCS, TRUE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
- if(!convertFromU(sampleText4MBCS, sizeof(sampleText4MBCS)/sizeof(sampleText4MBCS[0]),
+ if(!convertFromU(sampleText4MBCS, UPRV_LENGTHOF(sampleText4MBCS),
expected4MBCS, sizeof(expected4MBCS), "HZ", offsets4MBCS, FALSE, U_ZERO_ERROR))
log_err("u-> HZ [UCNV_MBCS] \n");
}
-
-
+#endif
}
+#if !UCONFIG_NO_LEGACY_CONVERSION
/*test different convertToUnicode error behaviours*/
static void TestToUnicodeErrorBehaviour()
{
const UChar expected[] = { 0x00a1 };
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, TRUE, U_ZERO_ERROR ))
+ expected, UPRV_LENGTHOF(expected), "ibm-1363", 0, TRUE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode did not match.\n");
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1363", 0, FALSE, U_ZERO_ERROR ))
+ expected, UPRV_LENGTHOF(expected), "ibm-1363", 0, FALSE, U_AMBIGUOUS_ALIAS_WARNING ))
log_err("DBCS (ibm-1363)->Unicode with flush = false did not match.\n");
}
log_verbose("Testing error conditions for SBCS\n");
const UChar expected2[] = { 0x0073 };*/
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1051", 0, TRUE, U_ZERO_ERROR ))
+ expected, UPRV_LENGTHOF(expected), "ibm-1051", 0, TRUE, U_ZERO_ERROR ))
log_err("SBCS (ibm-1051)->Unicode did not match.\n");
if(!convertToU(sampleText, sizeof(sampleText),
- expected, sizeof(expected)/sizeof(expected[0]), "ibm-1051", 0, FALSE, U_ZERO_ERROR ))
+ expected, UPRV_LENGTHOF(expected), "ibm-1051", 0, FALSE, U_ZERO_ERROR ))
log_err("SBCS (ibm-1051)->Unicode with flush = false did not match.\n");
}
}
ucnv_close(cnv);
}
+#endif
#define MAX_UTF16_LEN 2
#define MAX_UTF8_LEN 4
offset16 = 0;
offset8 = 0;
while(currCh <= UNICODE_LIMIT
- && offset16 < (MAX_LENGTH/sizeof(UChar) - MAX_UTF16_LEN)
+ && offset16 < ((int32_t)(MAX_LENGTH/sizeof(UChar) - MAX_UTF16_LEN))
&& offset8 < (MAX_LENGTH - MAX_UTF8_LEN))
{
if (currCh == SURROGATE_HIGH_START) {
currCh = SURROGATE_LOW_END + 1; /* Skip surrogate range */
}
- UTF16_APPEND_CHAR_SAFE(standardForm, offset16, MAX_LENGTH, currCh);
- UTF8_APPEND_CHAR_SAFE(utf8, offset8, MAX_LENGTH, currCh);
+ U16_APPEND_UNSAFE(standardForm, offset16, currCh);
+ U8_APPEND_UNSAFE(utf8, offset8, currCh);
currCh++;
}
if(!convertFromU(standardForm, offset16,
log_err("UTF8->Unicode did not match.\n");
}
}
+
free(standardForm);
free(utf8);
+
+ {
+ static const char src8[] = { (char)0xCC, (char)0x81, (char)0xCC, (char)0x80 };
+ static const UChar expected[] = { 0x0301, 0x0300 };
+ UConverter *conv8;
+ UErrorCode err = U_ZERO_ERROR;
+ UChar pivotBuffer[100];
+ const UChar* const pivEnd = pivotBuffer + 100;
+ const char* srcBeg;
+ const char* srcEnd;
+ UChar* pivBeg;
+
+ conv8 = ucnv_open("UTF-8", &err);
+
+ srcBeg = src8;
+ pivBeg = pivotBuffer;
+ srcEnd = src8 + 3;
+ ucnv_toUnicode(conv8, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, FALSE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on first call.\n");
+ }
+
+ srcEnd = src8 + 4;
+ ucnv_toUnicode(conv8, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, TRUE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on second call.\n");
+ }
+
+ if (U_FAILURE(err) || (int32_t)(pivBeg - pivotBuffer) != 2 || u_strncmp(pivotBuffer, expected, 2) != 0) {
+ log_err("Did not get expected results for UTF-8.\n");
+ }
+ ucnv_close(conv8);
+ }
}
#define MAX_UTF32_LEN 1
static void TestRegressionUTF32(){
+#if !UCONFIG_ONLY_HTML_CONVERSION
UChar32 currCh = 0;
int32_t offset32;
int32_t offset16;
offset16 = 0;
offset32 = 0;
while(currCh <= UNICODE_LIMIT
- && offset16 < (MAX_LENGTH/sizeof(UChar) - MAX_UTF16_LEN)
- && offset32 < (MAX_LENGTH/sizeof(UChar32) - MAX_UTF32_LEN))
+ && offset16 < ((int32_t)(MAX_LENGTH/sizeof(UChar) - MAX_UTF16_LEN))
+ && offset32 < ((int32_t)(MAX_LENGTH/sizeof(UChar32) - MAX_UTF32_LEN)))
{
if (currCh == SURROGATE_HIGH_START) {
currCh = SURROGATE_LOW_END + 1; /* Skip surrogate range */
}
- UTF16_APPEND_CHAR_SAFE(standardForm, offset16, MAX_LENGTH, currCh);
- UTF32_APPEND_CHAR_SAFE(utf32, offset32, MAX_LENGTH, currCh);
+ U16_APPEND_UNSAFE(standardForm, offset16, currCh);
+ utf32[offset32++] = currCh;
currCh++;
}
if(!convertFromU(standardForm, offset16,
}
free(standardForm);
free(utf32);
+
+ {
+ /* Check for lone surrogate error handling. */
+ static const UChar sampleBadStartSurrogate[] = { 0x0031, 0xD800, 0x0032 };
+ static const UChar sampleBadEndSurrogate[] = { 0x0031, 0xDC00, 0x0032 };
+ static const uint8_t expectedUTF32BE[] = {
+ 0x00, 0x00, 0x00, 0x31,
+ 0x00, 0x00, 0xff, 0xfd,
+ 0x00, 0x00, 0x00, 0x32
+ };
+ static const uint8_t expectedUTF32LE[] = {
+ 0x31, 0x00, 0x00, 0x00,
+ 0xfd, 0xff, 0x00, 0x00,
+ 0x32, 0x00, 0x00, 0x00
+ };
+ static const int32_t offsetsUTF32[] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x01, 0x01, 0x01, 0x01,
+ 0x02, 0x02, 0x02, 0x02
+ };
+
+ if(!convertFromU(sampleBadStartSurrogate, UPRV_LENGTHOF(sampleBadStartSurrogate),
+ expectedUTF32BE, sizeof(expectedUTF32BE), "UTF-32BE", offsetsUTF32, TRUE, U_ZERO_ERROR))
+ log_err("u->UTF-32BE\n");
+ if(!convertFromU(sampleBadEndSurrogate, UPRV_LENGTHOF(sampleBadEndSurrogate),
+ expectedUTF32BE, sizeof(expectedUTF32BE), "UTF-32BE", offsetsUTF32, TRUE, U_ZERO_ERROR))
+ log_err("u->UTF-32BE\n");
+
+ if(!convertFromU(sampleBadStartSurrogate, UPRV_LENGTHOF(sampleBadStartSurrogate),
+ expectedUTF32LE, sizeof(expectedUTF32LE), "UTF-32LE", offsetsUTF32, TRUE, U_ZERO_ERROR))
+ log_err("u->UTF-32LE\n");
+ if(!convertFromU(sampleBadEndSurrogate, UPRV_LENGTHOF(sampleBadEndSurrogate),
+ expectedUTF32LE, sizeof(expectedUTF32LE), "UTF-32LE", offsetsUTF32, TRUE, U_ZERO_ERROR))
+ log_err("u->UTF-32LE\n");
+ }
+
+ {
+ static const char srcBE[] = { 0, 0, 0, 0x31, 0, 0, 0, 0x30 };
+ static const UChar expected[] = { 0x0031, 0x0030 };
+ UConverter *convBE;
+ UErrorCode err = U_ZERO_ERROR;
+ UChar pivotBuffer[100];
+ const UChar* const pivEnd = pivotBuffer + 100;
+ const char* srcBeg;
+ const char* srcEnd;
+ UChar* pivBeg;
+
+ convBE = ucnv_open("UTF-32BE", &err);
+
+ srcBeg = srcBE;
+ pivBeg = pivotBuffer;
+ srcEnd = srcBE + 5;
+ ucnv_toUnicode(convBE, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, FALSE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on first call.\n");
+ }
+
+ srcEnd = srcBE + 8;
+ ucnv_toUnicode(convBE, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, TRUE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on second call.\n");
+ }
+
+ if (U_FAILURE(err) || (int32_t)(pivBeg - pivotBuffer) != 2 || u_strncmp(pivotBuffer, expected, 2) != 0) {
+ log_err("Did not get expected results for UTF-32BE.\n");
+ }
+ ucnv_close(convBE);
+ }
+ {
+ static const char srcLE[] = { 0x31, 0, 0, 0, 0x30, 0, 0, 0 };
+ static const UChar expected[] = { 0x0031, 0x0030 };
+ UConverter *convLE;
+ UErrorCode err = U_ZERO_ERROR;
+ UChar pivotBuffer[100];
+ const UChar* const pivEnd = pivotBuffer + 100;
+ const char* srcBeg;
+ const char* srcEnd;
+ UChar* pivBeg;
+
+ convLE = ucnv_open("UTF-32LE", &err);
+
+ srcBeg = srcLE;
+ pivBeg = pivotBuffer;
+ srcEnd = srcLE + 5;
+ ucnv_toUnicode(convLE, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, FALSE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on first call.\n");
+ }
+
+ srcEnd = srcLE + 8;
+ ucnv_toUnicode(convLE, &pivBeg, pivEnd, &srcBeg, srcEnd, 0, TRUE, &err);
+ if (srcBeg != srcEnd) {
+ log_err("Did not consume whole buffer on second call.\n");
+ }
+
+ if (U_FAILURE(err) || (int32_t)(pivBeg - pivotBuffer) != 2 || u_strncmp(pivotBuffer, expected, 2) != 0) {
+ log_err("Did not get expected results for UTF-32LE.\n");
+ }
+ ucnv_close(convLE);
+ }
+#endif
}
/*Walk through the available converters*/
{ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0007, 0x000a, 0x000d };*/
/*UTF-8*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expectedUTF8, sizeof(expectedUTF8), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE, toUTF8Offs ,FALSE))
log_err("u-> UTF8 did not match.\n");
}
+#if !UCONFIG_NO_LEGACY_CONVERSION
log_verbose("Testing fromUnicode with UCNV_FROM_U_CALLBACK_ESCAPE \n");
{
UChar inputTest[] = { 0x0061, 0xd801, 0xdc01, 0xd801, 0x0061 };
0x61 };
int32_t offset[]= {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 4};
- if(!testConvertFromU(inputTest, sizeof(inputTest)/sizeof(inputTest[0]),
+ if(!testConvertFromU(inputTest, UPRV_LENGTHOF(inputTest),
toIBM943, sizeof(toIBM943), "ibm-943",
(UConverterFromUCallback)UCNV_FROM_U_CALLBACK_ESCAPE, offset,FALSE))
log_err("u-> ibm-943 with subst with value did not match.\n");
}
+#endif
log_verbose("Testing fromUnicode for UTF-8 with UCNV_TO_U_CALLBACK_SUBSTITUTE \n");
{
const uint8_t sampleText1[] = { 0x31, 0xe4, 0xba, 0x8c,
0xe0, 0x80, 0x61};
- UChar expected1[] = { 0x0031, 0x4e8c, 0xfffd, 0x0061};
- int32_t offsets1[] = { 0x0000, 0x0001, 0x0004, 0x0006};
+ UChar expected1[] = { 0x0031, 0x4e8c, 0xfffd, 0xfffd, 0x0061};
+ int32_t offsets1[] = { 0x0000, 0x0001, 0x0004, 0x0005, 0x0006};
if(!testConvertToU(sampleText1, sizeof(sampleText1),
- expected1, sizeof(expected1)/sizeof(expected1[0]),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
- log_err("utf8->u with substitute did not match.\n");;
+ expected1, UPRV_LENGTHOF(expected1),"utf8", UCNV_TO_U_CALLBACK_SUBSTITUTE, offsets1,FALSE))
+ log_err("utf8->u with substitute did not match.\n");
}
-
+#if !UCONFIG_NO_LEGACY_CONVERSION
log_verbose("Testing toUnicode with UCNV_TO_U_CALLBACK_ESCAPE \n");
/*to Unicode*/
{
int32_t fromIBM943Offs [] = { 0, 1, 3, 3, 3, 3, 3, 3, 3, 3, 5};
if(!testConvertToU(sampleTxtToU, sizeof(sampleTxtToU),
- IBM_943toUnicode, sizeof(IBM_943toUnicode)/sizeof(IBM_943toUnicode[0]),"ibm-943",
+ IBM_943toUnicode, UPRV_LENGTHOF(IBM_943toUnicode),"ibm-943",
(UConverterToUCallback)UCNV_TO_U_CALLBACK_ESCAPE, fromIBM943Offs,FALSE))
log_err("ibm-943->u with substitute with value did not match.\n");
}
-
+#endif
}
static UBool convertFromU( const UChar *source, int sourceLen, const uint8_t *expect, int expectLen,
{
int32_t i=0;
- uint8_t *p=0;
+ char *p=0;
const UChar *src;
- uint8_t buffer[MAX_LENGTH];
+ char buffer[MAX_LENGTH];
int32_t offsetBuffer[MAX_LENGTH];
int32_t *offs=0;
- uint8_t *targ;
- uint8_t *targetLimit;
+ char *targ;
+ char *targetLimit;
UChar *sourceLimit=0;
UErrorCode status = U_ZERO_ERROR;
UConverter *conv = 0;
log_verbose("Converter %s opened..\n", ucnv_getName(conv, &status));
for(i=0; i<MAX_LENGTH; i++){
- buffer[i]=0xF0;
+ buffer[i]=(char)0xF0;
offsetBuffer[i]=0xFF;
}
{
log_err("Expected %d chars out, got %d FROM Unicode to %s\n", expectLen, targ-buffer, codepage);
log_verbose("Expected %d chars out, got %d FROM Unicode to %s\n", expectLen, targ-buffer, codepage);
- printSeqErr((const unsigned char *)buffer, targ-buffer);
+ printSeqErr((const unsigned char *)buffer, (int32_t)(targ-buffer));
printSeqErr((const unsigned char*)expect, expectLen);
return FALSE;
}
if(memcmp(offsetBuffer,expectOffsets,(targ-buffer) * sizeof(int32_t) )){
log_err("did not get the expected offsets. for FROM Unicode to %s\n", codepage);
log_info("\nGot : ");
- printSeqErr((const unsigned char*)buffer, targ-buffer);
+ printSeqErr((const unsigned char*)buffer, (int32_t)(targ-buffer));
for(p=buffer;p<targ;p++)
log_info("%d, ", offsetBuffer[p-buffer]);
log_info("\nExpected: ");
UConverter *conv = 0;
int32_t i=0;
UChar *p=0;
- const uint8_t* src;
+ const char* src;
UChar buffer[MAX_LENGTH];
int32_t offsetBuffer[MAX_LENGTH];
int32_t *offs=0;
offsetBuffer[i]=-1;
}
- src=source;
+ src=(const char *)source;
sourceLimit=(uint8_t*)(src+(sourceLen));
targ=buffer;
targetLimit=targ+MAX_LENGTH;
for(i=0; i<(targ-buffer); i++)
log_info("0x%04X,", buffer[i]);
log_info("\nFrom Input:");
- for(i=0; i<(src-source); i++)
+ for(i=0; i<(src-(const char *)source); i++)
log_info("0x%02X,", (unsigned char)source[i]);
log_info("\n");
}
{
UErrorCode status = U_ZERO_ERROR;
UConverter *conv = 0;
- uint8_t junkout[MAX_LENGTH]; /* FIX */
+ char junkout[MAX_LENGTH]; /* FIX */
int32_t junokout[MAX_LENGTH]; /* FIX */
- uint8_t *p;
+ char *p;
const UChar *src;
- uint8_t *end;
- uint8_t *targ;
+ char *end;
+ char *targ;
int32_t *offs;
int i;
int32_t realBufferSize;
- uint8_t *realBufferEnd;
+ char *realBufferEnd;
const UChar *realSourceEnd;
const UChar *sourceLimit;
UBool checkOffsets = TRUE;
const void* oldContext = NULL;
for(i=0;i<MAX_LENGTH;i++)
- junkout[i] = 0xF0;
+ junkout[i] = (char)0xF0;
for(i=0;i<MAX_LENGTH;i++)
junokout[i] = 0xFF;
targ = junkout;
offs = junokout;
- realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
+ realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = source + sourceLen;
checkOffsets = FALSE;
do
- {
+ {
end = nct_min(targ + gOutBufferSize, realBufferEnd);
sourceLimit = nct_min(src + gInBufferSize, realSourceEnd);
log_verbose("\nConversion done [%d uchars in -> %d chars out]. \nResult :",
sourceLen, targ-junkout);
- if(VERBOSITY)
+ if(getTestOption(VERBOSITY_OPTION))
{
char junk[999];
char offset_str[999];
- uint8_t *ptr;
+ char *ptr;
junk[0] = 0;
offset_str[0] = 0;
log_err("Expected %d chars out, got %d %s\n", expectLen, targ-junkout, gNuConvTestName);
log_verbose("Expected %d chars out, got %d %s\n", expectLen, targ-junkout, gNuConvTestName);
log_info("\nGot:");
- printSeqErr((const unsigned char*)junkout, targ-junkout);
+ printSeqErr((const unsigned char*)junkout, (int32_t)(targ-junkout));
log_info("\nExpected:");
printSeqErr((const unsigned char*)expect, expectLen);
return FALSE;
if(memcmp(junokout,expectOffsets,(targ-junkout) * sizeof(int32_t) )){
log_err("did not get the expected offsets. %s", gNuConvTestName);
log_err("Got : ");
- printSeqErr((const unsigned char*)junkout, targ-junkout);
+ printSeqErr((const unsigned char*)junkout, (int32_t)(targ-junkout));
for(p=junkout;p<targ;p++)
log_err("%d, ", junokout[p-junkout]);
log_err("\nExpected: ");
UConverter *conv = 0;
UChar junkout[MAX_LENGTH]; /* FIX */
int32_t junokout[MAX_LENGTH]; /* FIX */
- const uint8_t *src;
- const uint8_t *realSourceEnd;
- const uint8_t *srcLimit;
+ const char *src;
+ const char *realSourceEnd;
+ const char *srcLimit;
UChar *p;
UChar *targ;
UChar *end;
}
/*-------------------------------------*/
- src = source;
+ src = (const char *)source;
targ = junkout;
offs = junokout;
- realBufferSize = (sizeof(junkout)/sizeof(junkout[0]));
+ realBufferSize = UPRV_LENGTHOF(junkout);
realBufferEnd = junkout + realBufferSize;
realSourceEnd = src + sourcelen;
log_verbose("\nConversion done. %d bytes -> %d chars.\nResult :",
sourcelen, targ-junkout);
- if(VERBOSITY)
+ if(getTestOption(VERBOSITY_OPTION))
{
char junk[999];
char offset_str[999];
for(i=0; i<(targ-junkout); i++)
log_err("%X,", junkout[i]);
log_err("");
- for(i=0; i<(src-source); i++)
+ for(i=0; i<(src-(const char *)source); i++)
log_err("%X,", (unsigned char)source[i]);
}
}
static void TestResetBehaviour(void){
+#if !UCONFIG_NO_LEGACY_CONVERSION
log_verbose("Testing Reset for DBCS and MBCS\n");
{
static const UChar sampleText[] = {0x00a1, 0xd801, 0xdc01, 0x00a4};
static const int32_t offsets1[] = { 0,2,4,6};
/*DBCS*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> ibm-1363 [UCNV_DBCS portion] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("ibm-1363 -> did not match.\n");
/*MBCS*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "ibm-1363", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> ibm-1363 [UCNV_MBCS] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "ibm-1363",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("ibm-1363 -> did not match.\n");
}
+
log_verbose("Testing Reset for ISO-2022-jp\n");
{
static const UChar sampleText[] = { 0x4e00, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
static const int32_t offsets1[] = { 3,5,10,11,12};
/*iso-2022-jp*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-jp", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-jp",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-jp",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-jp -> did not match.\n");
}
+
log_verbose("Testing Reset for ISO-2022-cn\n");
{
static const UChar sampleText[] = { 0x4e00, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
static const int32_t offsets1[] = { 5,7,13,16,17};
/*iso-2022-CN*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-cn", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-cn",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-cn",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-cn -> did not match.\n");
}
+
log_verbose("Testing Reset for ISO-2022-kr\n");
{
UChar sampleText[] = { 0x4e00,0xd801, 0xdc01, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
};
/*iso-2022-kr*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", UCNV_FROM_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "iso-2022-kr", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> iso-2022-kr [UCNV_DBCS] not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "iso-2022-kr",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "iso-2022-kr",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("iso-2022-kr -> did not match.\n");
}
+
log_verbose("Testing Reset for HZ\n");
{
static const UChar sampleText[] = { 0x4e00, 0xd801, 0xdc01, 0x04e01, 0x0031, 0xd801, 0xdc01, 0x0032};
};
/*hz*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "HZ", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> not match.\n");
if(!testConvertToU(expected1, sizeof(expected1),
- sampleText1, sizeof(sampleText1)/sizeof(sampleText1[0]), "hz",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
+ sampleText1, UPRV_LENGTHOF(sampleText1), "hz",UCNV_TO_U_CALLBACK_SUBSTITUTE ,
offsets1, TRUE))
log_err("hz -> did not match.\n");
}
+#endif
+
/*UTF-8*/
log_verbose("Testing for UTF8\n");
{
static const int32_t fromOffsets[] = { 0x0000, 0x0003, 0x0005, 0x0006, 0x0009, 0x0009, 0x000D };
/*UTF-8*/
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,offsets , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
- if(!testConvertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]),
+ if(!testConvertFromU(sampleText, UPRV_LENGTHOF(sampleText),
expected, sizeof(expected), "UTF8", UCNV_FROM_U_CALLBACK_SUBSTITUTE,NULL , TRUE))
log_err("u-> UTF8 with offsets and flush true did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , NULL, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8",UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
log_err("UTF8 -> did not match.\n");
if(!testConvertToU(expected, sizeof(expected),
- sampleText, sizeof(sampleText)/sizeof(sampleText[0]), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
+ sampleText, UPRV_LENGTHOF(sampleText), "UTF8", UCNV_TO_U_CALLBACK_SUBSTITUTE , fromOffsets, TRUE))
log_err("UTF8 -> did not match.\n");
}
source=(const char *)bytes;
sourceLimit=source+length;
target=buffer;
- targetLimit=buffer+LENGTHOF(buffer);
+ targetLimit=buffer+UPRV_LENGTHOF(buffer);
/* 1. input bytes with flush=FALSE, then input nothing with flush=TRUE */
ucnv_toUnicode(cnv, &target, targetLimit, &source, sourceLimit, NULL, FALSE, &errorCode);
{ "UTF-32", { 0, 0, 0x4e }, 3 },
{ "UTF-32", { 0xff }, 1 },
{ "UTF-32", { 0, 0, 0xfe, 0xff, 0 }, 5 },
-
{ "SCSU", { 0x0e, 0x4e }, 2 }, /* SQU 0x4e */
+
+#if !UCONFIG_NO_LEGACY_CONVERSION
{ "BOCU-1", { 0xd5 }, 1 },
{ "Shift-JIS", { 0xe0 }, 1 },
{ "ibm-939", { 0x0e, 0x41 }, 2 } /* SO 0x41 */
+#else
+ { "BOCU-1", { 0xd5 }, 1 ,}
+#endif
};
int32_t i;
- for(i=0; i<LENGTHOF(testCases); ++i) {
+ for(i=0; i<UPRV_LENGTHOF(testCases); ++i) {
doTestTruncated(testCases[i].cnvName, testCases[i].bytes, testCases[i].length);
}
}
"SCSU",
"BOCU-1",
"CESU-8",
+#if !UCONFIG_NO_LEGACY_CONVERSION
"gb18030",
+#endif
"IMAP-mailbox-name"
};
-
+#if !UCONFIG_NO_LEGACY_CONVERSION
static const char *const lmbcsNames[]={
"LMBCS-1",
"LMBCS-2",
"LMBCS-18",
"LMBCS-19"
};
+#endif
static const NameRange nameRanges[]={
{ "US-ASCII", 0, 0x7f, -1, -1, 0x80, 0x10ffff },
+#if !UCONFIG_NO_LEGACY_CONVERSION
{ "ibm-367", 0, 0x7f, -1, -1, 0x80, 0x10ffff },
+#endif
{ "ISO-8859-1", 0, 0x7f, -1, -1, 0x100, 0x10ffff },
+#if !UCONFIG_NO_LEGACY_CONVERSION
{ "UTF-8", 0, 0xd7ff, 0xe000, 0x10ffff, 0xd800, 0xdfff },
{ "windows-1251", 0, 0x7f, 0x410, 0x44f, 0x3000, 0xd7ff },
- { "HZ", 0x410, 0x44f, 0x4e00, 0x4eff, 0xac00, 0xd7ff },
+ /* HZ test case fixed and moved to intltest's conversion.txt, ticket #6002 */
{ "shift-jis", 0x3041, 0x3093, 0x30a1, 0x30f3, 0x900, 0x1cff }
+#else
+ { "UTF-8", 0, 0xd7ff, 0xe000, 0x10ffff, 0xd800, 0xdfff }
+#endif
};
/* open an empty set */
name=ucnv_getAvailableName(i);
cnv=ucnv_open(name, &errorCode);
if(U_FAILURE(errorCode)) {
- log_err("error: unable to open converter %s - %s\n",
+ log_data_err("error: unable to open converter %s - %s\n",
name, u_errorName(errorCode));
continue;
}
}
/* test converters that are known to convert all of Unicode (except maybe for surrogates) */
- for(i=0; i<LENGTHOF(completeSetNames); ++i) {
+ for(i=0; i<UPRV_LENGTHOF(completeSetNames); ++i) {
errorCode=U_ZERO_ERROR;
name=completeSetNames[i];
cnv=ucnv_open(name, &errorCode);
if(U_FAILURE(errorCode)) {
- log_err("error: unable to open converter %s - %s\n",
+ log_data_err("error: unable to open converter %s - %s\n",
name, u_errorName(errorCode));
continue;
}
ucnv_close(cnv);
}
+#if !UCONFIG_NO_LEGACY_CONVERSION
/* test LMBCS variants which convert all of Unicode except for U+F6xx */
- for(i=0; i<LENGTHOF(lmbcsNames); ++i) {
+ for(i=0; i<UPRV_LENGTHOF(lmbcsNames); ++i) {
errorCode=U_ZERO_ERROR;
name=lmbcsNames[i];
cnv=ucnv_open(name, &errorCode);
if(U_FAILURE(errorCode)) {
- log_err("error: unable to open converter %s - %s\n",
+ log_data_err("error: unable to open converter %s - %s\n",
name, u_errorName(errorCode));
continue;
}
ucnv_close(cnv);
}
+#endif
/* test specific sets */
- for(i=0; i<LENGTHOF(nameRanges); ++i) {
+ for(i=0; i<UPRV_LENGTHOF(nameRanges); ++i) {
errorCode=U_ZERO_ERROR;
name=nameRanges[i].name;
cnv=ucnv_open(name, &errorCode);
ucnv_close(cnv);
}
+ errorCode = U_ZERO_ERROR;
+ ucnv_getUnicodeSet(NULL, set, UCNV_ROUNDTRIP_SET, &errorCode);
+ if (errorCode != U_ILLEGAL_ARGUMENT_ERROR) {
+ log_err("error: ucnv_getUnicodeSet(NULL) returned wrong status code %s\n", u_errorName(errorCode));
+ }
+ errorCode = U_PARSE_ERROR;
+ /* Make sure that it does nothing if an error is passed in. Difficult to proper test for. */
+ ucnv_getUnicodeSet(NULL, NULL, UCNV_ROUNDTRIP_SET, &errorCode);
+ if (errorCode != U_PARSE_ERROR) {
+ log_err("error: ucnv_getUnicodeSet(NULL) returned wrong status code %s\n", u_errorName(errorCode));
+ }
+
uset_close(set);
}
projects / apple / icu.git / blobdiff