diff --git a/connections/implementation/mediums/ble_test.cc b/connections/implementation/mediums/ble_test.cc index ea60ad18..1116d5db 100644 --- a/connections/implementation/mediums/ble_test.cc +++ b/connections/implementation/mediums/ble_test.cc @@ -20,10 +20,10 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/mediums/bluetooth_radio.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/ble.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" namespace location { namespace nearby { @@ -50,8 +50,6 @@ class BleTest : public ::testing::TestWithParam { protected: using DiscoveredPeripheralCallback = BleMedium::DiscoveredPeripheralCallback; - BleTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/connections/implementation/mediums/ble_v2_test.cc b/connections/implementation/mediums/ble_v2_test.cc index c320ac3a..f9d8195a 100644 --- a/connections/implementation/mediums/ble_v2_test.cc +++ b/connections/implementation/mediums/ble_v2_test.cc @@ -47,8 +47,6 @@ constexpr absl::string_view kAdvertisementString = "\x0a\x0b\x0c\x0d"; class BleV2Test : public testing::TestWithParam { protected: - BleV2Test() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/connections/implementation/mediums/bluetooth_classic_test.cc b/connections/implementation/mediums/bluetooth_classic_test.cc index 56018bb8..e898cf39 100644 --- a/connections/implementation/mediums/bluetooth_classic_test.cc +++ b/connections/implementation/mediums/bluetooth_classic_test.cc @@ -21,10 +21,10 @@ #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/mediums/bluetooth_radio.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/bluetooth_classic.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" #include "internal/platform/system_clock.h" namespace location { @@ -51,7 +51,6 @@ class BluetoothClassicTest : public ::testing::TestWithParam { BluetoothClassicTest() { env_.Start(); - env_.Reset(); radio_a_ = std::make_unique(); radio_b_ = std::make_unique(); bt_a_ = std::make_unique(*radio_a_); @@ -72,7 +71,6 @@ class BluetoothClassicTest : public ::testing::TestWithParam { env_.Sync(false); radio_a_.reset(); radio_b_.reset(); - env_.Reset(); env_.Stop(); } diff --git a/connections/implementation/mediums/webrtc/connection_flow_test.cc b/connections/implementation/mediums/webrtc/connection_flow_test.cc index 340be228..5421abf4 100644 --- a/connections/implementation/mediums/webrtc/connection_flow_test.cc +++ b/connections/implementation/mediums/webrtc/connection_flow_test.cc @@ -24,8 +24,8 @@ #include "connections/implementation/mediums/webrtc/session_description_wrapper.h" #include "connections/implementation/mediums/webrtc_socket.h" #include "internal/platform/byte_array.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/count_down_latch.h" +#include "internal/platform/medium_environment.h" #include "internal/platform/webrtc.h" #include "webrtc/api/data_channel_interface.h" #include "webrtc/api/jsep.h" @@ -41,9 +41,9 @@ namespace { class ConnectionFlowTest : public ::testing::Test { protected: ConnectionFlowTest() { - MediumEnvironment::Instance().Stop(); MediumEnvironment::Instance().Start({.webrtc_enabled = true}); } + ~ConnectionFlowTest() override { MediumEnvironment::Instance().Stop(); } }; std::unique_ptr CopyCandidate( diff --git a/connections/implementation/mediums/webrtc_test.cc b/connections/implementation/mediums/webrtc_test.cc index dc919cee..6534e59d 100644 --- a/connections/implementation/mediums/webrtc_test.cc +++ b/connections/implementation/mediums/webrtc_test.cc @@ -47,8 +47,6 @@ class WebRtcTest : public ::testing::TestWithParam { using MockAcceptedCallback = testing::MockFunction; - WebRtcTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/connections/implementation/mediums/wifi_lan_test.cc b/connections/implementation/mediums/wifi_lan_test.cc index 883bad98..310f57fc 100644 --- a/connections/implementation/mediums/wifi_lan_test.cc +++ b/connections/implementation/mediums/wifi_lan_test.cc @@ -20,10 +20,10 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" -#include "internal/platform/medium_environment.h" -#include "internal/platform/nsd_service_info.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" +#include "internal/platform/nsd_service_info.h" #include "internal/platform/wifi_lan.h" namespace location { @@ -52,8 +52,6 @@ class WifiLanTest : public ::testing::TestWithParam { protected: using DiscoveredServiceCallback = WifiLanMedium::DiscoveredServiceCallback; - WifiLanTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/connections/implementation/offline_service_controller_test.cc b/connections/implementation/offline_service_controller_test.cc index 23d48310..6d49ec21 100644 --- a/connections/implementation/offline_service_controller_test.cc +++ b/connections/implementation/offline_service_controller_test.cc @@ -20,10 +20,10 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/offline_simulation_user.h" -#include "internal/platform/medium_environment.h" -#include "internal/platform/output_stream.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" +#include "internal/platform/output_stream.h" #include "internal/platform/pipe.h" #include "internal/platform/system_clock.h" @@ -75,8 +75,6 @@ constexpr BooleanMediumSelector kTestCases[] = { class OfflineServiceControllerTest : public ::testing::TestWithParam { protected: - OfflineServiceControllerTest() { env_.Stop(); } - bool SetupConnection(OfflineSimulationUser& user_a, OfflineSimulationUser& user_b) { user_a.StartAdvertising(std::string(kServiceId), &connect_latch_); diff --git a/connections/implementation/p2p_cluster_pcp_handler_test.cc b/connections/implementation/p2p_cluster_pcp_handler_test.cc index b04601e3..d278e8a5 100644 --- a/connections/implementation/p2p_cluster_pcp_handler_test.cc +++ b/connections/implementation/p2p_cluster_pcp_handler_test.cc @@ -68,7 +68,6 @@ class P2pClusterPcpHandlerTest protected: void SetUp() override { NEARBY_LOG(INFO, "SetUp: begin"); - env_.Stop(); FeatureFlags::GetMutableFlagsForTesting().support_ble_v2 = std::get<1>(GetParam()); if (advertising_options_.allowed.ble) { diff --git a/connections/implementation/payload_manager_test.cc b/connections/implementation/payload_manager_test.cc index 6b5df1d4..8d7c52ec 100644 --- a/connections/implementation/payload_manager_test.cc +++ b/connections/implementation/payload_manager_test.cc @@ -100,8 +100,6 @@ class PayloadSimulationUser : public SimulationUser { class PayloadManagerTest : public ::testing::TestWithParam { protected: - PayloadManagerTest() { env_.Stop(); } - bool SetupConnection(PayloadSimulationUser& user_a, PayloadSimulationUser& user_b) { user_a.StartAdvertising(std::string(kServiceId), &connection_latch_); diff --git a/connections/implementation/pcp_manager_test.cc b/connections/implementation/pcp_manager_test.cc index 1e271a94..89a1854d 100644 --- a/connections/implementation/pcp_manager_test.cc +++ b/connections/implementation/pcp_manager_test.cc @@ -23,8 +23,8 @@ #include "absl/time/time.h" #include "connections/implementation/endpoint_channel_manager.h" #include "connections/implementation/simulation_user.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/count_down_latch.h" +#include "internal/platform/medium_environment.h" namespace location { namespace nearby { @@ -67,8 +67,6 @@ constexpr BooleanMediumSelector kTestCases[] = { class PcpManagerTest : public ::testing::TestWithParam { protected: - PcpManagerTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/connections/implementation/wifi_hotspot_test.cc b/connections/implementation/wifi_hotspot_test.cc index 1ca3ba74..34ce443d 100644 --- a/connections/implementation/wifi_hotspot_test.cc +++ b/connections/implementation/wifi_hotspot_test.cc @@ -29,10 +29,7 @@ constexpr absl::Duration kWaitDuration = absl::Milliseconds(1000); class WifiHotspotTest : public testing::Test { protected: - WifiHotspotTest() { - env_.Stop(); - env_.Start(); - } + WifiHotspotTest() { env_.Start(); } ~WifiHotspotTest() override { env_.Stop(); } MediumEnvironment& env_{MediumEnvironment::Instance()}; diff --git a/internal/platform/ble_test.cc b/internal/platform/ble_test.cc index abe4ca63..57b3300f 100644 --- a/internal/platform/ble_test.cc +++ b/internal/platform/ble_test.cc @@ -19,9 +19,9 @@ #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" namespace location { namespace nearby { @@ -48,8 +48,6 @@ class BleMediumTest : public ::testing::TestWithParam { using DiscoveredPeripheralCallback = BleMedium::DiscoveredPeripheralCallback; using AcceptedConnectionCallback = BleMedium::AcceptedConnectionCallback; - BleMediumTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/internal/platform/ble_v2_test.cc b/internal/platform/ble_v2_test.cc index 9ba7e432..70ad2292 100644 --- a/internal/platform/ble_v2_test.cc +++ b/internal/platform/ble_v2_test.cc @@ -69,8 +69,6 @@ class BlePeripheralStub : public api::ble_v2::BlePeripheral { class BleV2MediumTest : public ::testing::TestWithParam { protected: - BleV2MediumTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; diff --git a/internal/platform/bluetooth_classic_test.cc b/internal/platform/bluetooth_classic_test.cc index dce7e8f4..7012069a 100644 --- a/internal/platform/bluetooth_classic_test.cc +++ b/internal/platform/bluetooth_classic_test.cc @@ -20,10 +20,10 @@ #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" -#include "internal/platform/medium_environment.h" #include "internal/platform/bluetooth_adapter.h" #include "internal/platform/count_down_latch.h" #include "internal/platform/logging.h" +#include "internal/platform/medium_environment.h" #include "internal/platform/single_thread_executor.h" namespace location { @@ -47,7 +47,6 @@ class BluetoothClassicMediumTest using DiscoveryCallback = BluetoothClassicMedium::DiscoveryCallback; BluetoothClassicMediumTest() { env_.Start(); - env_.Reset(); adapter_a_ = std::make_unique(); adapter_b_ = std::make_unique(); bt_a_ = std::make_unique(*adapter_a_); @@ -67,7 +66,6 @@ class BluetoothClassicMediumTest env_.Sync(false); adapter_a_.reset(); adapter_b_.reset(); - env_.Reset(); env_.Stop(); } diff --git a/internal/platform/medium_environment.h b/internal/platform/medium_environment.h index 81796656..172f6d5d 100644 --- a/internal/platform/medium_environment.h +++ b/internal/platform/medium_environment.h @@ -436,7 +436,7 @@ class MediumEnvironment { void RunOnMediumEnvironmentThread(std::function runnable); - std::atomic_bool enabled_ = true; + std::atomic_bool enabled_ = false; std::atomic_int job_count_ = 0; std::atomic_bool enable_notifications_ = false; SingleThreadExecutor executor_; diff --git a/internal/platform/wifi_direct_test.cc b/internal/platform/wifi_direct_test.cc index b0e8ca51..4f67675b 100644 --- a/internal/platform/wifi_direct_test.cc +++ b/internal/platform/wifi_direct_test.cc @@ -48,10 +48,7 @@ constexpr absl::Duration kWaitDuration = absl::Milliseconds(100); class WifiDirectMediumTest : public testing::TestWithParam { protected: - WifiDirectMediumTest() { - env_.Stop(); - env_.Start(); - } + WifiDirectMediumTest() { env_.Start(); } ~WifiDirectMediumTest() override { absl::SleepFor(kWaitDuration); EXPECT_TRUE(env_.IsWifiDirectMediumsEmpty()); diff --git a/internal/platform/wifi_lan_test.cc b/internal/platform/wifi_lan_test.cc index 74df9844..aadfa957 100644 --- a/internal/platform/wifi_lan_test.cc +++ b/internal/platform/wifi_lan_test.cc @@ -50,8 +50,6 @@ class WifiLanMediumTest : public ::testing::TestWithParam { protected: using DiscoveredServiceCallback = WifiLanMedium::DiscoveredServiceCallback; - WifiLanMediumTest() { env_.Stop(); } - MediumEnvironment& env_{MediumEnvironment::Instance()}; }; @@ -377,8 +375,7 @@ TEST_F(WifiLanMediumTest, CanDiscoverMultipleAdvertisementsOnSameService) { NsdServiceInfo nsd_service_info_1; nsd_service_info_1.SetServiceName("service1"); - nsd_service_info_1.SetTxtRecord(std::string(kEndpointInfoKey), - "endpoint1"); + nsd_service_info_1.SetTxtRecord(std::string(kEndpointInfoKey), "endpoint1"); nsd_service_info_1.SetServiceType(service_type); // Setup second advertising device. @@ -388,8 +385,7 @@ TEST_F(WifiLanMediumTest, CanDiscoverMultipleAdvertisementsOnSameService) { NsdServiceInfo nsd_service_info_2; nsd_service_info_2.SetServiceName("service2"); - nsd_service_info_2.SetTxtRecord(std::string(kEndpointInfoKey), - "endpoint2"); + nsd_service_info_2.SetTxtRecord(std::string(kEndpointInfoKey), "endpoint2"); nsd_service_info_2.SetServiceType(service_type); EXPECT_TRUE(wifi_lan_advertising_1.StartAdvertising(nsd_service_info_1)); @@ -399,7 +395,6 @@ TEST_F(WifiLanMediumTest, CanDiscoverMultipleAdvertisementsOnSameService) { EXPECT_TRUE(wifi_lan_advertising_2.StopAdvertising(nsd_service_info_2)); EXPECT_TRUE(lost_latch.Await(kWaitDuration).result()); - // Stop to descovery EXPECT_TRUE(wifi_lan_discovery.StopDiscovery(service_type)); env_.Stop(); diff --git a/presence/implementation/mediums/ble_test.cc b/presence/implementation/mediums/ble_test.cc index 208cae56..6fa3ec0c 100644 --- a/presence/implementation/mediums/ble_test.cc +++ b/presence/implementation/mediums/ble_test.cc @@ -87,7 +87,6 @@ class BleTest : public testing::TestWithParam { }; protected: - BleTest() { env_.Stop(); } absl::optional GetBleStatus(const Ble& ble) { return env_.GetBleV2MediumStatus(*ble.GetImpl()); } diff --git a/presence/presence_client_test.cc b/presence/presence_client_test.cc index 511d656e..c94ac48b 100644 --- a/presence/presence_client_test.cc +++ b/presence/presence_client_test.cc @@ -26,7 +26,6 @@ namespace { class PresenceClientTest : public testing::Test { protected: - PresenceClientTest() { env_.Stop(); } location::nearby::MediumEnvironment& env_{ location::nearby::MediumEnvironment::Instance()}; }; diff --git a/presence/presence_service_test.cc b/presence/presence_service_test.cc index d239d7eb..0b6e213a 100644 --- a/presence/presence_service_test.cc +++ b/presence/presence_service_test.cc @@ -25,7 +25,6 @@ namespace { class PresenceServiceTest : public testing::Test { protected: - PresenceServiceTest() { env_.Stop(); } location::nearby::MediumEnvironment& env_{ location::nearby::MediumEnvironment::Instance()}; };