Update ICU to 54.1 step 1

source/test/intltest/bidiconf.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2009-2013, International Business Machines
+*   Copyright (C) 2009-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  bidiconf.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2009oct16
 *   created by: Markus W. Scherer
@@ skipping 17 matching lines @@
 public:
     BiDiConformanceTest() :
         directionBits(0), lineNumber(0), levelsCount(0), orderingCount(0),
         errorCount(0) {}
 
     void runIndexedTest(int32_t index, UBool exec, const char *&name, char *par=NULL);
 
     void TestBidiTest();
     void TestBidiCharacterTest();
 private:
-    char *getUnidataPath(char path[]);
-
     UBool parseLevels(const char *&start);
     UBool parseOrdering(const char *start);
     UBool parseInputStringFromBiDiClasses(const char *&start);
 
     UBool checkLevels(const UBiDiLevel actualLevels[], int32_t actualCount);
     UBool checkOrdering(UBiDi *ubidi);
 
     void printErrorLine();
 
     char line[10000];
@@ skipping 16 matching lines @@
 void BiDiConformanceTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) {
     if(exec) {
         logln("TestSuite BiDiConformanceTest: ");
     }
     TESTCASE_AUTO_BEGIN;
     TESTCASE_AUTO(TestBidiTest);
     TESTCASE_AUTO(TestBidiCharacterTest);
     TESTCASE_AUTO_END;
 }
 
-// TODO: Move to a common place (IntlTest?) to avoid duplication with UnicodeTest (ucdtest.cpp).
-char *BiDiConformanceTest::getUnidataPath(char path[]) {
-    IcuTestErrorCode errorCode(*this, "getUnidataPath");
-    const int kUnicodeDataTxtLength=15;  // strlen("UnicodeData.txt")
-
-    // Look inside ICU_DATA first.
-    strcpy(path, pathToDataDirectory());
-    strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
-    FILE *f=fopen(path, "r");
-    if(f!=NULL) {
-        fclose(f);
-        *(strchr(path, 0)-kUnicodeDataTxtLength)=0;  // Remove the basename.
-        return path;
-    }
-
-    // As a fallback, try to guess where the source data was located
-    // at the time ICU was built, and look there.
-#   ifdef U_TOPSRCDIR
-        strcpy(path, U_TOPSRCDIR  U_FILE_SEP_STRING "data");
-#   else
-        strcpy(path, loadTestData(errorCode));
-        strcat(path, U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
-                     U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
-                     U_FILE_SEP_STRING "data");
-#   endif
-    strcat(path, U_FILE_SEP_STRING);
-    strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
-    f=fopen(path, "r");
-    if(f!=NULL) {
-        fclose(f);
-        *(strchr(path, 0)-kUnicodeDataTxtLength)=0;  // Remove the basename.
-        return path;
-    }
-    return NULL;
-}
-
 U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
 
 UBool BiDiConformanceTest::parseLevels(const char *&start) {
     directionBits=0;
     levelsCount=0;
     while(*start!=0 && *(start=u_skipWhitespace(start))!=0 && *start!=';') {
         if(*start=='x') {
             levels[levelsCount++]=UBIDI_DEFAULT_LTR;
             ++start;
         } else {
@@ skipping 581 matching lines @@
     }
     return isOk;
 }
 
 void BiDiConformanceTest::printErrorLine() {
     ++errorCount;
     errln("Input line %5d:   %s", (int)lineNumber, line);
     errln(UnicodeString("Input string:       ")+inputString);
     errln("Para level:         %s", paraLevelName);
 }