ICU 56 update step 1

source/test/cintltst/nucnvtst.c

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************
 *
-* File CCONVTST.C
+* File nucnvtst.c
 *
 * Modification History:
 *        Name                     Description
 *    Steven R. Loomis     7/8/1999      Adding input buffer test
 ********************************************************************************
 */
 #include <stdio.h>
 #include "cstring.h"
 #include "unicode/uloc.h"
 #include "unicode/ucnv.h"
@@ skipping 1802 matching lines @@
         1, 0x21,
         2, 0x2b,
         7, 0x10401
     };
 
     const char *cnvName;
     const char *source=(const char *)in, *limit=(const char *)in+sizeof(in);
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("UTF-7", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a UTF-7 converter: %s\n", u_errorName(errorCode)); /* sholdn't be a data err */
+        log_data_err("Unable to open a UTF-7 converter: %s\n", u_errorName(errorCode));
         return;
     }
     TestNextUChar(cnv, source, limit, results, "UTF-7");
     /* Test the condition when source >= sourceLimit */
     TestNextUCharError(cnv, source, source, U_INDEX_OUTOFBOUNDS_ERROR, "sourceLimit <= source");
     cnvName = ucnv_getName(cnv, &errorCode);
     if (U_FAILURE(errorCode) || uprv_strcmp(cnvName, "UTF-7") != 0) {
         log_err("UTF-7 converter is called %s: %s\n", cnvName, u_errorName(errorCode));
     }
     ucnv_close(cnv);
@@ skipping 22 matching lines @@
         1, 0x21,
         2, 0x26,
         7, 0x10401
     };
 
     const char *cnvName;
     const char *source=(const char *)in, *limit=(const char *)in+sizeof(in);
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("IMAP-mailbox-name", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a IMAP-mailbox-name converter: %s\n", u_errorName(errorCode)); /* sholdn't be a data err */
+        log_data_err("Unable to open a IMAP-mailbox-name converter: %s\n", u_errorName(errorCode));
         return;
     }
     TestNextUChar(cnv, source, limit, results, "IMAP-mailbox-name");
     /* Test the condition when source >= sourceLimit */
     TestNextUCharError(cnv, source, source, U_INDEX_OUTOFBOUNDS_ERROR, "sourceLimit <= source");
     cnvName = ucnv_getName(cnv, &errorCode);
     if (U_FAILURE(errorCode) || uprv_strcmp(cnvName, "IMAP-mailbox-name") != 0) {
         log_err("IMAP-mailbox-name converter is called %s: %s\n", cnvName, u_errorName(errorCode));
     }
     ucnv_close(cnv);
@@ skipping 112 matching lines @@
         34, 0x62
     };
 
     UConverterToUCallback cb;
     const void *p;
 
     const char *source=(const char *)in,*limit=(const char *)in+sizeof(in);
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("CESU-8", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a CESU-8 converter: %s\n", u_errorName(errorCode));
+        log_data_err("Unable to open a CESU-8 converter: %s\n", u_errorName(errorCode));
         return;
     }
     TestNextUChar(cnv, source, limit, results, "CESU-8");
     /* Test the condition when source >= sourceLimit */
     TestNextUCharError(cnv, source, source, U_INDEX_OUTOFBOUNDS_ERROR, "sourceLimit <= source");
 
     /* test error behavior with a skip callback */
     ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_SKIP, NULL, &cb, &p, &errorCode);
     source=(const char *)in2;
     limit=(const char *)(in2+sizeof(in2));
@@ skipping 199 matching lines @@
         4, 0x100f00,
         4, 0xfffd, /* unmatched surrogate */
         4, 0xfffd  /* unmatched surrogate */
     };
 
     const char *source, *limit;
 
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("UTF-32", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a UTF-32 converter: %s\n", u_errorName(errorCode));
+        log_data_err("Unable to open a UTF-32 converter: %s\n", u_errorName(errorCode));
         return;
     }
 
     source=(const char *)in1, limit=(const char *)in1+sizeof(in1);
     TestNextUChar(cnv, source, limit, results1, "UTF-32");
 
     source=(const char *)in2, limit=(const char *)in2+sizeof(in2);
     ucnv_resetToUnicode(cnv);
     TestNextUChar(cnv, source, limit, results2, "UTF-32");
 
@@ skipping 55 matching lines @@
         4,  0x262
     };
 
     UConverterToUCallback cb;
     const void *p;
 
     const char *source=(const char *)in, *limit=(const char *)in+sizeof(in);
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("UTF-32BE", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a UTF-32BE converter: %s\n", u_errorName(errorCode));
+        log_data_err("Unable to open a UTF-32BE converter: %s\n", u_errorName(errorCode));
         return;
     }
     TestNextUChar(cnv, source, limit, results, "UTF-32BE");
 
     /* Test the condition when source >= sourceLimit */
     TestNextUCharError(cnv, source, source, U_INDEX_OUTOFBOUNDS_ERROR, "sourceLimit <= source");
 
     /* test error behavior with a skip callback */
     ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_SKIP, NULL, &cb, &p, &errorCode);
     source=(const char *)in2;
@@ skipping 50 matching lines @@
         4,  0x262,
     };
 
     UConverterToUCallback cb;
     const void *p;
 
     const char *source=(const char *)in, *limit=(const char *)in+sizeof(in);
     UErrorCode errorCode=U_ZERO_ERROR;
     UConverter *cnv=ucnv_open("UTF-32LE", &errorCode);
     if(U_FAILURE(errorCode)) {
-        log_err("Unable to open a UTF-32LE converter: %s\n", u_errorName(errorCode));
+        log_data_err("Unable to open a UTF-32LE converter: %s\n", u_errorName(errorCode));
         return;
     }
     TestNextUChar(cnv, source, limit, results, "UTF-32LE");
 
     /* Test the condition when source >= sourceLimit */
     TestNextUCharError(cnv, source, source, U_INDEX_OUTOFBOUNDS_ERROR, "sourceLimit <= source");
 
     /* test error behavior with a skip callback */
     ucnv_setToUCallBack(cnv, UCNV_TO_U_CALLBACK_SKIP, NULL, &cb, &p, &errorCode);
     source=(const char *)in2;
@@ skipping 3145 matching lines @@
     UErrorCode status = U_ZERO_ERROR;
     UConverter* conv = ucnv_open("iscii", &status);
     UChar dest[100] = {'\0'};
     UChar* target = dest;
     UChar* targetLimit = dest+100;
     const char* source = data;
     const char* sourceLimit = data+strlen(data);
     const UChar* exp = expected;
     ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, TRUE, &status);
     if(U_FAILURE(status)){
-        log_err("conversion failed: %s \n", u_errorName(status));
+        log_data_err("conversion failed: %s \n", u_errorName(status));
     }
     targetLimit = target;
     target = dest;
 
     printUSeq(target, targetLimit-target);
     
     while(target<targetLimit){
         if(*exp!=*target){
             log_err("did not get the expected output. \\u%04X != \\u%04X (got)\n", *exp, *target);
         }
@@ skipping 41 matching lines @@
             log_data_err("Error open converter: %s - %s \n", notFixedWidth[i], u_errorName(status));
             continue;
         }
 
         if (ucnv_isFixedWidth(cnv, &status)) {
             log_err("%s is NOT a fixedWidth converter but returned TRUE.\n", notFixedWidth[i]);
         }
         ucnv_close(cnv);
     }
 }