Moving RoutingSession calls to gui threads in tests and fixing tests.

4 files changed, 6 insertions, 37 deletions

diff --git a/partners_api/partners_api_tests/async_gui_thread.hpp b/partners_api/partners_api_tests/async_gui_thread.hpp
deleted file mode 100644
index 5291edfbb4..0000000000
--- a/partners_api/partners_api_tests/async_gui_thread.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "platform/gui_thread.hpp"
-#include "platform/platform.hpp"
-
-#include "base/stl_add.hpp"
-#include "base/worker_thread.hpp"
-
-namespace partners_api
-{
-class AsyncGuiThread
-{
-public:
-  AsyncGuiThread()
-  {
-    GetPlatform().SetGuiThread(my::make_unique<base::WorkerThread>());
-  }
-
-  virtual ~AsyncGuiThread()
-  {
-    GetPlatform().SetGuiThread(my::make_unique<platform::GuiThread>());
-  }
-
-private:
-  Platform::ThreadRunner m_runner;
-};
-}  // namespace partners_api
diff --git a/partners_api/partners_api_tests/booking_tests.cpp b/partners_api/partners_api_tests/booking_tests.cpp
index 3f791d51af..72c10f39aa 100644
--- a/partners_api/partners_api_tests/booking_tests.cpp
+++ b/partners_api/partners_api_tests/booking_tests.cpp
@@ -1,13 +1,13 @@
 #include "testing/testing.hpp"
 
-#include "partners_api/partners_api_tests/async_gui_thread.hpp"
-
 #include "partners_api/booking_api.hpp"
 
+#include "platform/platform_tests_support/async_gui_thread.hpp"
+
 #include <chrono>
 #include <utility>
 
-using namespace partners_api;
+using namespace platform::tests_support;
 using namespace booking;
 
 namespace
diff --git a/partners_api/partners_api_tests/taxi_engine_tests.cpp b/partners_api/partners_api_tests/taxi_engine_tests.cpp
index 952d96ddec..961e92485d 100644
--- a/partners_api/partners_api_tests/taxi_engine_tests.cpp
+++ b/partners_api/partners_api_tests/taxi_engine_tests.cpp
@@ -1,12 +1,12 @@
 #include "testing/testing.hpp"
 
-#include "partners_api/partners_api_tests/async_gui_thread.hpp"
-
 #include "partners_api/maxim_api.hpp"
 #include "partners_api/taxi_engine.hpp"
 #include "partners_api/uber_api.hpp"
 #include "partners_api/yandex_api.hpp"
 
+#include "platform/platform_tests_support/async_gui_thread.hpp"
+
 #include "platform/gui_thread.hpp"
 
 #include "geometry/latlon.hpp"
@@ -15,7 +15,7 @@
 #include "base/stl_add.hpp"
 #include "base/worker_thread.hpp"
 
-using namespace partners_api;
+using namespace platform::tests_support;
 
 namespace
 {
diff --git a/partners_api/partners_api_tests/viator_tests.cpp b/partners_api/partners_api_tests/viator_tests.cpp
index ef16f5f76f..2a68be8024 100644
--- a/partners_api/partners_api_tests/viator_tests.cpp
+++ b/partners_api/partners_api_tests/viator_tests.cpp
@@ -1,7 +1,5 @@
 #include "testing/testing.hpp"
 
-#include "partners_api/partners_api_tests/async_gui_thread.hpp"
-
 #include "partners_api/viator_api.hpp"
 
 #include <algorithm>
@@ -11,8 +9,6 @@
 
 #include "3party/jansson/myjansson.hpp"
 
-using namespace partners_api;
-
 namespace
 {
 UNIT_TEST(Viator_SortProducts)