update tests
authorPeng Wu <alexepico@gmail.com>
Mon, 25 Jun 2012 03:11:56 +0000 (11:11 +0800)
committerPeng Wu <alexepico@gmail.com>
Mon, 25 Jun 2012 03:11:56 +0000 (11:11 +0800)
tests/tests_helper.h

index 5694148..f15c19e 100644 (file)
 static bool load_phrase_index(FacadePhraseIndex * phrase_index){
     MemoryChunk * chunk = NULL;
     for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
-        const char * binfile = pinyin_phrase_files[i];
-        if (NULL == binfile)
+        const pinyin_table_info_t * table_info = pinyin_phrase_files + i;
+
+        if (SYSTEM_FILE != table_info->m_file_type)
             continue;
 
+        const char * binfile = table_info->m_system_filename;
+
         gchar * filename = g_build_filename("..", "..", "data",
                                             binfile, NULL);
         chunk = new MemoryChunk;
@@ -48,10 +51,13 @@ static bool load_phrase_table(ChewingLargeTable * chewing_table,
                               PhraseLargeTable * phrase_table,
                               FacadePhraseIndex * phrase_index){
     for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
-        const char * tablename = pinyin_table_files[i];
-        if ( NULL == tablename )
+        const pinyin_table_info_t * table_info = pinyin_phrase_files + i;
+
+        if (SYSTEM_FILE != table_info->m_file_type)
             continue;
 
+        const char * tablename = table_info->m_table_filename;
+
         gchar * filename = g_build_filename("..", "..", "data",
                                             tablename, NULL);
         FILE * tablefile = fopen(filename, "r");