update test_phrase_lookup.cpp

[platform/upstream/libpinyin.git] / tests / lookup / test_phrase_lookup.cpp

diff --git a/tests/lookup/test_phrase_lookup.cpp b/tests/lookup/test_phrase_lookup.cpp
index 3d5fbec..8746e76 100644 (file)
--- a/tests/lookup/test_phrase_lookup.cpp
+++ b/tests/lookup/test_phrase_lookup.cpp
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include "pinyin_internal.h"
+#include "tests_helper.h"
 
 void print_help(){
     printf("Usage: test_phrase_lookup\n");
@@ -42,7 +43,7 @@ bool try_phrase_lookup(PhraseLookup * phrase_lookup,
     }
     printf("\n");
 #endif
-    phrase_lookup->convert_to_utf8(results, "\n", result_string);
+    phrase_lookup->convert_to_utf8(results, result_string);
     if (result_string)
         printf("%s\n", result_string);
     else
@@ -53,47 +54,19 @@ bool try_phrase_lookup(PhraseLookup * phrase_lookup,
 }
 
 int main(int argc, char * argv[]){
-    int i = 1;
 
     setlocale(LC_ALL, "");
-    /* deal with options. */
-    while ( i < argc ){
-        if ( strcmp ("--help", argv[i]) == 0 ){
-            print_help();
-            exit(0);
-        } else {
-            print_help();
-            exit(EINVAL);
-        }
-        ++i;
-    }
-
 
     /* init phrase table */
-    FacadePhraseTable phrase_table;
+    FacadePhraseTable2 phrase_table;
     MemoryChunk * chunk = new MemoryChunk;
     chunk->load("../../data/phrase_index.bin");
     phrase_table.load(chunk, NULL);
 
     /* init phrase index */
     FacadePhraseIndex phrase_index;
-    for (size_t i = 0; i < PHRASE_INDEX_LIBRARY_COUNT; ++i) {
-        const char * bin_file = pinyin_phrase_files[i];
-        if (NULL == bin_file)
-            continue;
-
-        gchar * filename = g_build_filename("..", "..", "data",
-                                            bin_file, NULL);
-        chunk = new MemoryChunk;
-        bool retval = chunk->load(filename);
-        if (!retval) {
-            fprintf(stderr, "open %s failed!\n", bin_file);
-            exit(ENOENT);
-        }
-
-        phrase_index.load(i, chunk);
-        g_free(filename);
-    }
+    if (!load_phrase_index(&phrase_index))
+        exit(ENOENT);
 
     /* init bi-gram */
     Bigram system_bigram;