TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Hotspot and WFD unit tests when cancellation flag is enabled

Browse Source 
PiperOrigin-RevId: 522643865
This commit is contained in:
hai007
2023-04-07 11:29:31 -07:00
committed by Copybara-Service
parent 11158cb426
commit 82b9cb50fa
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/wifi_direct_bwu_test.cc
+10 -4
View File
@@ -18,6 +18,7 @@
#include "gtest/gtest.h"
#include "connections/implementation/bwu_handler.h"
#include "connections/implementation/wifi_direct_bwu_handler.h"
#include "internal/platform/feature_flags.h"
#include "internal/platform/medium_environment.h"
namespace nearby {
@@ -50,7 +51,7 @@ TEST_F(WifiDirectTest, CanCreateBwuHandler) {
handler.reset();
}
TEST_F(WifiDirectTest, SoftAPBWUInit_STACreateEndpointChannel) {
TEST_F(WifiDirectTest, WFDGOBWUInit_GCCreateEndpointChannel) {
CountDownLatch start_latch(1);
CountDownLatch accept_latch(1);
CountDownLatch end_latch(1);
@@ -108,9 +109,14 @@ TEST_F(WifiDirectTest, SoftAPBWUInit_STACreateEndpointChannel) {
handler_2->CreateUpgradedEndpointChannel(
&wifi_direct_gc, /*service_id=*/"A",
/*endpoint_id=*/"1", bwu_frame.upgrade_path_info());
EXPECT_TRUE(accept_latch.Await(kWaitDuration).result());
EXPECT_EQ(new_channel->GetMedium(),
location::nearby::proto::connections::Medium::WIFI_DIRECT);
if (!FeatureFlags::GetInstance().GetFlags().enable_cancellation_flag) {
EXPECT_TRUE(accept_latch.Await(kWaitDuration).result());
EXPECT_EQ(new_channel->GetMedium(),
location::nearby::proto::connections::Medium::WIFI_DIRECT);
} else {
accept_latch.CountDown();
EXPECT_EQ(new_channel, nullptr);
}
EXPECT_TRUE(mediums_2.GetWifiDirect().IsConnectedToGO());
handler_2->RevertResponderState(/*service_id=*/"A");
end_latch.CountDown();
connections/implementation/wifi_hotspot_test.cc
+13 -4
View File
@@ -17,6 +17,7 @@
#include "gtest/gtest.h"
#include "connections/implementation/bwu_handler.h"
#include "connections/implementation/wifi_hotspot_bwu_handler.h"
#include "internal/platform/feature_flags.h"
#include "internal/platform/medium_environment.h"
namespace nearby {
@@ -96,7 +97,7 @@ TEST_F(WifiHotspotTest, SoftAPBWUInit_STACreateEndpointChannel) {
std::make_unique<WifiHotspotBwuHandler>(mediums_2, notifications_2);
client_executor.Execute([&handler_2, &client_2, &upgrade_frame, &accept_latch,
&end_latch]() {
&end_latch, &mediums_2]() {
auto bwu_frame =
upgrade_frame.result().v1().bandwidth_upgrade_negotiation();
@@ -104,14 +105,22 @@ TEST_F(WifiHotspotTest, SoftAPBWUInit_STACreateEndpointChannel) {
handler_2->CreateUpgradedEndpointChannel(&client_2, /*service_id=*/"A",
/*endpoint_id=*/"1",
bwu_frame.upgrade_path_info());
EXPECT_TRUE(accept_latch.Await(kWaitDuration).result());
EXPECT_EQ(new_channel->GetMedium(),
location::nearby::proto::connections::Medium::WIFI_HOTSPOT);
if (!FeatureFlags::GetInstance().GetFlags().enable_cancellation_flag) {
EXPECT_TRUE(accept_latch.Await(kWaitDuration).result());
EXPECT_EQ(new_channel->GetMedium(),
location::nearby::proto::connections::Medium::WIFI_HOTSPOT);
} else {
accept_latch.CountDown();
EXPECT_EQ(new_channel, nullptr);
}
EXPECT_TRUE(mediums_2.GetWifiHotspot().IsConnectedToHotspot());
handler_2->RevertResponderState(/*service_id=*/"A");
end_latch.CountDown();
});
EXPECT_TRUE(accept_latch.Await(kWaitDuration).result());
EXPECT_TRUE(end_latch.Await(kWaitDuration).result());
EXPECT_FALSE(mediums_2.GetWifiHotspot().IsConnectedToHotspot());
}
} // namespace connections