From eb6f47b6b00451e3a4cf158fde950248961c0a4e Mon Sep 17 00:00:00 2001 From: yanyiwu Date: Sun, 13 Sep 2015 18:09:56 +0800 Subject: [PATCH] refactor unittest --- test/unittest/CMakeLists.txt | 23 ++++++------------- ...{TApplication.cpp => application_test.cpp} | 0 .../include/gtest/gtest-death-test.h | 0 .../include/gtest/gtest-message.h | 0 .../include/gtest/gtest-param-test.h | 0 .../include/gtest/gtest-param-test.h.pump | 0 .../include/gtest/gtest-printers.h | 0 .../include/gtest/gtest-spi.h | 0 .../include/gtest/gtest-test-part.h | 0 .../include/gtest/gtest-typed-test.h | 0 .../include/gtest/gtest.h | 0 .../include/gtest/gtest_pred_impl.h | 0 .../include/gtest/gtest_prod.h | 0 .../internal/gtest-death-test-internal.h | 0 .../include/gtest/internal/gtest-filepath.h | 0 .../include/gtest/internal/gtest-internal.h | 0 .../include/gtest/internal/gtest-linked_ptr.h | 0 .../internal/gtest-param-util-generated.h | 0 .../gtest-param-util-generated.h.pump | 0 .../include/gtest/internal/gtest-param-util.h | 0 .../include/gtest/internal/gtest-port.h | 0 .../include/gtest/internal/gtest-string.h | 0 .../include/gtest/internal/gtest-tuple.h | 0 .../include/gtest/internal/gtest-tuple.h.pump | 0 .../include/gtest/internal/gtest-type-util.h | 0 .../gtest/internal/gtest-type-util.h.pump | 0 .../src/.deps/.dirstamp | 0 .../src/.deps/gtest-all.Plo | 0 .../src/.deps/gtest_main.Plo | 0 .../{gtest-1.6.0 => gtest}/src/.dirstamp | 0 .../{gtest-1.6.0 => gtest}/src/gtest-all.cc | 0 .../src/gtest-death-test.cc | 0 .../src/gtest-filepath.cc | 0 .../src/gtest-internal-inl.h | 0 .../{gtest-1.6.0 => gtest}/src/gtest-port.cc | 0 .../src/gtest-printers.cc | 0 .../src/gtest-test-part.cc | 0 .../src/gtest-typed-test.cc | 0 .../{gtest-1.6.0 => gtest}/src/gtest.cc | 0 .../{gtest-1.6.0 => gtest}/src/gtest_main.cc | 0 ...tractor.cpp => keyword_extractor_test.cpp} | 0 .../{TPosTagger.cpp => pos_tagger_test.cpp} | 0 .../{TPreFilter.cpp => pre_filter_test.cpp} | 0 .../{TSegments.cpp => segments_test.cpp} | 0 test/unittest/{TTrie.cpp => trie_test.cpp} | 0 45 files changed, 7 insertions(+), 16 deletions(-) rename test/unittest/{TApplication.cpp => application_test.cpp} (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-death-test.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-message.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-param-test.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-param-test.h.pump (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-printers.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-spi.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-test-part.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest-typed-test.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest_pred_impl.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/gtest_prod.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-death-test-internal.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-filepath.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-internal.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-linked_ptr.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-param-util-generated.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-param-util-generated.h.pump (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-param-util.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-port.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-string.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-tuple.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-tuple.h.pump (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-type-util.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/include/gtest/internal/gtest-type-util.h.pump (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/.deps/.dirstamp (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/.deps/gtest-all.Plo (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/.deps/gtest_main.Plo (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/.dirstamp (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-all.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-death-test.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-filepath.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-internal-inl.h (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-port.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-printers.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-test-part.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest-typed-test.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest.cc (100%) rename test/unittest/{gtest-1.6.0 => gtest}/src/gtest_main.cc (100%) rename test/unittest/{TKeywordExtractor.cpp => keyword_extractor_test.cpp} (100%) rename test/unittest/{TPosTagger.cpp => pos_tagger_test.cpp} (100%) rename test/unittest/{TPreFilter.cpp => pre_filter_test.cpp} (100%) rename test/unittest/{TSegments.cpp => segments_test.cpp} (100%) rename test/unittest/{TTrie.cpp => trie_test.cpp} (100%) diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt index 46449d8..6d2f67d 100644 --- a/test/unittest/CMakeLists.txt +++ b/test/unittest/CMakeLists.txt @@ -1,29 +1,20 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) -SET(GTEST_ROOT_DIR gtest-1.6.0) +SET(GTEST_ROOT_DIR gtest) ADD_DEFINITIONS(-DLOGGER_LEVEL=LL_WARN) INCLUDE_DIRECTORIES(${GTEST_ROOT_DIR} ${GTEST_ROOT_DIR}/include ${PROJECT_SOURCE_DIR}) ADD_LIBRARY(gtest STATIC ${GTEST_ROOT_DIR}/src/gtest-all.cc) -#ADD_EXECUTABLE(segments.test gtest_main.cpp TSegments.cpp) -#TARGET_LINK_LIBRARIES(segments.test gtest pthread) -# -#ADD_EXECUTABLE(trie.test gtest_main.cpp TTrie.cpp) -#TARGET_LINK_LIBRARIES(trie.test gtest pthread) - -#ADD_EXECUTABLE(keyword.test gtest_main.cpp TKeywordExtractor.cpp) -#TARGET_LINK_LIBRARIES(keyword.test gtest pthread) - ADD_EXECUTABLE(test.run gtest_main.cpp - TKeywordExtractor.cpp - TTrie.cpp - TSegments.cpp - TPosTagger.cpp - TApplication.cpp - TPreFilter.cpp + keyword_extractor_test.cpp + trie_test.cpp + segments_test.cpp + pos_tagger_test.cpp + application_test.cpp + pre_filter_test.cpp ) TARGET_LINK_LIBRARIES(gtest pthread) TARGET_LINK_LIBRARIES(test.run gtest pthread) diff --git a/test/unittest/TApplication.cpp b/test/unittest/application_test.cpp similarity index 100% rename from test/unittest/TApplication.cpp rename to test/unittest/application_test.cpp diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-death-test.h b/test/unittest/gtest/include/gtest/gtest-death-test.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-death-test.h rename to test/unittest/gtest/include/gtest/gtest-death-test.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-message.h b/test/unittest/gtest/include/gtest/gtest-message.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-message.h rename to test/unittest/gtest/include/gtest/gtest-message.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-param-test.h b/test/unittest/gtest/include/gtest/gtest-param-test.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-param-test.h rename to test/unittest/gtest/include/gtest/gtest-param-test.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-param-test.h.pump b/test/unittest/gtest/include/gtest/gtest-param-test.h.pump similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-param-test.h.pump rename to test/unittest/gtest/include/gtest/gtest-param-test.h.pump diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-printers.h b/test/unittest/gtest/include/gtest/gtest-printers.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-printers.h rename to test/unittest/gtest/include/gtest/gtest-printers.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-spi.h b/test/unittest/gtest/include/gtest/gtest-spi.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-spi.h rename to test/unittest/gtest/include/gtest/gtest-spi.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-test-part.h b/test/unittest/gtest/include/gtest/gtest-test-part.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-test-part.h rename to test/unittest/gtest/include/gtest/gtest-test-part.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest-typed-test.h b/test/unittest/gtest/include/gtest/gtest-typed-test.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest-typed-test.h rename to test/unittest/gtest/include/gtest/gtest-typed-test.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest.h b/test/unittest/gtest/include/gtest/gtest.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest.h rename to test/unittest/gtest/include/gtest/gtest.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest_pred_impl.h b/test/unittest/gtest/include/gtest/gtest_pred_impl.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest_pred_impl.h rename to test/unittest/gtest/include/gtest/gtest_pred_impl.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/gtest_prod.h b/test/unittest/gtest/include/gtest/gtest_prod.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/gtest_prod.h rename to test/unittest/gtest/include/gtest/gtest_prod.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-death-test-internal.h b/test/unittest/gtest/include/gtest/internal/gtest-death-test-internal.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-death-test-internal.h rename to test/unittest/gtest/include/gtest/internal/gtest-death-test-internal.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-filepath.h b/test/unittest/gtest/include/gtest/internal/gtest-filepath.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-filepath.h rename to test/unittest/gtest/include/gtest/internal/gtest-filepath.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-internal.h b/test/unittest/gtest/include/gtest/internal/gtest-internal.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-internal.h rename to test/unittest/gtest/include/gtest/internal/gtest-internal.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-linked_ptr.h b/test/unittest/gtest/include/gtest/internal/gtest-linked_ptr.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-linked_ptr.h rename to test/unittest/gtest/include/gtest/internal/gtest-linked_ptr.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h b/test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h rename to test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h.pump b/test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h.pump similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h.pump rename to test/unittest/gtest/include/gtest/internal/gtest-param-util-generated.h.pump diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util.h b/test/unittest/gtest/include/gtest/internal/gtest-param-util.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-param-util.h rename to test/unittest/gtest/include/gtest/internal/gtest-param-util.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h b/test/unittest/gtest/include/gtest/internal/gtest-port.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h rename to test/unittest/gtest/include/gtest/internal/gtest-port.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-string.h b/test/unittest/gtest/include/gtest/internal/gtest-string.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-string.h rename to test/unittest/gtest/include/gtest/internal/gtest-string.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-tuple.h b/test/unittest/gtest/include/gtest/internal/gtest-tuple.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-tuple.h rename to test/unittest/gtest/include/gtest/internal/gtest-tuple.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-tuple.h.pump b/test/unittest/gtest/include/gtest/internal/gtest-tuple.h.pump similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-tuple.h.pump rename to test/unittest/gtest/include/gtest/internal/gtest-tuple.h.pump diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-type-util.h b/test/unittest/gtest/include/gtest/internal/gtest-type-util.h similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-type-util.h rename to test/unittest/gtest/include/gtest/internal/gtest-type-util.h diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-type-util.h.pump b/test/unittest/gtest/include/gtest/internal/gtest-type-util.h.pump similarity index 100% rename from test/unittest/gtest-1.6.0/include/gtest/internal/gtest-type-util.h.pump rename to test/unittest/gtest/include/gtest/internal/gtest-type-util.h.pump diff --git a/test/unittest/gtest-1.6.0/src/.deps/.dirstamp b/test/unittest/gtest/src/.deps/.dirstamp similarity index 100% rename from test/unittest/gtest-1.6.0/src/.deps/.dirstamp rename to test/unittest/gtest/src/.deps/.dirstamp diff --git a/test/unittest/gtest-1.6.0/src/.deps/gtest-all.Plo b/test/unittest/gtest/src/.deps/gtest-all.Plo similarity index 100% rename from test/unittest/gtest-1.6.0/src/.deps/gtest-all.Plo rename to test/unittest/gtest/src/.deps/gtest-all.Plo diff --git a/test/unittest/gtest-1.6.0/src/.deps/gtest_main.Plo b/test/unittest/gtest/src/.deps/gtest_main.Plo similarity index 100% rename from test/unittest/gtest-1.6.0/src/.deps/gtest_main.Plo rename to test/unittest/gtest/src/.deps/gtest_main.Plo diff --git a/test/unittest/gtest-1.6.0/src/.dirstamp b/test/unittest/gtest/src/.dirstamp similarity index 100% rename from test/unittest/gtest-1.6.0/src/.dirstamp rename to test/unittest/gtest/src/.dirstamp diff --git a/test/unittest/gtest-1.6.0/src/gtest-all.cc b/test/unittest/gtest/src/gtest-all.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-all.cc rename to test/unittest/gtest/src/gtest-all.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-death-test.cc b/test/unittest/gtest/src/gtest-death-test.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-death-test.cc rename to test/unittest/gtest/src/gtest-death-test.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-filepath.cc b/test/unittest/gtest/src/gtest-filepath.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-filepath.cc rename to test/unittest/gtest/src/gtest-filepath.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-internal-inl.h b/test/unittest/gtest/src/gtest-internal-inl.h similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-internal-inl.h rename to test/unittest/gtest/src/gtest-internal-inl.h diff --git a/test/unittest/gtest-1.6.0/src/gtest-port.cc b/test/unittest/gtest/src/gtest-port.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-port.cc rename to test/unittest/gtest/src/gtest-port.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-printers.cc b/test/unittest/gtest/src/gtest-printers.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-printers.cc rename to test/unittest/gtest/src/gtest-printers.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-test-part.cc b/test/unittest/gtest/src/gtest-test-part.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-test-part.cc rename to test/unittest/gtest/src/gtest-test-part.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest-typed-test.cc b/test/unittest/gtest/src/gtest-typed-test.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest-typed-test.cc rename to test/unittest/gtest/src/gtest-typed-test.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest.cc b/test/unittest/gtest/src/gtest.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest.cc rename to test/unittest/gtest/src/gtest.cc diff --git a/test/unittest/gtest-1.6.0/src/gtest_main.cc b/test/unittest/gtest/src/gtest_main.cc similarity index 100% rename from test/unittest/gtest-1.6.0/src/gtest_main.cc rename to test/unittest/gtest/src/gtest_main.cc diff --git a/test/unittest/TKeywordExtractor.cpp b/test/unittest/keyword_extractor_test.cpp similarity index 100% rename from test/unittest/TKeywordExtractor.cpp rename to test/unittest/keyword_extractor_test.cpp diff --git a/test/unittest/TPosTagger.cpp b/test/unittest/pos_tagger_test.cpp similarity index 100% rename from test/unittest/TPosTagger.cpp rename to test/unittest/pos_tagger_test.cpp diff --git a/test/unittest/TPreFilter.cpp b/test/unittest/pre_filter_test.cpp similarity index 100% rename from test/unittest/TPreFilter.cpp rename to test/unittest/pre_filter_test.cpp diff --git a/test/unittest/TSegments.cpp b/test/unittest/segments_test.cpp similarity index 100% rename from test/unittest/TSegments.cpp rename to test/unittest/segments_test.cpp diff --git a/test/unittest/TTrie.cpp b/test/unittest/trie_test.cpp similarity index 100% rename from test/unittest/TTrie.cpp rename to test/unittest/trie_test.cpp