X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..e4f10fab0c078f399c9deef476d9c9b73b47dff8:/icuSources/test/intltest/testidna.cpp diff --git a/icuSources/test/intltest/testidna.cpp b/icuSources/test/intltest/testidna.cpp index c1174053..c24dbe60 100644 --- a/icuSources/test/intltest/testidna.cpp +++ b/icuSources/test/intltest/testidna.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * - * Copyright (C) 2003-2004, International Business Machines + * Copyright (C) 2003-2012, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -22,6 +22,7 @@ #include #include #include +#include "unicode/localpointer.h" #include "unicode/ustring.h" #include "unicode/usprep.h" #include "unicode/uniset.h" @@ -29,8 +30,9 @@ #include "idnaref.h" #include "nptrans.h" #include "unicode/putil.h" +#include "idnaconf.h" -static UChar unicodeIn[][41] ={ +static const UChar unicodeIn[][41] ={ { 0x0644, 0x064A, 0x0647, 0x0645, 0x0627, 0x0628, 0x062A, 0x0643, 0x0644, 0x0645, 0x0648, 0x0634, 0x0639, 0x0631, 0x0628, 0x064A, 0x061F, 0x0000 @@ -145,6 +147,9 @@ static UChar unicodeIn[][41] ={ 0x043e, 0x0440, 0x044f, 0x0442, 0x043f, 0x043e, 0x0440, 0x0443, 0x0441, 0x0441, 0x043a, 0x0438 }, + { + 0xFB00, 0xFB01 + } }; @@ -172,6 +177,7 @@ static const char *asciiIn[] = { "xn--hxargifdar", // Greek "xn--bonusaa-5bb1da", // Maltese "xn--b1abfaaepdrnnbgefbadotcwatmq2g4l", // Russian (Cyrillic) + "fffi" }; static const char *domainNames[] = { @@ -228,7 +234,7 @@ static const char *domainNames[] = { typedef struct ErrorCases ErrorCases; -static struct ErrorCases{ +static const struct ErrorCases{ UChar unicode[100]; const char *ascii; @@ -249,7 +255,7 @@ static struct ErrorCases{ }, "www.XN--8mb5595fsoa28orucya378bqre2tcwop06c5qbw82a1rffmae0361dea96b.com", U_IDNA_PROHIBITED_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { @@ -263,7 +269,7 @@ static struct ErrorCases{ "www.XN--6lA2Bz548Fj1GuA391Bf1Gb1N59Ab29A7iA.com", U_IDNA_UNASSIGNED_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { { @@ -276,7 +282,7 @@ static struct ErrorCases{ }, "www.xn--ghBGI4851OiyA33VqrD6Az86C4qF83CtRv93D5xBk15AzfG0nAgA0578DeA71C.com", U_IDNA_CHECK_BIDI_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { { @@ -291,7 +297,7 @@ static struct ErrorCases{ }, "www.xn----b95Ew8SqA315Ao5FbuMlnNmhA.com", U_IDNA_STD3_ASCII_RULES_ERROR, - TRUE, TRUE, FALSE + TRUE, FALSE, FALSE }, { { @@ -323,7 +329,7 @@ static struct ErrorCases{ }, "www.xn--989AoMsVi5E83Db1D2A355Cv1E0vAk1DwRv93D5xBh15A0Dt30A5JpSD879Ccm6FeA98C.com", U_IDNA_LABEL_TOO_LONG_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { @@ -335,7 +341,7 @@ static struct ErrorCases{ }, "www.xn--01-tvdmo.com", U_IDNA_CHECK_BIDI_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { @@ -347,7 +353,7 @@ static struct ErrorCases{ }, "www.XN--ghbgi278xia.com", U_IDNA_PROHIBITED_ERROR, - FALSE, TRUE, TRUE + FALSE, FALSE, TRUE }, { { @@ -358,7 +364,7 @@ static struct ErrorCases{ }, "www.-abcde.com", U_IDNA_STD3_ASCII_RULES_ERROR, - TRUE, TRUE, FALSE + TRUE, FALSE, FALSE }, { { @@ -369,7 +375,7 @@ static struct ErrorCases{ }, "www.abcde-.com", U_IDNA_STD3_ASCII_RULES_ERROR, - TRUE, TRUE, FALSE + TRUE, FALSE, FALSE }, { { @@ -380,7 +386,18 @@ static struct ErrorCases{ }, "www.abcde@.com", U_IDNA_STD3_ASCII_RULES_ERROR, - TRUE, TRUE, FALSE + TRUE, FALSE, FALSE + }, + { + { + 0x0077, 0x0077, 0x0077, 0x002e, // www. + // zero length label + 0x002e, 0x0063, 0x006f, 0x006d, // com. + 0x0000 + }, + "www..com", + U_IDNA_ZERO_LENGTH_LABEL_ERROR, + TRUE, FALSE, FALSE }, { {0}, @@ -391,193 +408,6 @@ static struct ErrorCases{ }; -static struct ConformanceTestCases - { - const char *comment; - const char *in; - const char *out; - const char *profile; - int32_t flags; - UErrorCode expectedStatus; - } - conformanceTestCases[] = - { - - { - "Case folding ASCII U+0043 U+0041 U+0046 U+0045", - "\x43\x41\x46\x45", "\x63\x61\x66\x65", - "Nameprep", UIDNA_DEFAULT, - U_ZERO_ERROR - - }, - { - "Case folding 8bit U+00DF (german sharp s)", - "\xC3\x9F", "\x73\x73", - "Nameprep", UIDNA_DEFAULT, - U_ZERO_ERROR - }, - { - "Non-ASCII multibyte space character U+1680", - "\xE1\x9A\x80", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Non-ASCII 8bit control character U+0085", - "\xC2\x85", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Non-ASCII multibyte control character U+180E", - "\xE1\xA0\x8E", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Non-ASCII control character U+1D175", - "\xF0\x9D\x85\xB5", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Plane 0 private use character U+F123", - "\xEF\x84\xA3", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Plane 15 private use character U+F1234", - "\xF3\xB1\x88\xB4", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Plane 16 private use character U+10F234", - "\xF4\x8F\x88\xB4", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Non-character code point U+8FFFE", - "\xF2\x8F\xBF\xBE", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Non-character code point U+10FFFF", - "\xF4\x8F\xBF\xBF", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - /* - { - "Surrogate code U+DF42", - "\xED\xBD\x82", NULL, "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, -*/ - { - "Non-plain text character U+FFFD", - "\xEF\xBF\xBD", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Ideographic description character U+2FF5", - "\xE2\xBF\xB5", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Display property character U+0341", - "\xCD\x81", "\xCC\x81", - "Nameprep", UIDNA_DEFAULT, U_ZERO_ERROR - - }, - - { - "Left-to-right mark U+200E", - "\xE2\x80\x8E", "\xCC\x81", - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - - "Deprecated U+202A", - "\xE2\x80\xAA", "\xCC\x81", - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Language tagging character U+E0001", - "\xF3\xA0\x80\x81", "\xCC\x81", - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Language tagging character U+E0042", - "\xF3\xA0\x81\x82", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_PROHIBITED_ERROR - }, - { - "Bidi: RandALCat character U+05BE and LCat characters", - "\x66\x6F\x6F\xD6\xBE\x62\x61\x72", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_CHECK_BIDI_ERROR - }, - { - "Bidi: RandALCat character U+FD50 and LCat characters", - "\x66\x6F\x6F\xEF\xB5\x90\x62\x61\x72", NULL, - "Nameprep",UIDNA_DEFAULT , - U_IDNA_CHECK_BIDI_ERROR - }, - { - "Bidi: RandALCat character U+FB38 and LCat characters", - "\x66\x6F\x6F\xEF\xB9\xB6\x62\x61\x72", "\x66\x6F\x6F\x20\xd9\x8e\x62\x61\x72", - "Nameprep", UIDNA_DEFAULT, - U_ZERO_ERROR - }, - { "Bidi: RandALCat without trailing RandALCat U+0627 U+0031", - "\xD8\xA7\x31", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_CHECK_BIDI_ERROR - }, - { - "Bidi: RandALCat character U+0627 U+0031 U+0628", - "\xD8\xA7\x31\xD8\xA8", "\xD8\xA7\x31\xD8\xA8", - "Nameprep", UIDNA_DEFAULT, - U_ZERO_ERROR - }, - { - "Unassigned code point U+E0002", - "\xF3\xA0\x80\x82", NULL, - "Nameprep", UIDNA_DEFAULT, - U_IDNA_UNASSIGNED_ERROR - }, - -/* // Invalid UTF-8 - { - "Larger test (shrinking)", - "X\xC2\xAD\xC3\xDF\xC4\xB0\xE2\x84\xA1\x6a\xcc\x8c\xc2\xa0\xc2" - "\xaa\xce\xb0\xe2\x80\x80", "xssi\xcc\x87""tel\xc7\xb0 a\xce\xb0 ", - "Nameprep", - UIDNA_DEFAULT, U_ZERO_ERROR - }, - { - - "Larger test (expanding)", - "X\xC3\xDF\xe3\x8c\x96\xC4\xB0\xE2\x84\xA1\xE2\x92\x9F\xE3\x8c\x80", - "xss\xe3\x82\xad\xe3\x83\xad\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\x88" - "\xe3\x83\xab""i\xcc\x87""tel\x28""d\x29\xe3\x82\xa2\xe3\x83\x91" - "\xe3\x83\xbc\xe3\x83\x88" - "Nameprep", - UIDNA_DEFAULT, U_ZERO_ERROR - }, - */ -}; - #define MAX_DEST_SIZE 300 @@ -588,7 +418,7 @@ void TestIDNA::debug(const UChar* src, int32_t srcLength, int32_t options){ UErrorCode prepStatus = U_ZERO_ERROR; NamePrepTransform* trans = NamePrepTransform::createInstance(parseError,transStatus); int32_t prepOptions = (((options & UIDNA_ALLOW_UNASSIGNED) != 0) ? USPREP_ALLOW_UNASSIGNED: 0); - UStringPrepProfile* prep = usprep_open(NULL,"uidna",&prepStatus); + LocalUStringPrepProfilePointer prep(usprep_openByType(USPREP_RFC3491_NAMEPREP,&prepStatus)); UChar *transOut=NULL, *prepOut=NULL; int32_t transOutLength=0, prepOutLength=0; @@ -600,12 +430,12 @@ void TestIDNA::debug(const UChar* src, int32_t srcLength, int32_t options){ transOutLength = trans->process(src,srcLength,transOut, transOutLength, prepOptions>0, &parseError, transStatus); } - prepOutLength = usprep_prepare(prep, src, srcLength, prepOut, 0, prepOptions, &parseError, &prepStatus); + prepOutLength = usprep_prepare(prep.getAlias(), src, srcLength, prepOut, 0, prepOptions, &parseError, &prepStatus); if( prepStatus == U_BUFFER_OVERFLOW_ERROR){ prepStatus = U_ZERO_ERROR; prepOut = (UChar*) malloc(U_SIZEOF_UCHAR * prepOutLength); - prepOutLength = usprep_prepare(prep, src, srcLength, prepOut, prepOutLength, prepOptions, &parseError, &prepStatus); + prepOutLength = usprep_prepare(prep.getAlias(), src, srcLength, prepOut, prepOutLength, prepOptions, &parseError, &prepStatus); } if(UnicodeString(transOut,transOutLength)!= UnicodeString(prepOut, prepOutLength)){ @@ -615,7 +445,6 @@ void TestIDNA::debug(const UChar* src, int32_t srcLength, int32_t options){ free(transOut); free(prepOut); delete trans; - } void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* testName, @@ -658,9 +487,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } if(status != expectedStatus){ - errln( "Did not get the expected error for"+ + errcheckln(status, "Did not get the expected error for "+ UnicodeString(testName)+ - "null terminated source. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " null terminated source. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -692,9 +521,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } //testing query string if(status != expectedStatus && expectedStatus != U_IDNA_UNASSIGNED_ERROR){ - errln( "Did not get the expected error for"+ + errln( "Did not get the expected error for "+ UnicodeString(testName)+ - "null terminated source with options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " null terminated source with options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -720,9 +549,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } if(status != expectedStatus){ - errln( "Did not get the expected error for"+ + errln( "Did not get the expected error for "+ UnicodeString(testName)+ - "with source length. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " with source length. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -747,9 +576,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } //testing query string if(status != expectedStatus && expectedStatus != U_IDNA_UNASSIGNED_ERROR){ - errln( "Did not get the expected error for"+ + errln( "Did not get the expected error for "+ UnicodeString(testName)+ - "with source length and options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " with source length and options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -776,9 +605,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } //testing query string if(status != expectedStatus){ - errln( "Did not get the expected error for"+ + errln( "Did not get the expected error for "+ UnicodeString(testName)+ - "null terminated source with options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " null terminated source with options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -803,9 +632,9 @@ void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* test } //testing query string if(status != expectedStatus && expectedStatus != U_IDNA_UNASSIGNED_ERROR){ - errln( "Did not get the expected error for"+ + errln( "Did not get the expected error for "+ UnicodeString(testName)+ - "with source length and options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " with source length and options set. Expected: " +UnicodeString(u_errorName(expectedStatus)) + " Got: "+ UnicodeString(u_errorName(status)) + " Source: " + prettify(UnicodeString(src)) ); @@ -826,7 +655,7 @@ void TestIDNA::testCompare(const UChar* s1, int32_t s1Len, errln("Did not get the expected result for %s with null termniated strings.\n",testName); } if(U_FAILURE(status)){ - errln( "%s null terminated source failed. Error: %s\n", testName,u_errorName(status)); + errcheckln(status, "%s null terminated source failed. Error: %s", testName,u_errorName(status)); } status = U_ZERO_ERROR; @@ -836,7 +665,7 @@ void TestIDNA::testCompare(const UChar* s1, int32_t s1Len, errln("Did not get the expected result for %s with null termniated strings with options set.\n", testName); } if(U_FAILURE(status)){ - errln( "%s null terminated source and options set failed. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s null terminated source and options set failed. Error: %s",testName, u_errorName(status)); } status = U_ZERO_ERROR; @@ -846,7 +675,7 @@ void TestIDNA::testCompare(const UChar* s1, int32_t s1Len, errln("Did not get the expected result for %s with string length.\n",testName); } if(U_FAILURE(status)){ - errln( "%s with string length. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s with string length. Error: %s",testName, u_errorName(status)); } status = U_ZERO_ERROR; @@ -856,7 +685,7 @@ void TestIDNA::testCompare(const UChar* s1, int32_t s1Len, errln("Did not get the expected result for %s with string length and options set.\n",testName); } if(U_FAILURE(status)){ - errln( "%s with string length and options set. Error: %s\n", u_errorName(status), testName); + errcheckln(status, "%s with string length and options set. Error: %s", u_errorName(status), testName); } } @@ -896,7 +725,7 @@ void TestIDNA::testIDNToUnicode(const char* testName, TestFunc func){ bufLen = u_unescape(domainNames[i],buf, bufLen+1); func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status); if(U_FAILURE(status)){ - errln( "%s failed to convert domainNames[%i].Error: %s \n",testName, i, u_errorName(status)); + errcheckln(status, "%s failed to convert domainNames[%i].Error: %s",testName, i, u_errorName(status)); break; } testAPI(buf,expected,testName,FALSE,U_ZERO_ERROR, TRUE, TRUE, func); @@ -922,7 +751,7 @@ void TestIDNA::testIDNToASCII(const char* testName, TestFunc func){ bufLen = u_unescape(domainNames[i],buf, bufLen+1); func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status); if(U_FAILURE(status)){ - errln( "%s failed to convert domainNames[%i].Error: %s \n",testName,i, u_errorName(status)); + errcheckln(status, "%s failed to convert domainNames[%i].Error: %s",testName,i, u_errorName(status)); break; } testAPI(buf,expected,testName, FALSE,U_ZERO_ERROR, TRUE, TRUE, func); @@ -985,18 +814,14 @@ void TestIDNA::testCompare(const char* testName, CompareFunc func){ // c) compare it with unicodeIn not equivalent if(i==0){ testCompare(src,srcLen,uni1.getBuffer(),uni1.length()-1,testName, func,FALSE); - uni1.releaseBuffer(); }else{ testCompare(src,srcLen,uni0.getBuffer(),uni0.length()-1,testName, func,FALSE); - uni0.releaseBuffer(); } // d) compare it with asciiIn not equivalent if(i==0){ testCompare(src,srcLen,ascii1.getBuffer(),ascii1.length()-1,testName, func,FALSE); - ascii1.releaseBuffer(); }else{ testCompare(src,srcLen,ascii0.getBuffer(),ascii0.length()-1,testName, func,FALSE); - ascii0.releaseBuffer(); } } @@ -1107,7 +932,7 @@ void TestIDNA::testErrorCases(const char* IDNToASCIIName, TestFunc IDNToASCII, } } - +/* void TestIDNA::testConformance(const char* toASCIIName, TestFunc toASCII, const char* IDNToASCIIName, TestFunc IDNToASCII, const char* IDNToUnicodeName, TestFunc IDNToUnicode, @@ -1162,10 +987,10 @@ void TestIDNA::testConformance(const char* toASCIIName, TestFunc toASCII, } } - +*/ // test and ascertain // func(func(func(src))) == func(src) -void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testName, +void TestIDNA::testChaining(const UChar* src,int32_t numIterations,const char* testName, UBool useSTD3ASCIIRules, UBool caseInsensitive, TestFunc func){ UChar even[MAX_DEST_SIZE]; UChar odd[MAX_DEST_SIZE]; @@ -1179,7 +1004,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam // test null-terminated source expectedLen = func(src,-1,expected,MAX_DEST_SIZE, options, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source failed. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s null terminated source failed. Error: %s",testName, u_errorName(status)); } memcpy(odd,expected,(expectedLen+1) * U_SIZEOF_UCHAR); memcpy(even,expected,(expectedLen+1) * U_SIZEOF_UCHAR); @@ -1187,7 +1012,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam if((i%2) ==0){ evenLen = func(odd,-1,even,MAX_DEST_SIZE,options, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source failed\n",testName); + errcheckln(status, "%s null terminated source failed - %s",testName, u_errorName(status)); break; } }else{ @@ -1216,7 +1041,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam status = U_ZERO_ERROR; expectedLen = func(src,-1,expected,MAX_DEST_SIZE,options|UIDNA_ALLOW_UNASSIGNED, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source with options set failed. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s null terminated source with options set failed. Error: %s",testName, u_errorName(status)); } memcpy(odd,expected,(expectedLen+1) * U_SIZEOF_UCHAR); memcpy(even,expected,(expectedLen+1) * U_SIZEOF_UCHAR); @@ -1224,7 +1049,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam if((i%2) ==0){ evenLen = func(odd,-1,even,MAX_DEST_SIZE,options|UIDNA_ALLOW_UNASSIGNED, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source with options set failed\n",testName); + errcheckln(status, "%s null terminated source with options set failed - %s",testName, u_errorName(status)); break; } }else{ @@ -1254,7 +1079,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam status = U_ZERO_ERROR; expectedLen = func(src,srcLen,expected,MAX_DEST_SIZE,options, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source failed. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s null terminated source failed. Error: %s",testName, u_errorName(status)); } memcpy(odd,expected,(expectedLen+1) * U_SIZEOF_UCHAR); memcpy(even,expected,(expectedLen+1) * U_SIZEOF_UCHAR); @@ -1262,13 +1087,13 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam if((i%2) ==0){ evenLen = func(odd,oddLen,even,MAX_DEST_SIZE,options, &parseError, &status); if(U_FAILURE(status)){ - errln("%s source with source length failed\n",testName); + errcheckln(status, "%s source with source length failed - %s",testName, u_errorName(status)); break; } }else{ oddLen = func(even,evenLen,odd,MAX_DEST_SIZE,options, &parseError, &status); if(U_FAILURE(status)){ - errln("%s source with source length failed\n",testName); + errcheckln(status, "%s source with source length failed - %s",testName, u_errorName(status)); break; } } @@ -1289,7 +1114,7 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam status = U_ZERO_ERROR; expectedLen = func(src,srcLen,expected,MAX_DEST_SIZE,options|UIDNA_ALLOW_UNASSIGNED, &parseError, &status); if(U_FAILURE(status)){ - errln("%s null terminated source with options set failed. Error: %s\n",testName, u_errorName(status)); + errcheckln(status, "%s null terminated source with options set failed. Error: %s",testName, u_errorName(status)); } memcpy(odd,expected,(expectedLen+1) * U_SIZEOF_UCHAR); memcpy(even,expected,(expectedLen+1) * U_SIZEOF_UCHAR); @@ -1297,13 +1122,13 @@ void TestIDNA::testChaining(UChar* src,int32_t numIterations,const char* testNam if((i%2) ==0){ evenLen = func(odd,oddLen,even,MAX_DEST_SIZE,options|UIDNA_ALLOW_UNASSIGNED, &parseError, &status); if(U_FAILURE(status)){ - errln("%s source with source length and options set failed\n",testName); + errcheckln(status, "%s source with source length and options set failed - %s",testName, u_errorName(status)); break; } }else{ oddLen = func(even,evenLen,odd,MAX_DEST_SIZE,options|UIDNA_ALLOW_UNASSIGNED, &parseError, &status); if(U_FAILURE(status)){ - errln("%s source with source length and options set failed\n",testName); + errcheckln(status, "%s source with source length and options set failed - %s",testName, u_errorName(status)); break; } } @@ -1395,18 +1220,14 @@ void TestIDNA::testRootLabelSeparator(const char* testName, CompareFunc func, // c) compare it with unicodeIn not equivalent if(i==0){ testCompare(src,srcLen,uni1.getBuffer(),uni1.length()-1,testName, func,FALSE); - uni1.releaseBuffer(); }else{ testCompare(src,srcLen,uni0.getBuffer(),uni0.length()-1,testName, func,FALSE); - uni0.releaseBuffer(); } // d) compare it with asciiIn not equivalent if(i==0){ testCompare(src,srcLen,ascii1.getBuffer(),ascii1.length()-1,testName, func,FALSE); - ascii1.releaseBuffer(); }else{ testCompare(src,srcLen,ascii0.getBuffer(),ascii0.length()-1,testName, func,FALSE); - ascii0.releaseBuffer(); } } } @@ -1415,7 +1236,9 @@ void TestIDNA::testRootLabelSeparator(const char* testName, CompareFunc func, // runIndexedTest //--------------------------------------------- -void TestIDNA::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ ) +extern IntlTest *createUTS46Test(); + +void TestIDNA::runIndexedTest( int32_t index, UBool exec, const char* &name, char* par) { if (exec) logln((UnicodeString)"TestSuite IDNA API "); switch (index) { @@ -1430,9 +1253,30 @@ void TestIDNA::runIndexedTest( int32_t index, UBool exec, const char* &name, cha case 7: name = "TestRootLabelSeparator"; if(exec) TestRootLabelSeparator(); break; case 8: name = "TestCompareReferenceImpl"; if(exec) TestCompareReferenceImpl(); break; case 9: name = "TestDataFile"; if(exec) TestDataFile(); break; +#if !UCONFIG_NO_FILE_IO && !UCONFIG_NO_LEGACY_CONVERSION case 10: name = "TestRefIDNA"; if(exec) TestRefIDNA(); break; case 11: name = "TestIDNAMonkeyTest"; if(exec) TestIDNAMonkeyTest(); break; - case 12: name = "TestConformance"; if(exec) TestConformance();break; +#else + case 10: case 11: name = "skip"; break; +#endif + case 12: + { + name = "TestConformanceTestVectors"; + if(exec){ + logln("TestSuite IDNA conf----"); logln(); + IdnaConfTest test; + callTest(test, par); + } + break; + } + case 13: + name = "UTS46Test"; + if (exec) { + logln("TestSuite UTS46Test---"); logln(); + LocalPointer test(createUTS46Test()); + callTest(*test, par); + } + break; default: name = ""; break; /*needed to end loop*/ } } @@ -1464,10 +1308,7 @@ void TestIDNA::TestRootLabelSeparator(){ void TestIDNA::TestChaining(){ testChaining("uidna_toASCII",uidna_toASCII, "uidna_toUnicode", uidna_toUnicode); } -void TestIDNA::TestConformance(){ - testConformance("uidna_toASCII",uidna_toASCII,"uidna_IDNToASCII",uidna_IDNToASCII, - "uidna_IDNToUnicode",uidna_IDNToUnicode, "uidna_toUnicode", uidna_toUnicode); -} + static const int loopCount = 100; static const int maxCharCount = 20; @@ -1551,7 +1392,6 @@ UnicodeString TestIDNA::testCompareReferenceImpl(UnicodeString& src, + " Got: " + UnicodeString(u_errorName(gotStatus)) + " for Source: "+ prettify(srcUChars) + " Options: " + options); - src.releaseBuffer(); return UnicodeString(""); } @@ -1566,7 +1406,6 @@ UnicodeString TestIDNA::testCompareReferenceImpl(UnicodeString& src, + " for Source: "+ prettify(srcUChars) + " Options: " + options); } - src.releaseBuffer(); return UnicodeString(exp, expLen); }else{ @@ -1575,7 +1414,6 @@ UnicodeString TestIDNA::testCompareReferenceImpl(UnicodeString& src, + " with "+ UnicodeString(uIDNAName) +" for input: " + prettify(srcUChars)); } - src.releaseBuffer(); return UnicodeString(""); } @@ -1635,7 +1473,11 @@ void TestIDNA::TestIDNAMonkeyTest(){ int i; getInstance(status); // Init prep - + if (U_FAILURE(status)) { + dataerrln("Test could not initialize. Got %s", u_errorName(status)); + return; + } + for(i=0; i 0x1FFFF){ + // data even OK? + { + UErrorCode dataStatus = U_ZERO_ERROR; + loadTestData(dataStatus); + if(U_FAILURE(dataStatus)) { + dataerrln("Couldn't load test data: %s\n", u_errorName(dataStatus)); // save us from thousands and thousands of errors + return; + } + } + + for (int32_t i = 0; i <= 0x10FFFF; i++){ + if (quick == TRUE && i > 0x0FFF){ return; } - if(i >= 0x30000 && i <= 0xF0000){ - i+=0xB0000; + if(i == 0x30000){ + // jump to E0000, no characters assigned in plain 3 to plain 13 as of Unicode 6.0 + i = 0xE0000; } - if(i>0xFFFF){ - src[0] = U16_LEAD(i); - src[1] = U16_TRAIL(i); - srcLen =2; - }else{ + if (i > 0xFFFF){ + src[0] = U16_LEAD(i); + src[1] = U16_TRAIL(i); + srcLen =2; + } else { src[0] = (UChar)i; src[1] = 0; srcLen = 1; @@ -1714,6 +1556,15 @@ void TestIDNA::TestCompareReferenceImpl(){ } void TestIDNA::TestRefIDNA(){ + UErrorCode status = U_ZERO_ERROR; + getInstance(status); // Init prep + if (U_FAILURE(status)) { + if (status == U_FILE_ACCESS_ERROR) { + dataerrln("Test could not initialize. Got %s", u_errorName(status)); + } + return; + } + testToASCII("idnaref_toASCII", idnaref_toASCII); testToUnicode("idnaref_toUnicode", idnaref_toUnicode); testIDNToASCII("idnaref_IDNToASCII", idnaref_IDNToASCII); @@ -1730,6 +1581,7 @@ void TestIDNA::TestRefIDNA(){ testChaining("idnaref_toASCII",idnaref_toASCII, "idnaref_toUnicode", idnaref_toUnicode); } + void TestIDNA::TestDataFile(){ testData(*this); }