diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-02 10:40:59 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-12-02 14:12:18 +0200 |
commit | 7bacf5696ca90dd3f3496988ad0658b357cb7ec1 (patch) | |
tree | 55c0988f8ea6a5c2f32c1f9df7d4e3f0bc26481c /test/util | |
parent | e373d8a5924e4f4cf3904ecacbf1d1cf86a5d60f (diff) | |
download | qtlocation-mapboxgl-7bacf5696ca90dd3f3496988ad0658b357cb7ec1.tar.gz |
[core] Introduce Pass<> class and use it for Scheduler
Thus we enforce client to retain the returned `Scheduler` objects.
Diffstat (limited to 'test/util')
-rw-r--r-- | test/util/async_task.test.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/util/async_task.test.cpp b/test/util/async_task.test.cpp index 8c79c51405..e2f988751e 100644 --- a/test/util/async_task.test.cpp +++ b/test/util/async_task.test.cpp @@ -105,7 +105,7 @@ TEST(AsyncTask, RequestCoalescingMultithreaded) { unsigned count = 0, numThreads = 25; AsyncTask async([&count] { ++count; }); - auto retainer = Scheduler::GetBackground(); + std::shared_ptr<Scheduler> retainer = Scheduler::GetBackground(); auto mailbox = std::make_shared<Mailbox>(*retainer); TestWorker worker(&async); @@ -134,7 +134,7 @@ TEST(AsyncTask, ThreadSafety) { AsyncTask async([&count] { ++count; }); - auto retainer = Scheduler::GetBackground(); + std::shared_ptr<Scheduler> retainer = Scheduler::GetBackground(); auto mailbox = std::make_shared<Mailbox>(*retainer); TestWorker worker(&async); @@ -166,7 +166,7 @@ TEST(AsyncTask, scheduleAndReplyValue) { loop.stop(); }; - auto sheduler = Scheduler::GetBackground(); + std::shared_ptr<Scheduler> sheduler = Scheduler::GetBackground(); sheduler->scheduleAndReplyValue(runInBackground, onResult); loop.run(); } @@ -194,7 +194,7 @@ TEST(AsyncTask, SequencedScheduler) { loop.stop(); }; - auto sheduler = Scheduler::GetSequenced(); + std::shared_ptr<Scheduler> sheduler = Scheduler::GetSequenced(); sheduler->schedule(first); sheduler->schedule(second); @@ -206,10 +206,10 @@ TEST(AsyncTask, MultipleSequencedSchedulers) { std::vector<std::shared_ptr<Scheduler>> shedulers; for (int i = 0; i < 10; ++i) { - auto scheduler = Scheduler::GetSequenced(); + std::shared_ptr<Scheduler> scheduler = Scheduler::GetSequenced(); EXPECT_TRUE(std::none_of( shedulers.begin(), shedulers.end(), [&scheduler](const auto &item) { return item == scheduler; })); shedulers.emplace_back(std::move(scheduler)); } - EXPECT_EQ(shedulers.front(), Scheduler::GetSequenced()); -}
\ No newline at end of file + EXPECT_EQ(shedulers.front(), std::shared_ptr<Scheduler>(Scheduler::GetSequenced())); +} |