mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Created NearbyFlags to avoid create multiple classes
PiperOrigin-RevId: 516885843
This commit is contained in:
committed by
Copybara-Service
parent
acf0f09a3f
commit
fd5430764f
+1
-1
@@ -439,7 +439,6 @@ let package = Package(
|
||||
"connections/implementation/wifi_direct_bwu_test.cc",
|
||||
"connections/implementation/wifi_hotspot_test.cc",
|
||||
"connections/implementation/analytics/analytics_recorder_test.cc",
|
||||
"connections/implementation/flags/connections_flags_test.cc",
|
||||
"connections/implementation/analytics/throughput_recorder_test.cc",
|
||||
"connections/implementation/mediums/ble_v2_test.cc",
|
||||
"connections/implementation/mediums/ble_v2/bloom_filter_test.cc",
|
||||
@@ -483,6 +482,7 @@ let package = Package(
|
||||
"internal/crypto/sha2_unittest.cc",
|
||||
"internal/crypto/signature_verifier_unittest.cc",
|
||||
"internal/crypto/symmetric_key_unittest.cc",
|
||||
"internal/flags/nearby_flags_test.cc",
|
||||
"internal/proto/analytics/connections_log_test.cc",
|
||||
"internal/platform/feature_flags_test.cc",
|
||||
"internal/platform/cancelable_alarm_test.cc",
|
||||
|
||||
@@ -32,6 +32,7 @@ lexan.cc_windows_dll(
|
||||
"//connections:core",
|
||||
"//connections/c",
|
||||
"//connections/implementation/flags:connections_flags",
|
||||
"//internal/flags:nearby_flags",
|
||||
"//internal/platform/implementation/windows",
|
||||
"//third_party/dart_lang/v2:dart_api_dl",
|
||||
"//third_party/webrtc/files/stable/webrtc/api:create_peerconnection_factory",
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
#include <string>
|
||||
|
||||
#include "connections/core.h"
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "connections/payload.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
#include "internal/platform/count_down_latch.h"
|
||||
#include "internal/platform/logging.h"
|
||||
|
||||
@@ -377,7 +377,7 @@ void EnableBleV2Dart(Core *pCore, int64_t enable, Dart_Port result_cb) {
|
||||
}
|
||||
port = result_cb;
|
||||
|
||||
connections::ConnectionsFlags::GetInstance().OverrideBoolFlagValue(
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
connections::config_package_nearby::nearby_connections_feature::
|
||||
kEnableBleV2,
|
||||
enable);
|
||||
|
||||
@@ -153,6 +153,7 @@ cc_library(
|
||||
"//connections/implementation/proto:offline_wire_formats_cc_proto",
|
||||
"//internal:device",
|
||||
"//internal/analytics:event_logger",
|
||||
"//internal/flags:nearby_flags",
|
||||
"//internal/platform:base",
|
||||
"//internal/platform:cancellation_flag",
|
||||
"//internal/platform:comm",
|
||||
@@ -261,6 +262,7 @@ cc_test(
|
||||
"//connections/implementation/mediums",
|
||||
"//connections/implementation/proto:offline_wire_formats_cc_proto",
|
||||
"//internal/analytics:event_logger",
|
||||
"//internal/flags:nearby_flags",
|
||||
"//internal/platform:base",
|
||||
"//internal/platform:comm",
|
||||
"//internal/platform:logging",
|
||||
|
||||
@@ -15,41 +15,15 @@ licenses(["notice"])
|
||||
|
||||
cc_library(
|
||||
name = "connections_flags",
|
||||
srcs = [
|
||||
"connections_flags.cc",
|
||||
],
|
||||
hdrs = [
|
||||
"connections_flags.h",
|
||||
"nearby_connections_feature_flags.h",
|
||||
],
|
||||
copts = [
|
||||
"-Ithird_party",
|
||||
],
|
||||
visibility = [
|
||||
"//connections:__subpackages__",
|
||||
"//internal/platform:__subpackages__",
|
||||
"//location/nearby/cpp:__subpackages__",
|
||||
],
|
||||
deps = [
|
||||
"//internal/flags:flag_reader",
|
||||
"//internal/platform:types",
|
||||
"@com_google_absl//absl/base:core_headers",
|
||||
"@com_google_absl//absl/container:flat_hash_map",
|
||||
"@com_google_absl//absl/strings",
|
||||
"@com_google_absl//absl/synchronization",
|
||||
],
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "connections_flags_test",
|
||||
srcs = ["connections_flags_test.cc"],
|
||||
deps = [
|
||||
":connections_flags",
|
||||
"//internal/flags:flag_reader",
|
||||
"//internal/platform/implementation/g3",
|
||||
"@com_github_protobuf_matchers//protobuf-matchers",
|
||||
"@com_google_absl//absl/strings",
|
||||
"@com_google_googletest//:gtest",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -42,6 +42,7 @@ cc_library(
|
||||
"//connections:core_types",
|
||||
"//connections/implementation/flags:connections_flags",
|
||||
"//connections/implementation/mediums:utils",
|
||||
"//internal/flags:nearby_flags",
|
||||
"//internal/platform:base",
|
||||
"//internal/platform:comm",
|
||||
"//internal/platform:logging",
|
||||
|
||||
@@ -20,12 +20,11 @@
|
||||
#include <utility>
|
||||
|
||||
#include "absl/strings/str_cat.h"
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
#include "internal/platform/base64_utils.h"
|
||||
#include "internal/platform/base_input_stream.h"
|
||||
#include "internal/platform/byte_array.h"
|
||||
#include "internal/platform/feature_flags.h"
|
||||
#include "internal/platform/logging.h"
|
||||
|
||||
namespace nearby {
|
||||
@@ -144,7 +143,7 @@ BleAdvertisementHeader::operator ByteArray() const {
|
||||
std::string(advertisement_hash_),
|
||||
std::string(psm_bytes));
|
||||
// clang-format on
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
return ByteArray(Base64Utils::Encode(ByteArray(std::move(out))));
|
||||
} else {
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
#include "connections/implementation/ble_v2_endpoint_channel.h"
|
||||
#include "connections/implementation/bluetooth_endpoint_channel.h"
|
||||
#include "connections/implementation/bwu_manager.h"
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "connections/implementation/mediums/utils.h"
|
||||
#include "connections/implementation/wifi_lan_endpoint_channel.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
#include "internal/platform/nsd_service_info.h"
|
||||
#include "internal/platform/types.h"
|
||||
#include "proto/connections_enums.pb.h"
|
||||
@@ -83,7 +83,7 @@ P2pClusterPcpHandler::GetConnectionMediumsByPriority() {
|
||||
if (bluetooth_medium_.IsAvailable()) {
|
||||
mediums.push_back(location::nearby::proto::connections::BLUETOOTH);
|
||||
}
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
if (ble_v2_medium_.IsAvailable()) {
|
||||
mediums.push_back(location::nearby::proto::connections::BLE);
|
||||
@@ -139,7 +139,7 @@ BasePcpHandler::StartOperationResult P2pClusterPcpHandler::StartAdvertisingImpl(
|
||||
}
|
||||
|
||||
if (advertising_options.allowed.ble) {
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
location::nearby::proto::connections::Medium ble_v2_medium =
|
||||
StartBleV2Advertising(client, service_id, local_endpoint_id,
|
||||
@@ -196,7 +196,7 @@ Status P2pClusterPcpHandler::StopAdvertisingImpl(ClientProxy* client) {
|
||||
|
||||
bluetooth_medium_.StopAcceptingConnections(client->GetAdvertisingServiceId());
|
||||
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
ble_v2_medium_.StopAdvertising(client->GetAdvertisingServiceId());
|
||||
ble_v2_medium_.StopAcceptingConnections(client->GetAdvertisingServiceId());
|
||||
@@ -966,7 +966,7 @@ BasePcpHandler::StartOperationResult P2pClusterPcpHandler::StartDiscoveryImpl(
|
||||
}
|
||||
|
||||
if (discovery_options.allowed.ble) {
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
location::nearby::proto::connections::Medium ble_v2_medium =
|
||||
StartBleV2Scanning(
|
||||
@@ -1035,7 +1035,7 @@ Status P2pClusterPcpHandler::StopDiscoveryImpl(ClientProxy* client) {
|
||||
<< bluetooth_classic_discoverer_client_id_;
|
||||
}
|
||||
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
|
||||
ble_v2_medium_.StopScanning(client->GetDiscoveryServiceId());
|
||||
} else {
|
||||
@@ -1086,7 +1086,7 @@ BasePcpHandler::ConnectImplResult P2pClusterPcpHandler::ConnectImpl(
|
||||
break;
|
||||
}
|
||||
case location::nearby::proto::connections::Medium::BLE: {
|
||||
if (ConnectionsFlags::GetInstance().GetBoolFlag(
|
||||
if (NearbyFlags::GetInstance().GetBoolFlag(
|
||||
config_package_nearby::nearby_connections_feature::
|
||||
kEnableBleV2)) {
|
||||
auto* ble_v2_endpoint = down_cast<BleV2Endpoint*>(endpoint);
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
#include "gtest/gtest.h"
|
||||
#include "absl/time/time.h"
|
||||
#include "connections/implementation/bwu_manager.h"
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "connections/implementation/injected_bluetooth_device_store.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
#include "internal/platform/count_down_latch.h"
|
||||
#include "internal/platform/logging.h"
|
||||
#include "internal/platform/medium_environment.h"
|
||||
@@ -69,7 +69,7 @@ class P2pClusterPcpHandlerTest
|
||||
protected:
|
||||
void SetUp() override {
|
||||
NEARBY_LOG(INFO, "SetUp: begin");
|
||||
ConnectionsFlags::GetInstance().OverrideBoolFlagValue(
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2,
|
||||
std::get<1>(GetParam()));
|
||||
if (advertising_options_.allowed.ble) {
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
#include "gtest/gtest.h"
|
||||
#include "absl/time/time.h"
|
||||
#include "connections/implementation/bwu_manager.h"
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "connections/implementation/injected_bluetooth_device_store.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
#include "internal/platform/count_down_latch.h"
|
||||
#include "internal/platform/logging.h"
|
||||
#include "internal/platform/medium_environment.h"
|
||||
@@ -78,7 +78,7 @@ class P2pPointToPointPcpHandlerTest
|
||||
protected:
|
||||
void SetUp() override {
|
||||
NEARBY_LOG(INFO, "SetUp: begin");
|
||||
ConnectionsFlags::GetInstance().OverrideBoolFlagValue(
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2,
|
||||
std::get<1>(GetParam()));
|
||||
if (advertising_options_.allowed.ble) {
|
||||
|
||||
@@ -24,3 +24,42 @@ cc_library(
|
||||
visibility = ["//:__subpackages__"],
|
||||
deps = ["@com_google_absl//absl/strings"],
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "nearby_flags",
|
||||
srcs = [
|
||||
"nearby_flags.cc",
|
||||
],
|
||||
hdrs = [
|
||||
"nearby_flags.h",
|
||||
],
|
||||
copts = [
|
||||
"-Ithird_party",
|
||||
],
|
||||
visibility = [
|
||||
"//:__subpackages__",
|
||||
"//location/nearby/cpp:__subpackages__",
|
||||
],
|
||||
deps = [
|
||||
":flag_reader",
|
||||
"//internal/platform:types",
|
||||
"@com_google_absl//absl/base:core_headers",
|
||||
"@com_google_absl//absl/container:flat_hash_map",
|
||||
"@com_google_absl//absl/strings",
|
||||
"@com_google_absl//absl/synchronization",
|
||||
],
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "nearby_flags_test",
|
||||
srcs = ["nearby_flags_test.cc"],
|
||||
deps = [
|
||||
":flag_reader",
|
||||
":nearby_flags",
|
||||
"//internal/platform/implementation/g3",
|
||||
"@com_github_protobuf_matchers//protobuf-matchers",
|
||||
"@com_google_absl//absl/strings",
|
||||
"@com_google_googletest//:gtest",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
)
|
||||
|
||||
+16
-18
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -20,14 +20,13 @@
|
||||
#include "internal/platform/mutex_lock.h"
|
||||
|
||||
namespace nearby {
|
||||
namespace connections {
|
||||
|
||||
ConnectionsFlags& ConnectionsFlags::GetInstance() {
|
||||
static ConnectionsFlags* sharing_flags = new ConnectionsFlags();
|
||||
NearbyFlags& NearbyFlags::GetInstance() {
|
||||
static NearbyFlags* sharing_flags = new NearbyFlags();
|
||||
return *sharing_flags;
|
||||
}
|
||||
|
||||
bool ConnectionsFlags::GetBoolFlag(const flags::Flag<bool>& flag) {
|
||||
bool NearbyFlags::GetBoolFlag(const flags::Flag<bool>& flag) {
|
||||
MutexLock lock(&mutex_);
|
||||
|
||||
const auto& it = overrided_bool_flag_values_.find(flag.name());
|
||||
@@ -41,7 +40,7 @@ bool ConnectionsFlags::GetBoolFlag(const flags::Flag<bool>& flag) {
|
||||
return default_flag_reader_.GetBoolFlag(flag);
|
||||
}
|
||||
|
||||
int64_t ConnectionsFlags::GetInt64Flag(const flags::Flag<int64_t>& flag) {
|
||||
int64_t NearbyFlags::GetInt64Flag(const flags::Flag<int64_t>& flag) {
|
||||
MutexLock lock(&mutex_);
|
||||
|
||||
const auto& it = overrided_int64_flag_values_.find(flag.name());
|
||||
@@ -55,7 +54,7 @@ int64_t ConnectionsFlags::GetInt64Flag(const flags::Flag<int64_t>& flag) {
|
||||
return default_flag_reader_.GetInt64Flag(flag);
|
||||
}
|
||||
|
||||
double ConnectionsFlags::GetDoubleFlag(const flags::Flag<double>& flag) {
|
||||
double NearbyFlags::GetDoubleFlag(const flags::Flag<double>& flag) {
|
||||
MutexLock lock(&mutex_);
|
||||
|
||||
const auto& it = overrided_double_flag_values_.find(flag.name());
|
||||
@@ -69,7 +68,7 @@ double ConnectionsFlags::GetDoubleFlag(const flags::Flag<double>& flag) {
|
||||
return default_flag_reader_.GetDoubleFlag(flag);
|
||||
}
|
||||
|
||||
std::string ConnectionsFlags::GetStringFlag(
|
||||
std::string NearbyFlags::GetStringFlag(
|
||||
const flags::Flag<absl::string_view>& flag) {
|
||||
MutexLock lock(&mutex_);
|
||||
|
||||
@@ -84,36 +83,36 @@ std::string ConnectionsFlags::GetStringFlag(
|
||||
return default_flag_reader_.GetStringFlag(flag);
|
||||
}
|
||||
|
||||
void ConnectionsFlags::SetFlagReader(flags::FlagReader& flag_reader) {
|
||||
void NearbyFlags::SetFlagReader(flags::FlagReader& flag_reader) {
|
||||
MutexLock lock(&mutex_);
|
||||
flag_reader_ = &flag_reader;
|
||||
}
|
||||
|
||||
void ConnectionsFlags::OverrideBoolFlagValue(const flags::Flag<bool>& flag,
|
||||
bool new_value) {
|
||||
void NearbyFlags::OverrideBoolFlagValue(const flags::Flag<bool>& flag,
|
||||
bool new_value) {
|
||||
MutexLock lock(&mutex_);
|
||||
overrided_bool_flag_values_[flag.name()] = new_value;
|
||||
}
|
||||
|
||||
void ConnectionsFlags::OverrideInt64FlagValue(const flags::Flag<int64_t>& flag,
|
||||
int64_t new_value) {
|
||||
void NearbyFlags::OverrideInt64FlagValue(const flags::Flag<int64_t>& flag,
|
||||
int64_t new_value) {
|
||||
MutexLock lock(&mutex_);
|
||||
overrided_int64_flag_values_[flag.name()] = new_value;
|
||||
}
|
||||
|
||||
void ConnectionsFlags::OverrideDoubleFlagValue(const flags::Flag<double>& flag,
|
||||
double new_value) {
|
||||
void NearbyFlags::OverrideDoubleFlagValue(const flags::Flag<double>& flag,
|
||||
double new_value) {
|
||||
MutexLock lock(&mutex_);
|
||||
overrided_double_flag_values_[flag.name()] = new_value;
|
||||
}
|
||||
|
||||
void ConnectionsFlags::OverrideStringFlagValue(
|
||||
void NearbyFlags::OverrideStringFlagValue(
|
||||
const flags::Flag<absl::string_view>& flag, absl::string_view new_value) {
|
||||
MutexLock lock(&mutex_);
|
||||
overrided_string_flag_values_[flag.name()] = std::string(new_value);
|
||||
}
|
||||
|
||||
void ConnectionsFlags::ResetOverridedValues() {
|
||||
void NearbyFlags::ResetOverridedValues() {
|
||||
MutexLock lock(&mutex_);
|
||||
overrided_bool_flag_values_.clear();
|
||||
overrided_int64_flag_values_.clear();
|
||||
@@ -121,5 +120,4 @@ void ConnectionsFlags::ResetOverridedValues() {
|
||||
overrided_string_flag_values_.clear();
|
||||
}
|
||||
|
||||
} // namespace connections
|
||||
} // namespace nearby
|
||||
+7
-10
@@ -12,26 +12,24 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef THIRD_PARTY_NEARBY_CONNECTIONS_IMPLEMENTATION_FLAGS_CONNECTIONS_FLAGS_H_
|
||||
#define THIRD_PARTY_NEARBY_CONNECTIONS_IMPLEMENTATION_FLAGS_CONNECTIONS_FLAGS_H_
|
||||
#ifndef THIRD_PARTY_NEARBY_INTERNAL_FLAGS_NEARBY_FLAGS_H_
|
||||
#define THIRD_PARTY_NEARBY_INTERNAL_FLAGS_NEARBY_FLAGS_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "connections/implementation/flags/nearby_connections_feature_flags.h"
|
||||
#include "internal/flags/default_flag_reader.h"
|
||||
#include "internal/flags/flag_reader.h"
|
||||
#include "internal/platform/mutex.h"
|
||||
|
||||
namespace nearby {
|
||||
namespace connections {
|
||||
|
||||
class ConnectionsFlags : public nearby::flags::FlagReader {
|
||||
class NearbyFlags final : public nearby::flags::FlagReader {
|
||||
public:
|
||||
~ConnectionsFlags() override = default;
|
||||
~NearbyFlags() override = default;
|
||||
|
||||
static ConnectionsFlags& GetInstance();
|
||||
static NearbyFlags& GetInstance();
|
||||
|
||||
// Reads flag with boolean value.
|
||||
bool GetBoolFlag(const flags::Flag<bool>& flag) override
|
||||
@@ -71,7 +69,7 @@ class ConnectionsFlags : public nearby::flags::FlagReader {
|
||||
void ResetOverridedValues() ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
|
||||
private:
|
||||
ConnectionsFlags() = default;
|
||||
NearbyFlags() = default;
|
||||
|
||||
flags::FlagReader* flag_reader_ = nullptr;
|
||||
flags::DefaultFlagReader default_flag_reader_;
|
||||
@@ -90,7 +88,6 @@ class ConnectionsFlags : public nearby::flags::FlagReader {
|
||||
ABSL_GUARDED_BY(mutex_);
|
||||
};
|
||||
|
||||
} // namespace connections
|
||||
} // namespace nearby
|
||||
|
||||
#endif // THIRD_PARTY_NEARBY_CONNECTIONS_IMPLEMENTATION_FLAGS_CONNECTIONS_FLAGS_H_
|
||||
#endif // THIRD_PARTY_NEARBY_INTERNAL_FLAGS_NEARBY_FLAGS_H_
|
||||
+26
-28
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "connections/implementation/flags/connections_flags.h"
|
||||
#include "internal/flags/nearby_flags.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
@@ -27,7 +27,6 @@
|
||||
#include "internal/flags/flag_reader.h"
|
||||
|
||||
namespace nearby {
|
||||
namespace connections {
|
||||
namespace {
|
||||
|
||||
constexpr auto kTestBoolFlag =
|
||||
@@ -55,67 +54,66 @@ class MockFlagReader : public flags::FlagReader {
|
||||
(const flags::Flag<absl::string_view>& flag), (override));
|
||||
};
|
||||
|
||||
TEST(ConnectionsFlags, GetDefaultValues) {
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
TEST(NearbyFlags, GetDefaultValues) {
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
kTestBoolFlag.default_value());
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
kTestInt64Flag.default_value());
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
kTestDoubleFlag.default_value());
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
kTestStringFlag.default_value());
|
||||
}
|
||||
|
||||
TEST(ConnectionsFlags, OverrideDefaultValues) {
|
||||
ConnectionsFlags::GetInstance().OverrideBoolFlagValue(kTestBoolFlag,
|
||||
kTestBoolFlagTestValue);
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
TEST(NearbyFlags, OverrideDefaultValues) {
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(kTestBoolFlag,
|
||||
kTestBoolFlagTestValue);
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
kTestBoolFlagTestValue);
|
||||
ConnectionsFlags::GetInstance().OverrideInt64FlagValue(
|
||||
kTestInt64Flag, kTestInt64FlagTestValue);
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
NearbyFlags::GetInstance().OverrideInt64FlagValue(kTestInt64Flag,
|
||||
kTestInt64FlagTestValue);
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
kTestInt64FlagTestValue);
|
||||
ConnectionsFlags::GetInstance().OverrideDoubleFlagValue(
|
||||
kTestDoubleFlag, kTestDoubleFlagTestValue);
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
NearbyFlags::GetInstance().OverrideDoubleFlagValue(kTestDoubleFlag,
|
||||
kTestDoubleFlagTestValue);
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
kTestDoubleFlagTestValue);
|
||||
ConnectionsFlags::GetInstance().OverrideStringFlagValue(
|
||||
kTestStringFlag, kTestStringFlagTestValue);
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
NearbyFlags::GetInstance().OverrideStringFlagValue(kTestStringFlag,
|
||||
kTestStringFlagTestValue);
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
kTestStringFlagTestValue);
|
||||
ConnectionsFlags::GetInstance().ResetOverridedValues();
|
||||
NearbyFlags::GetInstance().ResetOverridedValues();
|
||||
}
|
||||
|
||||
TEST(ConnectionsFlags, SetFlagReader) {
|
||||
TEST(NearbyFlags, SetFlagReader) {
|
||||
auto flag_reader = std::make_unique<::testing::NiceMock<MockFlagReader>>();
|
||||
ConnectionsFlags::GetInstance().SetFlagReader(*flag_reader.get());
|
||||
NearbyFlags::GetInstance().SetFlagReader(*flag_reader.get());
|
||||
EXPECT_CALL(*flag_reader, GetBoolFlag(::testing::_))
|
||||
.WillOnce(::testing::Invoke([=](const flags::Flag<bool>& flag) {
|
||||
return kTestBoolFlagTestValue;
|
||||
}));
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetBoolFlag(kTestBoolFlag),
|
||||
kTestBoolFlagTestValue);
|
||||
EXPECT_CALL(*flag_reader, GetInt64Flag(::testing::_))
|
||||
.WillOnce(::testing::Invoke([=](const flags::Flag<int64_t>& flag) {
|
||||
return kTestInt64FlagTestValue;
|
||||
}));
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetInt64Flag(kTestInt64Flag),
|
||||
kTestInt64FlagTestValue);
|
||||
EXPECT_CALL(*flag_reader, GetDoubleFlag(::testing::_))
|
||||
.WillOnce(::testing::Invoke([=](const flags::Flag<double>& flag) {
|
||||
return kTestDoubleFlagTestValue;
|
||||
}));
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetDoubleFlag(kTestDoubleFlag),
|
||||
kTestDoubleFlagTestValue);
|
||||
EXPECT_CALL(*flag_reader, GetStringFlag(::testing::_))
|
||||
.WillOnce(
|
||||
::testing::Invoke([=](const flags::Flag<absl::string_view>& flag) {
|
||||
return std::string(kTestStringFlagTestValue);
|
||||
}));
|
||||
EXPECT_EQ(ConnectionsFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
EXPECT_EQ(NearbyFlags::GetInstance().GetStringFlag(kTestStringFlag),
|
||||
kTestStringFlagTestValue);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace connections
|
||||
} // namespace nearby
|
||||
@@ -349,6 +349,7 @@ cc_library(
|
||||
visibility = [
|
||||
"//connections:__subpackages__",
|
||||
"//fastpair:__subpackages__",
|
||||
"//internal/flags:__subpackages__",
|
||||
"//internal/platform/implementation/windows:__subpackages__",
|
||||
"//location/nearby/cpp:__subpackages__",
|
||||
"//location/nearby/testing/nearby_native:__subpackages__",
|
||||
|
||||
@@ -127,6 +127,7 @@ cc_library(
|
||||
"//connections:__subpackages__",
|
||||
"//fastpair:__subpackages__",
|
||||
"//internal:__pkg__",
|
||||
"//internal/flags:__subpackages__",
|
||||
"//internal/network:__subpackages__",
|
||||
"//internal/platform:__subpackages__",
|
||||
"//internal/proto/analytics:__subpackages__",
|
||||
|
||||
Reference in New Issue
Block a user