[generator, search] Created generator_tests_support library.

5 files changed, 16 insertions, 13 deletions

diff --git a/search/search_integration_tests/generate_tests.cpp b/search/search_integration_tests/generate_tests.cpp
index ebe32538d3..f6a756b157 100644
--- a/search/search_integration_tests/generate_tests.cpp
+++ b/search/search_integration_tests/generate_tests.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_tests_support/test_mwm_builder.hpp"
+#include "generator/generator_tests_support/test_mwm_builder.hpp"
 
 #include "generator/feature_builder.hpp"
 #include "generator/osm_element.hpp"
@@ -16,7 +16,7 @@
 
 namespace
 {
-using TBuilder = search::tests_support::TestMwmBuilder;
+using TBuilder = generator::tests_support::TestMwmBuilder;
 
 void MakeFeature(TBuilder & builder, pair<string, string> const & tag, m2::PointD const & pt)
 {
diff --git a/search/search_integration_tests/helpers.hpp b/search/search_integration_tests/helpers.hpp
index 5e3ffc32aa..c2d128d3e1 100644
--- a/search/search_integration_tests/helpers.hpp
+++ b/search/search_integration_tests/helpers.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "search/search_tests_support/test_mwm_builder.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_engine.hpp"
 
+#include "generator/generator_tests_support/test_mwm_builder.hpp"
+
 #include "storage/country_decl.hpp"
 #include "storage/country_info_getter.hpp"
 
@@ -56,7 +57,7 @@ public:
     Cleanup(file);
 
     {
-      tests_support::TestMwmBuilder builder(file, type);
+      generator::tests_support::TestMwmBuilder builder(file, type);
       fn(builder);
     }
 
diff --git a/search/search_integration_tests/search_integration_tests.pro b/search/search_integration_tests/search_integration_tests.pro
index 5bfa36ff81..8b10e50c53 100644
--- a/search/search_integration_tests/search_integration_tests.pro
+++ b/search/search_integration_tests/search_integration_tests.pro
@@ -7,11 +7,9 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 
-DEPENDENCIES = search_tests_support generator routing search storage stats_client indexer \
-               platform editor geometry coding base tess2 protobuf tomcrypt jansson succinct pugixml
-
-DEPENDENCIES += opening_hours \
-
+DEPENDENCIES = search_tests_support generator_tests_support generator routing search storage \
+               stats_client indexer platform editor geometry coding base tess2 protobuf \
+               tomcrypt jansson succinct pugixml opening_hours
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/search/search_integration_tests/search_query_v2_test.cpp b/search/search_integration_tests/search_query_v2_test.cpp
index 6ffe1db56e..eacd9af05e 100644
--- a/search/search_integration_tests/search_query_v2_test.cpp
+++ b/search/search_integration_tests/search_query_v2_test.cpp
@@ -2,12 +2,13 @@
 
 #include "search/retrieval.hpp"
 #include "search/search_integration_tests/helpers.hpp"
-#include "search/search_tests_support/test_feature.hpp"
-#include "search/search_tests_support/test_mwm_builder.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 #include "search/v2/token_slice.hpp"
 
+#include "generator/generator_tests_support/test_feature.hpp"
+#include "generator/generator_tests_support/test_mwm_builder.hpp"
+
 #include "indexer/feature.hpp"
 #include "indexer/index.hpp"
 
@@ -19,6 +20,7 @@
 #include "std/shared_ptr.hpp"
 #include "std/vector.hpp"
 
+using namespace generator::tests_support;
 using namespace search::tests_support;
 using namespace search::v2;
 
diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp
index b2bbe5c135..0ece6f1cf0 100644
--- a/search/search_integration_tests/smoke_test.cpp
+++ b/search/search_integration_tests/smoke_test.cpp
@@ -1,17 +1,19 @@
 #include "testing/testing.hpp"
 
 #include "search/search_integration_tests/helpers.hpp"
-#include "search/search_tests_support/test_feature.hpp"
-#include "search/search_tests_support/test_mwm_builder.hpp"
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 
+#include "generator/generator_tests_support/test_feature.hpp"
+#include "generator/generator_tests_support/test_mwm_builder.hpp"
+
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
 
 #include "std/shared_ptr.hpp"
 #include "std/vector.hpp"
 
+using namespace generator::tests_support;
 using namespace search::tests_support;
 
 using TRules = vector<shared_ptr<MatchingRule>>;