FakeTaskRunner::WaitForRunningTasksWithTimeout

PiperOrigin-RevId: 694283408

Author: ftsui

sharing/internal/test/fake_context.h

@@ -24,6 +24,7 @@
 #include "internal/platform/task_runner.h"
 #include "internal/platform/timer.h"
 #include "internal/test/fake_clock.h"
+#include "internal/test/fake_task_runner.h"
 #include "sharing/internal/api/bluetooth_adapter.h"
 #include "sharing/internal/api/fast_initiation_manager.h"
 #include "sharing/internal/api/wifi_adapter.h"
@@ -65,14 +66,17 @@ class FakeContext : public Context {
   FakeFastInitiationManager* fake_fast_initiation_manager() const {
     return fake_fast_initiation_manager_.get();
   }
+  FakeTaskRunner* fake_task_runner() const {
+    return executor_.get();
+  }
 
  private:
   std::unique_ptr<FakeClock> fake_clock_;
   std::unique_ptr<FakeConnectivityManager> fake_connectivity_manager_;
   std::unique_ptr<FakeBluetoothAdapter> fake_bluetooth_adapter_;
   std::unique_ptr<FakeWifiAdapter> fake_wifi_adapter_;
   std::unique_ptr<FakeFastInitiationManager> fake_fast_initiation_manager_;
-  std::unique_ptr<TaskRunner> executor_;
+  std::unique_ptr<FakeTaskRunner> executor_;
 };
 
 }  // namespace nearby

sharing/local_device_data/nearby_share_local_device_data_manager_impl_test.cc

@@ -124,7 +124,6 @@ class NearbyShareLocalDeviceDataManagerImplTest
   ~NearbyShareLocalDeviceDataManagerImplTest() override = default;
 
   void SetUp() override {
-    FakeTaskRunner::ResetPendingTasksCount();
     prefs::RegisterNearbySharingPrefs(preference_manager_);
     NearbyShareSchedulerFactory::SetFactoryForTesting(&scheduler_factory_);
 
@@ -235,8 +234,8 @@ class NearbyShareLocalDeviceDataManagerImplTest
   }
 
   void Sync() {
-    EXPECT_TRUE(FakeTaskRunner::WaitForRunningTasksWithTimeout(
-        absl::Milliseconds(1000)));
+    EXPECT_TRUE(
+        context_.fake_task_runner()->SyncWithTimeout(absl::Milliseconds(1000)));
   }
 
  private:

sharing/nearby_connection_impl_test.cc

@@ -32,7 +32,6 @@ namespace sharing {
 namespace {
 
 TEST(NearbyConnectionImpl, DestructorBeforeReaderDestructor) {
-  FakeTaskRunner::ResetPendingTasksCount();
   FakeNearbyConnectionsManager connection_manager;
   FakeClock fake_clock;
   FakeTaskRunner fake_task_runner(&fake_clock, 1);
@@ -50,14 +49,13 @@ TEST(NearbyConnectionImpl, DestructorBeforeReaderDestructor) {
         called = true;
         notification.Notify();
       });
-  EXPECT_TRUE(FakeTaskRunner::WaitForRunningTasksWithTimeout(absl::Seconds(1)));
+  EXPECT_TRUE(fake_task_runner.SyncWithTimeout(absl::Seconds(1)));
   connection.reset();
   EXPECT_TRUE(notification.WaitForNotificationWithTimeout(absl::Seconds(1)));
   EXPECT_TRUE(called);
 }
 
 TEST(NearbyConnectionImpl, DestructorAfterReaderDestructor) {
-  FakeTaskRunner::ResetPendingTasksCount();
   FakeNearbyConnectionsManager connection_manager;
   FakeClock fake_clock;
   FakeTaskRunner fake_task_runner(&fake_clock, 1);
@@ -76,7 +74,7 @@ TEST(NearbyConnectionImpl, DestructorAfterReaderDestructor) {
         notification.Notify();
       });
 
-  EXPECT_TRUE(FakeTaskRunner::WaitForRunningTasksWithTimeout(absl::Seconds(1)));
+  EXPECT_TRUE(fake_task_runner.SyncWithTimeout(absl::Seconds(1)));
   frames_reader.reset();
   connection.reset();
   EXPECT_TRUE(notification.WaitForNotificationWithTimeout(absl::Seconds(1)));

sharing/nearby_sharing_settings_test.cc

@@ -118,7 +118,6 @@ class NearbyShareSettingsTest : public ::testing::Test {
  public:
   NearbyShareSettingsTest()
       : local_device_data_manager_(kDefaultDeviceName) {
-    FakeTaskRunner::ResetPendingTasksCount();
     prefs::RegisterNearbySharingPrefs(preference_manager_);
     nearby_share_settings_ = std::make_unique<NearbyShareSettings>(
         &context_, context_.GetClock(), fake_device_info_, preference_manager_,
@@ -146,7 +145,7 @@ class NearbyShareSettingsTest : public ::testing::Test {
   // Waits for running tasks to complete.
   void Flush() {
     absl::SleepFor(absl::Seconds(1));
-    FakeTaskRunner::WaitForRunningTasksWithTimeout(absl::Milliseconds(200));
+    context_.fake_task_runner()->SyncWithTimeout(absl::Milliseconds(200));
   }
 
   void FastForward(absl::Duration duration) {