ICU-400.38.tar.gz

[apple/icu.git] / icuSources / test / cintltst / crestst.c

diff --git a/icuSources/test/cintltst/crestst.c b/icuSources/test/cintltst/crestst.c
index dce4e10fd6a5ffdb5f72f3f355b7cad85704ae3a..64e5e1d112db94dc3aeccfcc92cf6c3ba8e26fff 100644 (file)
--- a/icuSources/test/cintltst/crestst.c
+++ b/icuSources/test/cintltst/crestst.c
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2005, International Business Machines Corporation and
+ * Copyright (c) 1997-2008, International Business Machines Corporation and

  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************
  * others. All Rights Reserved.
  ********************************************************************/
 /*******************************************************************************


@@ -119,7 +119,7 @@ void TestAliasConflict(void) {
         log_err("Failed to get resource with %s\n", myErrorName(status));
     }
     ures_close(iw);
         log_err("Failed to get resource with %s\n", myErrorName(status));
     }
     ures_close(iw);

-    result = ures_getStringByKey(he, "localPatternChars", &resultLen, &status);
+    result = ures_getStringByKey(he, "ExemplarCharacters", &resultLen, &status);

     if(U_FAILURE(status) || result == NULL) {
         log_err("Failed to get resource with %s\n", myErrorName(status));
     }
     if(U_FAILURE(status) || result == NULL) {
         log_err("Failed to get resource with %s\n", myErrorName(status));
     }


@@ -129,6 +129,13 @@ void TestAliasConflict(void) {
 
 void TestResourceBundles()
 {
 
 void TestResourceBundles()
 {

+    UErrorCode status = U_ZERO_ERROR;
+    loadTestData(&status);
+    if(U_FAILURE(status)) {
+        log_data_err("Could not load testdata.dat, status = %s\n", u_errorName(status));
+        return;
+    }
+

     testTag("only_in_Root", TRUE, FALSE, FALSE);
     testTag("in_Root_te", TRUE, TRUE, FALSE);
     testTag("in_Root_te_te_IN", TRUE, TRUE, TRUE);
     testTag("only_in_Root", TRUE, FALSE, FALSE);
     testTag("in_Root_te", TRUE, TRUE, FALSE);
     testTag("in_Root_te_te_IN", TRUE, TRUE, TRUE);


@@ -158,7 +165,7 @@ void TestConstruction1()
     testdatapath=loadTestData(&err);
     if(U_FAILURE(err))
     {
     testdatapath=loadTestData(&err);
     if(U_FAILURE(err))
     {

-        log_err("Could not load testdata.dat %s \n",myErrorName(err));
+        log_data_err("Could not load testdata.dat %s \n",myErrorName(err));

         return;
     }
 
         return;
     }
 


@@ -470,7 +477,7 @@ TestOpenDirect(void) {
     errorCode=U_ZERO_ERROR;
     idna_rules=ures_openDirect(loadTestData(&errorCode), "idna_rules", &errorCode);
     if(U_FAILURE(errorCode)) {
     errorCode=U_ZERO_ERROR;
     idna_rules=ures_openDirect(loadTestData(&errorCode), "idna_rules", &errorCode);
     if(U_FAILURE(errorCode)) {

-        log_err("ures_openDirect(\"idna_rules\") failed: %s\n", u_errorName(errorCode));
+        log_data_err("ures_openDirect(\"idna_rules\") failed: %s\n", u_errorName(errorCode));

         return;
     }
 
         return;
     }
 


@@ -523,7 +530,7 @@ TestOpenDirect(void) {
     errorCode = U_USING_FALLBACK_WARNING;;
     idna_rules=ures_openDirect("testdata", "idna_rules", &errorCode);
     if(U_FAILURE(errorCode)) {
     errorCode = U_USING_FALLBACK_WARNING;;
     idna_rules=ures_openDirect("testdata", "idna_rules", &errorCode);
     if(U_FAILURE(errorCode)) {

-        log_err("ures_openDirect(\"idna_rules\") failed when U_USING_FALLBACK_WARNING was set prior to call: %s\n", u_errorName(errorCode));
+        log_data_err("ures_openDirect(\"idna_rules\") failed when U_USING_FALLBACK_WARNING was set prior to call: %s\n", u_errorName(errorCode));

         return;
     }
     ures_close(idna_rules);
         return;
     }
     ures_close(idna_rules);


@@ -546,7 +553,7 @@ TestOpenDirect(void) {
     errorCode=U_ZERO_ERROR;
     casing=ures_open("testdata", "casing", &errorCode);
     if(U_FAILURE(errorCode)) {
     errorCode=U_ZERO_ERROR;
     casing=ures_open("testdata", "casing", &errorCode);
     if(U_FAILURE(errorCode)) {

-        log_err("ures_open(\"casing\") failed: %s\n", u_errorName(errorCode));
+        log_data_err("ures_open(\"casing\") failed: %s\n", u_errorName(errorCode));

         return;
     }
 
         return;
     }
 


@@ -573,7 +580,7 @@ TestOpenDirect(void) {
     errorCode=U_ZERO_ERROR;
     ne=ures_open("testdata", "ne", &errorCode);
     if(U_FAILURE(errorCode)) {
     errorCode=U_ZERO_ERROR;
     ne=ures_open("testdata", "ne", &errorCode);
     if(U_FAILURE(errorCode)) {

-        log_err("ures_open(\"ne\") failed (expected to get root): %s\n", u_errorName(errorCode));
+        log_data_err("ures_open(\"ne\") failed (expected to get root): %s\n", u_errorName(errorCode));

     }
     if(errorCode!=U_USING_DEFAULT_WARNING || 0!=uprv_strcmp("root", ures_getLocale(ne, &errorCode))) {
         log_err("ures_open(\"ne\") found something other than \"root\" - %s\n", u_errorName(errorCode));
     }
     if(errorCode!=U_USING_DEFAULT_WARNING || 0!=uprv_strcmp("root", ures_getLocale(ne, &errorCode))) {
         log_err("ures_open(\"ne\") found something other than \"root\" - %s\n", u_errorName(errorCode));


@@ -583,7 +590,7 @@ TestOpenDirect(void) {
     errorCode=U_ZERO_ERROR;
     ne=ures_openDirect("testdata", "ne", &errorCode);
     if(U_SUCCESS(errorCode)) {
     errorCode=U_ZERO_ERROR;
     ne=ures_openDirect("testdata", "ne", &errorCode);
     if(U_SUCCESS(errorCode)) {

-        log_err("ures_openDirect(\"ne\") succeeded unexpectedly\n");
+        log_data_err("ures_openDirect(\"ne\") succeeded unexpectedly\n");

         ures_close(ne);
     }
 
         ures_close(ne);
     }
 


@@ -591,7 +598,7 @@ TestOpenDirect(void) {
     errorCode=U_ZERO_ERROR;
     te_IN=ures_openDirect("testdata", "te_IN", &errorCode);
     if(U_FAILURE(errorCode)) {
     errorCode=U_ZERO_ERROR;
     te_IN=ures_openDirect("testdata", "te_IN", &errorCode);
     if(U_FAILURE(errorCode)) {

-        log_err("ures_open(\"te_IN\") failed: %s\n", u_errorName(errorCode));
+        log_data_err("ures_open(\"te_IN\") failed: %s\n", u_errorName(errorCode));

         return;
     }
     errorCode=U_ZERO_ERROR;
         return;
     }
     errorCode=U_ZERO_ERROR;


@@ -908,7 +915,7 @@ static void TestGetSize(void) {
     
     if(U_FAILURE(status))
     {
     
     if(U_FAILURE(status))
     {

-        log_err("Could not load testdata.dat %s\n", u_errorName(status));
+        log_data_err("Could not load testdata.dat %s\n", u_errorName(status));

         return;
     }
     
         return;
     }
     


@@ -966,7 +973,7 @@ static void TestGetLocaleByType(void) {
     
     if(U_FAILURE(status))
     {
     
     if(U_FAILURE(status))
     {

-        log_err("Could not load testdata.dat %s\n", u_errorName(status));
+        log_data_err("Could not load testdata.dat %s\n", u_errorName(status));

         return;
     }
     
         return;
     }