ICU-4475 tests for JB

X-SVN-Rev: 17561

icu4c/source/test/cintltst/idnatest.c

@@ -34,6 +34,8 @@ static void TestIDNToUnicode(void);
 static void TestIDNToASCII(void);
 static void TestCompare(void);
 static void TestUnicode32Norm(void);
+static void TestJB4490(void);
+static void TestJB4475(void); 
 
 void addIDNATest(TestNode** root);
 
@@ -59,6 +61,8 @@ addIDNATest(TestNode** root)
    addTest(root, &TestIDNToASCII,   "idna/TestIDNToASCII");
    addTest(root, &TestCompare,      "idna/TestCompare");
    addTest(root, &TestUnicode32Norm,"idna/TestUnicode32Norm");
+   addTest(root, &TestJB4490,        "idna/TestJB4490");
+   addTest(root, &TestJB4475,       "idna/TestJB4475");
 }
 
 static void
@@ -331,8 +335,10 @@ static UChar unicodeIn[][41] ={
         0x043e, 0x043d, 0x0438, 0x043d, 0x0435, 0x0433, 0x043e, 0x0432,
         0x043e, 0x0440, 0x044f, 0x0442, 0x043f, 0x043e, 0x0440, 0x0443,
         0x0441, 0x0441, 0x043a, 0x0438
+    },
+    {
+        0x0054,0x0045,0x0053,0x0054
     }
-
 };
 
 static const char *asciiIn[] = {
@@ -358,7 +364,8 @@ static const char *asciiIn[] = {
     "XN--db8CBHEJLGH4E0AL",
     "xn--hxargifdar",                       /* Greek */
     "xn--bonusaa-5bb1da",                   /* Maltese */
-    "xn--b1abfaaepdrnnbgefbadotcwatmq2g4l", /* Russian (Cyrillic)*/
+    "xn--b1abfaaepdrnnbgefbadotcwatmq2g4l",  /* Russian (Cyrillic)*/
+    "TEST"
 
 };
 
@@ -410,7 +417,7 @@ static const char *domainNames[] = {
     /*"\\u00CF\\u0082.com",*/
     /*"\\u00CE\\u00B2\\u00C3\\u009Fss.com",*/
     /*"\\u00E2\\u0098\\u00BA.com",*/
-    "\\u00C3\\u00BC.com",
+    "\\u00C3\\u00BC.com"
 
 };
 
@@ -654,6 +661,63 @@ static void TestUnicode32Norm() {
     }
 }
 
+static void TestJB4490(){
+    static const UChar data[][50]= {
+        {0x00F5,0x00dE,0x00dF,0x00dD, 0x0000},
+        {0xFB00,0xFB01}
+    };
+    UChar output1[40] = {0};
+    UChar output2[40] = {0};
+    int32_t i;
+    for(i=0; i< sizeof(data)/sizeof(data[0]); i++){
+        const UChar* src1 = data[i];
+        int32_t src1Len = u_strlen(src1);
+        UChar* dest1 = output1;
+        int32_t dest1Len = 40;
+        UErrorCode status = U_ZERO_ERROR;
+        UParseError ps;
+        UChar* src2 = NULL;
+        int32_t src2Len = 0;
+        UChar* dest2 = output2;
+        int32_t dest2Len = 40;
+        dest1Len = uidna_toASCII(src1, src1Len, dest1, dest1Len,UIDNA_DEFAULT, &ps, &status);
+        if(U_FAILURE(status)){
+            log_err("uidna_toUnicode failed with error %s.\n", u_errorName(status));
+        }
+        src2 = dest1;
+        src2Len = dest1Len;
+        dest2Len = uidna_toUnicode(src2, src2Len, dest2, dest2Len, UIDNA_DEFAULT, &ps, &status);
+        if(U_FAILURE(status)){
+            log_err("uidna_toUnicode failed with error %s.\n", u_errorName(status));
+        }
+    }
+}
+
+static void TestJB4475(){
+    
+    static const UChar input[][10] = {
+        {0x0054,0x0045,0x0053,0x0054,0x0000},/* TEST */
+        {0x0074,0x0065,0x0073,0x0074,0x0000} /* test */
+    };
+    int i;
+    UChar output[40] = {0};
+    for(i=0; i< sizeof(input)/sizeof(input[0]); i++){
+        const UChar* src = input[i];
+        int32_t srcLen = u_strlen(src);
+        UChar* dest = output;
+        int32_t destLen = 40;
+        UErrorCode status = U_ZERO_ERROR;
+        UParseError ps;
+
+        destLen = uidna_toASCII(src, srcLen, dest, destLen,UIDNA_DEFAULT, &ps, &status);
+        if(U_FAILURE(status)){
+            log_err("uidna_toASCII failed with error %s.\n", u_errorName(status));
+        } 
+        if(u_strncmp(input[i], dest, srcLen)!=0){
+            log_err("uidna_toASCII did not return the expected output.\n");
+        }
+    }
+}
 #endif
 
 /*

icu4c/source/test/intltest/idnaref.cpp

@@ -258,7 +258,7 @@ idnaref_toASCII(const UChar* src, int32_t srcLength,
     UChar b1Stack[MAX_LABEL_BUFFER_SIZE], b2Stack[MAX_LABEL_BUFFER_SIZE];
     //initialize pointers to stack buffers
     UChar  *b1 = b1Stack, *b2 = b2Stack;
-    int32_t b1Len, b2Len, 
+    int32_t b1Len=0, b2Len=0, 
             b1Capacity = MAX_LABEL_BUFFER_SIZE, 
             b2Capacity = MAX_LABEL_BUFFER_SIZE ,
             reqLength=0;
@@ -274,7 +274,18 @@ idnaref_toASCII(const UChar* src, int32_t srcLength,
     // assume the source contains all LDH codepoints
     UBool srcIsLDH = TRUE; 
     int32_t j=0;
-//    UParseError parseError;
+
+    if(srcLength == -1){
+        srcLength = u_strlen(src);
+    }
+
+    // step 1 
+    for( j=0;j<srcLength;j++){
+        if(src[j] > 0x7F){
+            srcIsASCII = FALSE;
+        }
+        b1[b1Len++] = src[j];
+    }
     // step 2
     NamePrepTransform* prep = TestIDNA::getInstance(*status);
 
@@ -302,9 +313,10 @@ idnaref_toASCII(const UChar* src, int32_t srcLength,
         goto CLEANUP;
     }
 
+    srcIsASCII = TRUE;
     // step 3 & 4
     for( j=0;j<b1Len;j++){
-        if(b1[j] > 0x7F){
+        if(b1[j] > 0x7F){// check if output of usprep_prepare is all ASCII 
             srcIsASCII = FALSE;
         }else if(prep->isLDHChar(b1[j])==FALSE){  // if the char is in ASCII range verify that it is an LDH character{
             srcIsLDH = FALSE;

icu4c/source/test/intltest/punyref.c

@@ -5,7 +5,7 @@
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
- *   file name:  nameprep.h
+ *   file name:  punyref.h
  *   encoding:   US-ASCII
  *   tab size:   8 (not used)
  *   indentation:4

icu4c/source/test/intltest/testidna.cpp

@@ -145,6 +145,9 @@ static UChar unicodeIn[][41] ={
         0x043e, 0x0440, 0x044f, 0x0442, 0x043f, 0x043e, 0x0440, 0x0443,
         0x0441, 0x0441, 0x043a, 0x0438
     },
+    {
+        0xFB00, 0xFB01
+    }
 
 };
 
@@ -172,6 +175,7 @@ static const char *asciiIn[] = {
     "xn--hxargifdar",                       // Greek
     "xn--bonusaa-5bb1da",                   // Maltese
     "xn--b1abfaaepdrnnbgefbadotcwatmq2g4l", // Russian (Cyrillic)
+    "fffi"
 };
 
 static const char *domainNames[] = {