/*
*******************************************************************************
*
- * Copyright (C) 2003-2004, International Business Machines
+ * Copyright (C) 2003-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
#include <limits.h>
#include <stdlib.h>
#include <string.h>
+#include "unicode/localpointer.h"
#include "unicode/ustring.h"
#include "unicode/usprep.h"
#include "unicode/uniset.h"
#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
0x043e, 0x0440, 0x044f, 0x0442, 0x043f, 0x043e, 0x0440, 0x0443,
0x0441, 0x0441, 0x043a, 0x0438
},
+ {
+ 0xFB00, 0xFB01
+ }
};
"xn--hxargifdar", // Greek
"xn--bonusaa-5bb1da", // Maltese
"xn--b1abfaaepdrnnbgefbadotcwatmq2g4l", // Russian (Cyrillic)
+ "fffi"
};
static const char *domainNames[] = {
typedef struct ErrorCases ErrorCases;
-static struct ErrorCases{
+static const struct ErrorCases{
UChar unicode[100];
const char *ascii;
},
"www.XN--8mb5595fsoa28orucya378bqre2tcwop06c5qbw82a1rffmae0361dea96b.com",
U_IDNA_PROHIBITED_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
"www.XN--6lA2Bz548Fj1GuA391Bf1Gb1N59Ab29A7iA.com",
U_IDNA_UNASSIGNED_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
{
},
"www.xn--ghBGI4851OiyA33VqrD6Az86C4qF83CtRv93D5xBk15AzfG0nAgA0578DeA71C.com",
U_IDNA_CHECK_BIDI_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
{
},
"www.xn----b95Ew8SqA315Ao5FbuMlnNmhA.com",
U_IDNA_STD3_ASCII_RULES_ERROR,
- TRUE, TRUE, FALSE
+ TRUE, FALSE, FALSE
},
{
{
},
"www.xn--989AoMsVi5E83Db1D2A355Cv1E0vAk1DwRv93D5xBh15A0Dt30A5JpSD879Ccm6FeA98C.com",
U_IDNA_LABEL_TOO_LONG_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
},
"www.xn--01-tvdmo.com",
U_IDNA_CHECK_BIDI_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
},
"www.XN--ghbgi278xia.com",
U_IDNA_PROHIBITED_ERROR,
- FALSE, TRUE, TRUE
+ FALSE, FALSE, TRUE
},
{
{
},
"www.-abcde.com",
U_IDNA_STD3_ASCII_RULES_ERROR,
- TRUE, TRUE, FALSE
+ TRUE, FALSE, FALSE
},
{
{
},
"www.abcde-.com",
U_IDNA_STD3_ASCII_RULES_ERROR,
- TRUE, TRUE, FALSE
+ TRUE, FALSE, FALSE
},
{
{
},
"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},
};
-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
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;
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)){
free(transOut);
free(prepOut);
delete trans;
-
}
void TestIDNA::testAPI(const UChar* src, const UChar* expected, const char* testName,
}
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))
);
}
//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))
);
}
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))
);
}
//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))
);
}
//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))
);
}
//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))
);
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;
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;
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;
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);
}
}
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);
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);
// 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();
}
}
}
}
-
+/*
void TestIDNA::testConformance(const char* toASCIIName, TestFunc toASCII,
const char* IDNToASCIIName, TestFunc IDNToASCII,
const char* IDNToUnicodeName, TestFunc IDNToUnicode,
}
}
-
+*/
// 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];
// 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);
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{
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);
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{
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);
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;
}
}
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);
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;
}
}
// 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();
}
}
}
// 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) {
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<IntlTest> test(createUTS46Test());
+ callTest(*test, par);
+ }
+ break;
default: name = ""; break; /*needed to end loop*/
}
}
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;
+ " Got: " + UnicodeString(u_errorName(gotStatus))
+ " for Source: "+ prettify(srcUChars)
+ " Options: " + options);
- src.releaseBuffer();
return UnicodeString("");
}
+ " for Source: "+ prettify(srcUChars)
+ " Options: " + options);
}
- src.releaseBuffer();
return UnicodeString(exp, expLen);
}else{
+ " with "+ UnicodeString(uIDNAName)
+" for input: " + prettify(srcUChars));
}
- src.releaseBuffer();
return UnicodeString("");
}
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<loopCount; i++){
source.truncate(0);
getTestSource(source);
const UChar* src = source.getBuffer();
testCompareReferenceImpl(src,source.length()-1);
testCompareReferenceImpl(src,source.length()-1);
- source.releaseBuffer();
}
/* for debugging */
for (i=0; i<(int)(sizeof(failures)/sizeof(failures[0])); i++){
source.truncate(0);
- source.append( failures[i] );
+ source.append( UnicodeString(failures[i], -1, US_INV) );
source = source.unescape();
source.append((UChar)0x0000);
const UChar *src = source.getBuffer();
testCompareReferenceImpl(src,source.length()-1);
//debug(source.getBuffer(),source.length(),UIDNA_ALLOW_UNASSIGNED);
- source.releaseBuffer();
}
source.truncate(0);
- source.append("\\uCF18\\U00021161\\U000EEF11\\U0002BB82\\U0001D63C");
+ source.append(UNICODE_STRING_SIMPLE("\\uCF18\\U00021161\\U000EEF11\\U0002BB82\\U0001D63C"));
debug(source.getBuffer(),source.length(),UIDNA_ALLOW_UNASSIGNED);
- source.releaseBuffer();
{ // test deletion of code points
- UnicodeString source("\\u043f\\u00AD\\u034f\\u043e\\u0447\\u0435\\u043c\\u0443\\u0436\\u0435\\u043e\\u043d\\u0438\\u043d\\u0435\\u0433\\u043e\\u0432\\u043e\\u0440\\u044f\\u0442\\u043f\\u043e\\u0440\\u0443\\u0441\\u0441\\u043a\\u0438\\u0000");
+ UnicodeString source("\\u043f\\u00AD\\u034f\\u043e\\u0447\\u0435\\u043c\\u0443\\u0436\\u0435\\u043e\\u043d\\u0438\\u043d\\u0435\\u0433\\u043e\\u0432\\u043e\\u0440\\u044f\\u0442\\u043f\\u043e\\u0440\\u0443\\u0441\\u0441\\u043a\\u0438\\u0000", -1, US_INV);
source = source.unescape();
- UnicodeString expected("\\u043f\\u043e\\u0447\\u0435\\u043c\\u0443\\u0436\\u0435\\u043e\\u043d\\u0438\\u043d\\u0435\\u0433\\u043e\\u0432\\u043e\\u0440\\u044f\\u0442\\u043f\\u043e\\u0440\\u0443\\u0441\\u0441\\u043a\\u0438\\u0000");
+ UnicodeString expected("\\u043f\\u043e\\u0447\\u0435\\u043c\\u0443\\u0436\\u0435\\u043e\\u043d\\u0438\\u043d\\u0435\\u0433\\u043e\\u0432\\u043e\\u0440\\u044f\\u0442\\u043f\\u043e\\u0440\\u0443\\u0441\\u0441\\u043a\\u0438\\u0000", -1, US_INV);
expected = expected.unescape();
UnicodeString ascii("xn--b1abfaaepdrnnbgefbadotcwatmq2g4l");
ascii.append((UChar)0x0000);
testAPI(source.getBuffer(),ascii.getBuffer(), "uidna_toASCII", FALSE, U_ZERO_ERROR, TRUE, TRUE, uidna_toASCII);
- source.releaseBuffer();
- ascii.releaseBuffer();
testAPI(source.getBuffer(),ascii.getBuffer(), "idnaref_toASCII", FALSE, U_ZERO_ERROR, TRUE, TRUE, idnaref_toASCII);
- source.releaseBuffer();
- ascii.releaseBuffer();
-
testCompareReferenceImpl(source.getBuffer(), source.length()-1);
- source.releaseBuffer();
-
}
}
void TestIDNA::TestCompareReferenceImpl(){
-
+
UChar src [2] = {0,0};
int32_t srcLen = 0;
-
- for(int32_t i = 0x40000 ; i< 0x10ffff; i++){
- if(quick==TRUE && i> 0x1FFFF){
+
+ 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;
}
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);
testChaining("idnaref_toASCII",idnaref_toASCII, "idnaref_toUnicode", idnaref_toUnicode);
}
+
void TestIDNA::TestDataFile(){
testData(*this);
}
projects / apple / icu.git / blobdiff