From 059e11142477890c7c74451536dfd1ed34ca9876 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Tue, 29 Sep 2015 13:25:05 +0300 Subject: [PATCH] [search] integration_tests -> search_integration_tests --- omim.pro | 2 +- .../retrieval_test.cpp | 2 +- .../search_integration_tests.pro} | 0 .../smoke_test.cpp | 6 +++--- .../test_mwm_builder.cpp | 2 +- .../test_mwm_builder.hpp | 0 .../test_search_engine.cpp | 2 +- .../test_search_engine.hpp | 0 .../test_search_request.cpp | 4 ++-- .../test_search_request.hpp | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename search/{integration_tests => search_integration_tests}/retrieval_test.cpp (99%) rename search/{integration_tests/integration_tests.pro => search_integration_tests/search_integration_tests.pro} (100%) rename search/{integration_tests => search_integration_tests}/smoke_test.cpp (95%) rename search/{integration_tests => search_integration_tests}/test_mwm_builder.cpp (96%) rename search/{integration_tests => search_integration_tests}/test_mwm_builder.hpp (100%) rename search/{integration_tests => search_integration_tests}/test_search_engine.cpp (96%) rename search/{integration_tests => search_integration_tests}/test_search_engine.hpp (100%) rename search/{integration_tests => search_integration_tests}/test_search_request.cpp (89%) rename search/{integration_tests => search_integration_tests}/test_search_request.hpp (100%) diff --git a/omim.pro b/omim.pro index f9698d78bc..f0496bc862 100644 --- a/omim.pro +++ b/omim.pro @@ -87,7 +87,7 @@ CONFIG(desktop) { SUBDIRS += gui/gui_tests SUBDIRS *= integration_tests SUBDIRS += pedestrian_routing_benchmarks - SUBDIRS += search/integration_tests + SUBDIRS += search/search_integration_tests CONFIG(drape) { SUBDIRS += drape/drape_tests diff --git a/search/integration_tests/retrieval_test.cpp b/search/search_integration_tests/retrieval_test.cpp similarity index 99% rename from search/integration_tests/retrieval_test.cpp rename to search/search_integration_tests/retrieval_test.cpp index 25ef9f9002..e51dfc8197 100644 --- a/search/integration_tests/retrieval_test.cpp +++ b/search/search_integration_tests/retrieval_test.cpp @@ -7,7 +7,7 @@ #include "indexer/search_delimiters.hpp" #include "indexer/search_string_utils.hpp" -#include "search/integration_tests/test_mwm_builder.hpp" +#include "search/search_integration_tests/test_mwm_builder.hpp" #include "search/retrieval.hpp" #include "search/search_query_params.hpp" diff --git a/search/integration_tests/integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro similarity index 100% rename from search/integration_tests/integration_tests.pro rename to search/search_integration_tests/search_integration_tests.pro diff --git a/search/integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp similarity index 95% rename from search/integration_tests/smoke_test.cpp rename to search/search_integration_tests/smoke_test.cpp index 2abded6134..e2690b03ca 100644 --- a/search/integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -3,9 +3,9 @@ #include "indexer/classificator_loader.hpp" #include "indexer/scales.hpp" -#include "search/integration_tests/test_mwm_builder.hpp" -#include "search/integration_tests/test_search_engine.hpp" -#include "search/integration_tests/test_search_request.hpp" +#include "search/search_integration_tests/test_mwm_builder.hpp" +#include "search/search_integration_tests/test_search_engine.hpp" +#include "search/search_integration_tests/test_search_request.hpp" #include "platform/country_defines.hpp" #include "platform/country_file.hpp" diff --git a/search/integration_tests/test_mwm_builder.cpp b/search/search_integration_tests/test_mwm_builder.cpp similarity index 96% rename from search/integration_tests/test_mwm_builder.cpp rename to search/search_integration_tests/test_mwm_builder.cpp index 4d004aa5fb..55262d95f0 100644 --- a/search/integration_tests/test_mwm_builder.cpp +++ b/search/search_integration_tests/test_mwm_builder.cpp @@ -1,4 +1,4 @@ -#include "search/integration_tests/test_mwm_builder.hpp" +#include "search/search_integration_tests/test_mwm_builder.hpp" #include "indexer/classificator.hpp" #include "indexer/data_header.hpp" diff --git a/search/integration_tests/test_mwm_builder.hpp b/search/search_integration_tests/test_mwm_builder.hpp similarity index 100% rename from search/integration_tests/test_mwm_builder.hpp rename to search/search_integration_tests/test_mwm_builder.hpp diff --git a/search/integration_tests/test_search_engine.cpp b/search/search_integration_tests/test_search_engine.cpp similarity index 96% rename from search/integration_tests/test_search_engine.cpp rename to search/search_integration_tests/test_search_engine.cpp index 298d949b59..818096132e 100644 --- a/search/integration_tests/test_search_engine.cpp +++ b/search/search_integration_tests/test_search_engine.cpp @@ -1,4 +1,4 @@ -#include "search/integration_tests/test_search_engine.hpp" +#include "search/search_integration_tests/test_search_engine.hpp" #include "indexer/categories_holder.hpp" #include "indexer/scales.hpp" diff --git a/search/integration_tests/test_search_engine.hpp b/search/search_integration_tests/test_search_engine.hpp similarity index 100% rename from search/integration_tests/test_search_engine.hpp rename to search/search_integration_tests/test_search_engine.hpp diff --git a/search/integration_tests/test_search_request.cpp b/search/search_integration_tests/test_search_request.cpp similarity index 89% rename from search/integration_tests/test_search_request.cpp rename to search/search_integration_tests/test_search_request.cpp index b58e2786ce..68f0d6b292 100644 --- a/search/integration_tests/test_search_request.cpp +++ b/search/search_integration_tests/test_search_request.cpp @@ -1,6 +1,6 @@ -#include "search/integration_tests/test_search_request.hpp" +#include "search/search_integration_tests/test_search_request.hpp" -#include "search/integration_tests/test_search_engine.hpp" +#include "search/search_integration_tests/test_search_engine.hpp" #include "search/params.hpp" #include "base/logging.hpp" diff --git a/search/integration_tests/test_search_request.hpp b/search/search_integration_tests/test_search_request.hpp similarity index 100% rename from search/integration_tests/test_search_request.hpp rename to search/search_integration_tests/test_search_request.hpp