switch to pinyin.h for tests

10 files changed, 22 insertions, 30 deletions

diff --git a/tests/include/Makefile.am b/tests/include/Makefile.am
index 3ab278a..958e1d8 100644
--- a/tests/include/Makefile.am
+++ b/tests/include/Makefile.am
@@ -15,7 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES                = -I$(top_srcdir)/src/include
+INCLUDES                = -I$(top_srcdir)/src \
+                          -I$(top_srcdir)/src/include \
+                          -I$(top_srcdir)/src/storage \
+                          -I$(top_srcdir)/src/lookup \
+                          @GLIB2_CPPFLAGS@
 
 noinst_PROGRAMS          = test_memory_chunk
 
diff --git a/tests/include/test_memory_chunk.cpp b/tests/include/test_memory_chunk.cpp
index 1edaecc..3724ecd 100755
--- a/tests/include/test_memory_chunk.cpp
+++ b/tests/include/test_memory_chunk.cpp
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "memory_chunk.h"
+#include "pinyin.h"
 
 //Test Memory Chunk Functionality
 int main(int argc, char * argv[]){
diff --git a/tests/lookup/Makefile.am b/tests/lookup/Makefile.am
index 4c71c36..9e8cef4 100644
--- a/tests/lookup/Makefile.am
+++ b/tests/lookup/Makefile.am
@@ -15,10 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES                = -I$(top_srcdir)/src/include \
-			  -I$(top_srcdir)/src/storage \
-			  -I$(top_srcdir)/src/lookup \
-			  @GLIB2_CPPFLAGS@
+INCLUDES                = -I$(top_srcdir)/src \
+                          -I$(top_srcdir)/src/include \
+                          -I$(top_srcdir)/src/storage \
+                          -I$(top_srcdir)/src/lookup \
+                          @GLIB2_CPPFLAGS@
 
 noinst_PROGRAMS          = test_simple_lookup 
 
diff --git a/tests/lookup/test_simple_lookup.cpp b/tests/lookup/test_simple_lookup.cpp
index be90316..7039f45 100644
--- a/tests/lookup/test_simple_lookup.cpp
+++ b/tests/lookup/test_simple_lookup.cpp
@@ -2,13 +2,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <glib.h>
-#include "novel_types.h"
-#include "pinyin_base.h"
-#include "pinyin_phrase.h"
-#include "pinyin_large_table.h"
-#include "phrase_index.h"
-#include "ngram.h"
-#include "pinyin_lookup.h"
+#include "pinyin.h"
 
 size_t bench_times = 1000;
 
diff --git a/tests/storage/Makefile.am b/tests/storage/Makefile.am
index 39570a3..281dd5e 100644
--- a/tests/storage/Makefile.am
+++ b/tests/storage/Makefile.am
@@ -15,9 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES                = -I$(top_srcdir)/src/include \
-			  -I$(top_srcdir)/src/storage \
-			  @GLIB2_CPPFLAGS@
+INCLUDES                = -I$(top_srcdir)/src \
+                          -I$(top_srcdir)/src/include \
+                          -I$(top_srcdir)/src/storage \
+                          -I$(top_srcdir)/src/lookup \
+                          @GLIB2_CPPFLAGS@
 
 noinst_PROGRAMS          = test_parser \
 			   test_pinyin_index \
diff --git a/tests/storage/test_ngram.cpp b/tests/storage/test_ngram.cpp
index 7bdb141..2110afc 100644
--- a/tests/storage/test_ngram.cpp
+++ b/tests/storage/test_ngram.cpp
@@ -1,7 +1,5 @@
 #include <stdio.h>
-#include "memory_chunk.h"
-#include "novel_types.h"
-#include "ngram.h"
+#include "pinyin.h"
 
 
 int main(int argc, char * argv[]){
diff --git a/tests/storage/test_parser.cpp b/tests/storage/test_parser.cpp
index 70b34ea..7467e8a 100644
--- a/tests/storage/test_parser.cpp
+++ b/tests/storage/test_parser.cpp
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "pinyin_base.h"
+#include "pinyin.h"
 
 static const char *help_msg =
     "Too few argument!\n"
diff --git a/tests/storage/test_phrase_index.cpp b/tests/storage/test_phrase_index.cpp
index 72b6d03..d71ce6d 100644
--- a/tests/storage/test_phrase_index.cpp
+++ b/tests/storage/test_phrase_index.cpp
@@ -1,9 +1,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 #include <glib.h>
-#include "memory_chunk.h"
-#include "pinyin_base.h"
-#include "phrase_index.h"
+#include "pinyin.h"
 
 size_t bench_times = 100000;
 
diff --git a/tests/storage/test_phrase_table.cpp b/tests/storage/test_phrase_table.cpp
index aa4e50b..758cf6c 100644
--- a/tests/storage/test_phrase_table.cpp
+++ b/tests/storage/test_phrase_table.cpp
@@ -1,8 +1,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include "novel_types.h"
-#include "phrase_large_table.h"
+#include "pinyin.h"
 
 size_t bench_times = 1000;
 
diff --git a/tests/storage/test_pinyin_index.cpp b/tests/storage/test_pinyin_index.cpp
index b1e0f14..7c8eb78 100644
--- a/tests/storage/test_pinyin_index.cpp
+++ b/tests/storage/test_pinyin_index.cpp
@@ -1,11 +1,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include "novel_types.h"
-#include "pinyin_base.h"
-#include "pinyin_phrase.h"
-#include "pinyin_large_table.h"
-#include "phrase_index.h"
+#include "pinyin.h"
 
 size_t bench_times = 1000;