X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/73c04bcfe1096173b00431f0cdc742894b15eef0..HEAD:/icuSources/test/cintltst/ncnvtst.c diff --git a/icuSources/test/cintltst/ncnvtst.c b/icuSources/test/cintltst/ncnvtst.c index 1b26b145..77f7fbc9 100644 --- a/icuSources/test/cintltst/ncnvtst.c +++ b/icuSources/test/cintltst/ncnvtst.c @@ -1,16 +1,18 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2006, 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 #include @@ -20,7 +22,10 @@ #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 @@ -33,7 +38,6 @@ static int32_t gOutBufferSize = 0; static char gNuConvTestName[1024]; #define nct_min(x,y) ((x 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"); @@ -163,17 +167,17 @@ static void TestSurrogateBehaviour(){ 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"); } @@ -189,10 +193,10 @@ static void TestSurrogateBehaviour(){ 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"); } @@ -219,10 +223,10 @@ static void TestSurrogateBehaviour(){ 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"); } @@ -249,10 +253,10 @@ static void TestSurrogateBehaviour(){ }; /*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"); } @@ -277,10 +281,10 @@ static void TestSurrogateBehaviour(){ 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-> HZ not match.\n"); - if(!convertFromU(sampleText, sizeof(sampleText)/sizeof(sampleText[0]), + if(!convertFromU(sampleText, UPRV_LENGTHOF(sampleText), expected, sizeof(expected), "HZ", offsets , TRUE, U_ZERO_ERROR)) log_err("u-> HZ not match.\n"); } @@ -299,30 +303,30 @@ static void TestSurrogateBehaviour(){ 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 )) + 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 )) + 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 )) + 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 )) + sampleText, UPRV_LENGTHOF(sampleText), "UTF8", fromOffsets, FALSE, U_ZERO_ERROR )) log_err("UTF8 -> u did not match.\n"); } @@ -340,26 +344,26 @@ static void TestErrorBehaviour(){ #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"); } @@ -381,63 +385,63 @@ static void TestErrorBehaviour(){ 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"); } @@ -456,27 +460,27 @@ static void TestErrorBehaviour(){ 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"); } @@ -500,34 +504,34 @@ static void TestErrorBehaviour(){ 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"); } @@ -548,27 +552,27 @@ static void TestErrorBehaviour(){ 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"); } @@ -592,34 +596,34 @@ static void TestErrorBehaviour(){ 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"); } @@ -636,10 +640,10 @@ 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"); @@ -651,10 +655,10 @@ static void TestToUnicodeErrorBehaviour() 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"); } @@ -695,14 +699,14 @@ static void TestRegressionUTF8(){ 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, @@ -755,6 +759,7 @@ static void TestRegressionUTF8(){ #define MAX_UTF32_LEN 1 static void TestRegressionUTF32(){ +#if !UCONFIG_ONLY_HTML_CONVERSION UChar32 currCh = 0; int32_t offset32; int32_t offset16; @@ -765,14 +770,14 @@ static void TestRegressionUTF32(){ 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, @@ -807,17 +812,17 @@ static void TestRegressionUTF32(){ 0x02, 0x02, 0x02, 0x02 }; - if(!convertFromU(sampleBadStartSurrogate, sizeof(sampleBadStartSurrogate)/sizeof(sampleBadStartSurrogate[0]), + 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, sizeof(sampleBadEndSurrogate)/sizeof(sampleBadEndSurrogate[0]), + 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, sizeof(sampleBadStartSurrogate)/sizeof(sampleBadStartSurrogate[0]), + 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, sizeof(sampleBadEndSurrogate)/sizeof(sampleBadEndSurrogate[0]), + if(!convertFromU(sampleBadEndSurrogate, UPRV_LENGTHOF(sampleBadEndSurrogate), expectedUTF32LE, sizeof(expectedUTF32LE), "UTF-32LE", offsetsUTF32, TRUE, U_ZERO_ERROR)) log_err("u->UTF-32LE\n"); } @@ -886,6 +891,7 @@ static void TestRegressionUTF32(){ } ucnv_close(convLE); } +#endif } /*Walk through the available converters*/ @@ -930,7 +936,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){ { 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"); } @@ -946,7 +952,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){ 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"); @@ -957,12 +963,12 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){ { 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 @@ -978,7 +984,7 @@ static void TestWithBufferSize(int32_t insize, int32_t outsize){ 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"); @@ -1223,7 +1229,7 @@ static UBool testConvertFromU( const UChar *source, int sourceLen, const uint8_ targ = junkout; offs = junokout; - realBufferSize = (sizeof(junkout)/sizeof(junkout[0])); + realBufferSize = UPRV_LENGTHOF(junkout); realBufferEnd = junkout + realBufferSize; realSourceEnd = source + sourceLen; @@ -1273,7 +1279,7 @@ static UBool testConvertFromU( const UChar *source, int sourceLen, const uint8_ 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]; @@ -1397,7 +1403,7 @@ static UBool testConvertToU( const uint8_t *source, int sourcelen, const UChar * targ = junkout; offs = junokout; - realBufferSize = (sizeof(junkout)/sizeof(junkout[0])); + realBufferSize = UPRV_LENGTHOF(junkout); realBufferEnd = junkout + realBufferSize; realSourceEnd = src + sourcelen; @@ -1448,7 +1454,7 @@ static UBool testConvertToU( const uint8_t *source, int sourcelen, const UChar * 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]; @@ -1528,27 +1534,27 @@ static void TestResetBehaviour(void){ 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"); @@ -1571,15 +1577,15 @@ static void TestResetBehaviour(void){ 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"); @@ -1616,15 +1622,15 @@ static void TestResetBehaviour(void){ 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"); } @@ -1665,14 +1671,14 @@ static void TestResetBehaviour(void){ }; /*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"); } @@ -1709,14 +1715,14 @@ static void TestResetBehaviour(void){ }; /*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"); } @@ -1735,29 +1741,29 @@ static void TestResetBehaviour(void){ 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"); } @@ -1792,7 +1798,7 @@ doTestTruncated(const char *cnvName, const uint8_t *bytes, int32_t length) { 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); @@ -1866,7 +1872,7 @@ TestTruncated() { }; int32_t i; - for(i=0; i