ICU 56 update step 1

source/test/cintltst/creststn.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 creststn.c
 *
 * Modification History:
 *        Name              Date               Description
 *   Madhu Katragadda    05/09/2000   Ported Tests for New ResourceBundle API
 *   Madhu Katragadda    05/24/2000   Added new tests to test RES_BINARY for collationElements
@@ skipping 250 matching lines @@
 
   /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_DEFAULT_WARNING;
   r = ures_open(NULL, "ti_ER", &status);
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
 
   /* we look up the resource which is aliased, but it lives in fallback */
 
   if(U_SUCCESS(status) && r != NULL) {
     status = U_USING_DEFAULT_WARNING;
-    r2 = ures_getByKey(r, "LocaleScript", NULL, &status);  /* LocaleScript lives in ti */
+    r2 = ures_getByKey(r, "ExemplarCharacters", NULL, &status);  /* ExemplarCharacters lives in ti */
     checkStatus(__LINE__, U_USING_FALLBACK_WARNING, status);
   }
   ures_close(r);
 
   /* this bundle should return zero error, so it shouldn't change the status */
   status = U_USING_DEFAULT_WARNING;
   r = ures_open(U_ICUDATA_REGION, "ti", &status);
   checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);
   ures_close(r);
 
@@ skipping 132 matching lines @@
         0x093E,0x0020,0x002E,0x0033,0x0939,0x092E,0x0020,0x002E,0x0033,0x0907,0x0938,0x0915,0x093E,0x0020,0x002E,0x0033,
         0x092F,0x0941,0x0915,0x094D,0x0924,0x093F,0x092A,0x0942,0x0930,0x094D,0x0923,0x0020,0x002E,0x0032,0x0935,0x093F,
         0x0938,0x094D,0x0924,0x093E,0x0930,0x0020,0x0905,0x092A,0x0947,0x0915,0x094D,0x0937,0x093F,0x0924,0x0020,0x0915,
         0x0930,0x0020,0x0938,0x0915,0x0947,0x0902,0x0917,0x0947,0x0020,0x003F,0x0020,
         0
     };
 
     /* pre-flight */
     int32_t num =0;
     const char *testdatapath = loadTestData(&error);
-    resB = ures_open(testdatapath, "iscii", &error);
+    resB = ures_open(testdatapath, "encoded", &error);
     srcFromRes=tres_getString(resB,-1,"str",&len,&error);
     if(U_FAILURE(error)){
-#if UCONFIG_NO_LEGACY_CONVERSION
-        log_info("Couldn't load iscii.bin from test data bundle, (because UCONFIG_NO_LEGACY_CONVERSION  is turned on)\n");
-#else
-        log_data_err("Could not find iscii.bin from test data bundle. Error: %s\n", u_errorName(error));
-#endif
+        log_data_err("Could not find encoded.res from test data bundle. Error: %s\n", u_errorName(error));
         ures_close(resB);
         return;
     }
     if(u_strncmp(srcFromRes,uSrc,len)!=0){
         log_err("Genrb produced res files after decoding failed\n");
     }
     while(num<len){
         if(uSrc[num]!=srcFromRes[num]){
             log_verbose(" Expected:  0x%04X Got: 0x%04X \n", uSrc[num],srcFromRes[num]);
         }
@@ skipping 1676 matching lines @@
     ures_close(fr_FR);
     /* Temporary hack err actually should be U_USING_FALLBACK_ERROR */
     /* Test Jitterbug 552 fallback mechanism of aliased data */
     {
         UErrorCode err =U_ZERO_ERROR;
         UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
         UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
         UResourceBundle* tResB;
         UResourceBundle* zoneResource;
         const UChar* version = NULL;
-        static const UChar versionStr[] = { 0x0032, 0x002E, 0x0031, 0x002E, 0x0036, 0x002E, 0x0036, 0x0039, 0x0000}; // 2.1.6.69
+        static const UChar versionStr[] = { 0x0032, 0x002E, 0x0031, 0x002E, 0x0031, 0x0039, 0x002E, 0x0031, 0x0034, 0x0000}; // 2.1.19.14
 
         if(err != U_ZERO_ERROR){
             log_data_err("Expected U_ZERO_ERROR when trying to test no_NO_NY aliased to nn_NO for Version err=%s\n",u_errorName(err));
             return;
         }
         version = tres_getString(resLocID, -1, NULL, &resultLen, &err);
         if(u_strcmp(version, versionStr) != 0){
             char x[100];
             char g[100];
             u_austrcpy(x, versionStr);
@@ skipping 64 matching lines @@
         log_data_err("err loading tb resource\n");
     }  else {
       /* testing aliasing to a non existing resource */
       tb = ures_getByKey(aliasB, "nonexisting", tb, &status);
       if(status != U_MISSING_RESOURCE_ERROR) {
         log_err("Managed to find an alias to non-existing resource\n");
       } else {
         status = U_ZERO_ERROR;
       }
       /* testing referencing/composed alias */
-      uk = ures_findResource("ja/LocaleScript/2", uk, &status);
+      uk = ures_findResource("ja/calendar/gregorian/DateTimePatterns/2", uk, &status);
       if((uk == NULL) || U_FAILURE(status)) {
-        log_err_status(status, "Couldn't findResource('ja/LocaleScript/2') err %s\n", u_errorName(status));
+        log_err_status(status, "Couldn't findResource('ja/calendar/gregorian/DateTimePatterns/2') err %s\n", u_errorName(status));
         goto cleanup;
       } 
       
       sequence = tres_getString(uk, -1, NULL, &seqLen, &status);
       
       tb = ures_getByKey(aliasB, "referencingalias", tb, &status);
       string = tres_getString(tb, -1, NULL, &strLen, &status);
       
       if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
         log_err("Referencing alias didn't get the right string (1)\n");
       }
       
       string = tres_getString(aliasB, -1, "referencingalias", &strLen, &status);
       if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
         log_err("Referencing alias didn't get the right string (2)\n");
       }
       
       checkStatus(__LINE__, U_ZERO_ERROR, status);
-      tb = ures_getByKey(aliasB, "LocaleScript", tb, &status);
+      tb = ures_getByKey(aliasB, "DateTimePatterns", tb, &status);
       checkStatus(__LINE__, U_ZERO_ERROR, status);
       tb = ures_getByIndex(tb, 2, tb, &status);
       checkStatus(__LINE__, U_ZERO_ERROR, status);
       string = tres_getString(tb, -1, NULL, &strLen, &status);
       checkStatus(__LINE__, U_ZERO_ERROR, status);
       
       if(U_FAILURE(status)) {
         log_err("%s trying to get string via separate getters\n", u_errorName(status));
       } else if(seqLen != strLen || u_strncmp(sequence, string, seqLen) != 0) {
         log_err("Referencing alias didn't get the right string (3)\n");
@@ skipping 155 matching lines @@
     if(U_FAILURE(status)) {
         log_data_err("Couldn't access indexed resource, error %s\n", u_errorName(status));
         status = U_ZERO_ERROR;
     } else {
         key = ures_getKey(t);
         if(key != NULL) {
             log_err("Got a strange key, expected NULL, got %s\n", key);
         }
     }
     
-    t = ures_findResource("ja/LocaleScript", t, &status);
+    t = ures_findResource("ja/ExemplarCharacters", t, &status);
     if(U_FAILURE(status)) {
         log_data_err("Couldn't access keyed resource, error %s\n", u_errorName(status));
         status = U_ZERO_ERROR;
     } else {
         key = ures_getKey(t);
-        if(strcmp(key, "LocaleScript")!=0) {
-            log_err("Got a strange key, expected 'LocaleScript', got %s\n", key);
+        if(strcmp(key, "ExemplarCharacters")!=0) {
+            log_err("Got a strange key, expected 'ExemplarCharacters', got %s\n", key);
         }
     }
     
     t2 = ures_open(U_ICUDATA_LANG, "sr", &status);
     if(U_FAILURE(status)) {
         log_err_status(status, "Couldn't open 'sr' resource bundle, error %s\n", u_errorName(status));
         log_data_err("No 'sr', no test - you have bigger problems than testing direct access. "
                      "You probably have no data! Aborting this test\n");
     }
     
@@ skipping 654 matching lines @@
   }
   u_versionToString(testCurrent,tmp);
   log_verbose("(data) CurrentCLDRVersion { %s }\n", tmp); 
   switch(memcmp(cldrVersion, testCurrent, sizeof(UVersionInfo))) {
     case 0: break; /* OK- current. */
     case -1: log_info("CLDR version is behind 'current' (for testdata/root.txt) %s. Some things may fail.\n", tmp); break;
     case 1: log_info("CLDR version is ahead of 'current' (for testdata/root.txt) %s. Some things may fail.\n", tmp); break;
   }
 
 }