1 files changed, 26 insertions, 24 deletions

diff --git a/search/search_integration_tests/generate_tests.cpp b/search/search_integration_tests/generate_tests.cpp
index dd17d9f8d9..b489897a6a 100644
--- a/search/search_integration_tests/generate_tests.cpp
+++ b/search/search_integration_tests/generate_tests.cpp
@@ -5,12 +5,12 @@
 #include "generator/generator_tests_support/test_mwm_builder.hpp"
 
 #include "generator/feature_builder.hpp"
-#include "generator/osm_element.hpp"
 #include "generator/osm2type.hpp"
+#include "generator/osm_element.hpp"
 
 #include "indexer/classificator.hpp"
-#include "indexer/feature_data.hpp"
 #include "indexer/feature.hpp"
+#include "indexer/feature_data.hpp"
 #include "indexer/index.hpp"
 
 #include "platform/local_country_file.hpp"
@@ -20,27 +20,33 @@ using namespace generator::tests_support;
 
 namespace
 {
-uint64_t g_lastId = 0;
-
-void MakeFeature(TestMwmBuilder & builder, pair<string, string> const & tag, m2::PointD const & pt)
+class GenerateTest : public TestWithClassificator
 {
-  OsmElement e;
-  e.AddTag(tag.first, tag.second);
+public:
+  void MakeFeature(TestMwmBuilder & builder, pair<string, string> const & tag,
+                   m2::PointD const & pt)
+  {
+    OsmElement e;
+    e.AddTag(tag.first, tag.second);
 
-  FeatureParams params;
-  ftype::GetNameAndType(&e, params);
-  params.AddName("en", "xxx");
+    FeatureParams params;
+    ftype::GetNameAndType(&e, params);
+    params.AddName("en", "xxx");
 
-  FeatureBuilder1 fb;
-  fb.SetParams(params);
-  fb.SetCenter(pt);
-  fb.GetMetadataForTesting().Set(feature::Metadata::FMD_TEST_ID, strings::to_string(g_lastId));
-  ++g_lastId;
+    FeatureBuilder1 fb;
+    fb.SetParams(params);
+    fb.SetCenter(pt);
+    fb.GetMetadataForTesting().Set(feature::Metadata::FMD_TEST_ID, strings::to_string(m_lastId));
+    ++m_lastId;
 
-  TEST(builder.Add(fb), (fb));
-}
+    TEST(builder.Add(fb), (fb));
+  }
 
-UNIT_CLASS_TEST(TestWithClassificator, GenerateDeprecatedTypes)
+private:
+  uint64_t m_lastId = 0;
+};
+
+UNIT_CLASS_TEST(GenerateTest, GenerateDeprecatedTypes)
 {
   auto file = platform::LocalCountryFile::MakeForTesting("testCountry");
 
@@ -65,13 +71,9 @@ UNIT_CLASS_TEST(TestWithClassificator, GenerateDeprecatedTypes)
     types.insert(cl.GetTypeByPath(s));
 
   int count = 0;
-  auto const fn = [&](FeatureType & ft)
-  {
+  auto const fn = [&](FeatureType & ft) {
     ++count;
-    ft.ForEachType([&](uint32_t t)
-    {
-      TEST(types.count(t) > 0, (cl.GetReadableObjectName(t)));
-    });
+    ft.ForEachType([&](uint32_t t) { TEST(types.count(t) > 0, (cl.GetReadableObjectName(t))); });
   };
   index.ForEachInScale(fn, scales::GetUpperScale());