ICU-551.51.4.tar.gz

[apple/icu.git] / icuSources / test / intltest / idnaconf.cpp

diff --git a/icuSources/test/intltest/idnaconf.cpp b/icuSources/test/intltest/idnaconf.cpp
index cf1994384677440c8f9b34fbad4f11598ae1cd5b..54f94dfa92c3956636e5123b1cd5627c67b75089 100644 (file)
--- a/icuSources/test/intltest/idnaconf.cpp
+++ b/icuSources/test/intltest/idnaconf.cpp
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
  *
 /*
  *******************************************************************************
  *

- *   Copyright (C) 2005-2006, International Business Machines
+ *   Copyright (C) 2005-2014, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  *******************************************************************************


@@ -25,7 +25,6 @@
 static const UChar C_TAG[] = {0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0}; // =====
 static const UChar C_NAMEZONE[] = {0x6E, 0x61, 0x6D, 0x65, 0x7A, 0x6F, 0x6E, 0x65, 0}; // namezone 
 static const UChar C_NAMEBASE[] = {0x6E, 0x61, 0x6D, 0x65, 0x62, 0x61, 0x73, 0x65, 0}; // namebase 
 static const UChar C_TAG[] = {0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0}; // =====
 static const UChar C_NAMEZONE[] = {0x6E, 0x61, 0x6D, 0x65, 0x7A, 0x6F, 0x6E, 0x65, 0}; // namezone 
 static const UChar C_NAMEBASE[] = {0x6E, 0x61, 0x6D, 0x65, 0x62, 0x61, 0x73, 0x65, 0}; // namebase 

-static const UChar C_NAMEUTF8[] = {0x6E, 0x61, 0x6D, 0x65, 0x75, 0x74, 0x66, 0x38, 0}; // nameutf8 

 
 static const UChar C_TYPE[] = {0x74, 0x79, 0x70, 0x65, 0}; // type
 static const UChar C_TOASCII[]  =  {0x74, 0x6F, 0x61, 0x73, 0x63, 0x69, 0x69, 0};       // toascii
 
 static const UChar C_TYPE[] = {0x74, 0x79, 0x70, 0x65, 0}; // type
 static const UChar C_TOASCII[]  =  {0x74, 0x6F, 0x61, 0x73, 0x63, 0x69, 0x69, 0};       // toascii


@@ -80,7 +79,7 @@ UBool IdnaConfTest::ReadAndConvertFile(){
     delete [] absolute_name;
 
     if (f == NULL){
     delete [] absolute_name;
 
     if (f == NULL){

-        errln("fopen error on %s", name);
+        dataerrln("fopen error on %s", name);

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -241,8 +240,9 @@ void IdnaConfTest::Call(){
         }
         if (passfail == 0){
             if (U_FAILURE(status)){
         }
         if (passfail == 0){
             if (U_FAILURE(status)){

-                id.append(" should pass, but failed.");
-                errln(id);
+                id.append(" should pass, but failed. - ");
+                id.append(u_errorName(status));
+                errcheckln(status, id);

             } else{
                 if (namezone.compare(result, -1) == 0){
                     // expected
             } else{
                 if (namezone.compare(result, -1) == 0){
                     // expected