From 1cfd1ab72dd09386cd9c3ce708d0673dc8a02943 Mon Sep 17 00:00:00 2001 From: Philippe Liard Date: Fri, 22 Jul 2011 09:54:01 +0000 Subject: [PATCH] CPP: Move unit tests to the test directory. --- cpp/CMakeLists.txt | 15 ++++++++------- cpp/{src => test}/phonenumbers/logger_test.cc | 0 .../phonenumbers/phonenumberutil_test.cc | 0 .../phonenumbers/regexp_adapter_test.cc | 4 ++-- .../phonenumbers/regexp_cache_test.cc | 0 cpp/{src => test}/phonenumbers/run_tests.cc | 0 cpp/{src => test}/phonenumbers/stringutil_test.cc | 0 .../phonenumbers/utf/unicodetext_test.cc | 0 8 files changed, 10 insertions(+), 9 deletions(-) rename cpp/{src => test}/phonenumbers/logger_test.cc (100%) rename cpp/{src => test}/phonenumbers/phonenumberutil_test.cc (100%) rename cpp/{src => test}/phonenumbers/regexp_adapter_test.cc (99%) rename cpp/{src => test}/phonenumbers/regexp_cache_test.cc (100%) rename cpp/{src => test}/phonenumbers/run_tests.cc (100%) rename cpp/{src => test}/phonenumbers/stringutil_test.cc (100%) rename cpp/{src => test}/phonenumbers/utf/unicodetext_test.cc (100%) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index fbb26757b..b79dc0533 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -286,16 +286,17 @@ target_link_libraries (phonenumber_testing ${LIBRARY_DEPS}) add_dependencies (phonenumber_testing generate-sources ${TEST_METADATA_TARGET}) set (TEST_SOURCES - "src/phonenumbers/logger_test.cc" - "src/phonenumbers/phonenumberutil_test.cc" - "src/phonenumbers/regexp_adapter_test.cc" - "src/phonenumbers/regexp_cache_test.cc" - "src/phonenumbers/run_tests.cc" - "src/phonenumbers/stringutil_test.cc" - "src/phonenumbers/utf/unicodetext_test.cc" + "test/phonenumbers/logger_test.cc" + "test/phonenumbers/phonenumberutil_test.cc" + "test/phonenumbers/regexp_adapter_test.cc" + "test/phonenumbers/regexp_cache_test.cc" + "test/phonenumbers/run_tests.cc" + "test/phonenumbers/stringutil_test.cc" + "test/phonenumbers/utf/unicodetext_test.cc" ) # Build the testing binary. +include_directories ("test") add_executable (libphonenumber_test ${TEST_SOURCES}) target_link_libraries ( libphonenumber_test diff --git a/cpp/src/phonenumbers/logger_test.cc b/cpp/test/phonenumbers/logger_test.cc similarity index 100% rename from cpp/src/phonenumbers/logger_test.cc rename to cpp/test/phonenumbers/logger_test.cc diff --git a/cpp/src/phonenumbers/phonenumberutil_test.cc b/cpp/test/phonenumbers/phonenumberutil_test.cc similarity index 100% rename from cpp/src/phonenumbers/phonenumberutil_test.cc rename to cpp/test/phonenumbers/phonenumberutil_test.cc diff --git a/cpp/src/phonenumbers/regexp_adapter_test.cc b/cpp/test/phonenumbers/regexp_adapter_test.cc similarity index 99% rename from cpp/src/phonenumbers/regexp_adapter_test.cc rename to cpp/test/phonenumbers/regexp_adapter_test.cc index ebc2c062e..28caef57d 100644 --- a/cpp/src/phonenumbers/regexp_adapter_test.cc +++ b/cpp/test/phonenumbers/regexp_adapter_test.cc @@ -24,8 +24,8 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "stl_util.h" -#include "stringutil.h" +#include "phonenumbers/stl_util.h" +#include "phonenumbers/stringutil.h" #ifdef USE_RE2 #include "phonenumbers/regexp_adapter_re2.h" diff --git a/cpp/src/phonenumbers/regexp_cache_test.cc b/cpp/test/phonenumbers/regexp_cache_test.cc similarity index 100% rename from cpp/src/phonenumbers/regexp_cache_test.cc rename to cpp/test/phonenumbers/regexp_cache_test.cc diff --git a/cpp/src/phonenumbers/run_tests.cc b/cpp/test/phonenumbers/run_tests.cc similarity index 100% rename from cpp/src/phonenumbers/run_tests.cc rename to cpp/test/phonenumbers/run_tests.cc diff --git a/cpp/src/phonenumbers/stringutil_test.cc b/cpp/test/phonenumbers/stringutil_test.cc similarity index 100% rename from cpp/src/phonenumbers/stringutil_test.cc rename to cpp/test/phonenumbers/stringutil_test.cc diff --git a/cpp/src/phonenumbers/utf/unicodetext_test.cc b/cpp/test/phonenumbers/utf/unicodetext_test.cc similarity index 100% rename from cpp/src/phonenumbers/utf/unicodetext_test.cc rename to cpp/test/phonenumbers/utf/unicodetext_test.cc