Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: source/test/intltest/bidiconf.cpp

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/test/intltest/astrotst.cpp ('k') | source/test/intltest/bytestrietest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/test/intltest/bidiconf.cpp
diff --git a/source/test/intltest/bidiconf.cpp b/source/test/intltest/bidiconf.cpp
index c1ee4286c94245f33f8284f9c1e3815f7f311f15..4ed836e2fc0583607c15966364cf862167fb2a9c 100644
--- a/source/test/intltest/bidiconf.cpp
+++ b/source/test/intltest/bidiconf.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2009-2013, International Business Machines
+* Copyright (C) 2009-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -39,8 +39,6 @@ public:
void TestBidiTest();
void TestBidiCharacterTest();
private:
- char *getUnidataPath(char path[]);
-
UBool parseLevels(const char *&start);
UBool parseOrdering(const char *start);
UBool parseInputStringFromBiDiClasses(const char *&start);
@@ -77,42 +75,6 @@ void BiDiConformanceTest::runIndexedTest(int32_t index, UBool exec, const char *
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) {
« no previous file with comments | « source/test/intltest/astrotst.cpp ('k') | source/test/intltest/bytestrietest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698