diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-07-29 10:01:49 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:58:40 +0300 |
| commit | 8accabb3a272ee484dcca5eaa061e8f5ff705f11 (patch) | |
| tree | 7d1d5a3e6986f3259e24e7a95c8aee380cb26722 /routing/routing_tests/async_router_test.cpp | |
| parent | 1f36eb605532726e00ee75f582bb20df40b8b9b3 (diff) | |
PR fixes
Diffstat (limited to 'routing/routing_tests/async_router_test.cpp')
| -rw-r--r-- | routing/routing_tests/async_router_test.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/routing/routing_tests/async_router_test.cpp b/routing/routing_tests/async_router_test.cpp index d11608343f..cf0a9f1561 100644 --- a/routing/routing_tests/async_router_test.cpp +++ b/routing/routing_tests/async_router_test.cpp @@ -55,8 +55,8 @@ void DummyStatisticsCallback(map<string, string> const &) {} struct DummyResultCallback { - static vector<ResultCode> m_codes; - static vector<vector<string>> m_absent; + vector<ResultCode> m_codes; + vector<vector<string>> m_absent; void operator()(Route & route, ResultCode code) { m_codes.push_back(code); @@ -65,9 +65,6 @@ struct DummyResultCallback } }; -vector<ResultCode> DummyResultCallback::m_codes; -vector<vector<string>> DummyResultCallback::m_absent; - UNIT_TEST(NeedMoreMapsSignalTest) { unique_ptr<IOnlineFetcher> fetcher(new DummyFetcher({"test1", "test2"})); @@ -76,7 +73,7 @@ UNIT_TEST(NeedMoreMapsSignalTest) AsyncRouter async(move(router), move(fetcher), DummyStatisticsCallback, nullptr); resultCallback.m_codes.clear(); resultCallback.m_absent.clear(); - async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, resultCallback, nullptr, 0); + async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, bind(ref(resultCallback), _1, _2), nullptr, 0); // Wait async process start. while (resultCallback.m_codes.empty()) @@ -101,7 +98,7 @@ UNIT_TEST(StandartAsyncFogTest) AsyncRouter async(move(router), move(fetcher), DummyStatisticsCallback, nullptr); resultCallback.m_codes.clear(); resultCallback.m_absent.clear(); - async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, resultCallback, nullptr, 0); + async.CalculateRoute({1, 2}, {3, 4}, {5, 6}, bind(ref(resultCallback), _1, _2), nullptr, 0); // Wait async process start. while (resultCallback.m_codes.empty()) |