shill: rename CellularCapabilityGSM to CellularCapabilityGsm
The C++ style guide pefers acronyms to be capitalized as single words
(i.e. CellularCapabilityGsm instead of CellularCapabilityGSM).
BUG=None
TEST=Run unit tests.
Change-Id: Ic167a28d4a0b6f45a4382cfb2b84fb1b599dd281
Reviewed-on: https://chromium-review.googlesource.com/761704
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
diff --git a/cellular/cellular.h b/cellular/cellular.h
index cdf01ad..bc92269 100644
--- a/cellular/cellular.h
+++ b/cellular/cellular.h
@@ -329,7 +329,7 @@
friend class CellularTest;
friend class CellularCapabilityClassicTest;
friend class CellularCapabilityCdmaTest;
- friend class CellularCapabilityGSMTest;
+ friend class CellularCapabilityGsmTest;
friend class CellularCapabilityUniversalTest;
friend class CellularCapabilityUniversalCdmaTest;
friend class CellularServiceTest;
diff --git a/cellular/cellular_capability.cc b/cellular/cellular_capability.cc
index bd154cf..c843379 100644
--- a/cellular/cellular_capability.cc
+++ b/cellular/cellular_capability.cc
@@ -59,7 +59,7 @@
Cellular::Type type, Cellular* cellular, ModemInfo* modem_info) {
switch (type) {
case Cellular::kTypeGSM:
- return std::make_unique<CellularCapabilityGSM>(cellular, modem_info);
+ return std::make_unique<CellularCapabilityGsm>(cellular, modem_info);
case Cellular::kTypeCdma:
return std::make_unique<CellularCapabilityCdma>(cellular, modem_info);
diff --git a/cellular/cellular_capability.h b/cellular/cellular_capability.h
index a225b3b..a0cd52a 100644
--- a/cellular/cellular_capability.h
+++ b/cellular/cellular_capability.h
@@ -58,7 +58,7 @@
// |
// |-- CellularCapabilityClassic
// |
-// |-- CellularCapabilityGSM
+// |-- CellularCapabilityGsm
// |
// |-- CellularCapabilityCdma
//
@@ -300,7 +300,7 @@
static void OnUnsupportedOperation(const char* operation, Error* error);
private:
- friend class CellularCapabilityGSMTest;
+ friend class CellularCapabilityGsmTest;
friend class CellularCapabilityClassicTest;
friend class CellularCapabilityUniversalTest;
friend class CellularCapabilityUniversalCdmaTest;
diff --git a/cellular/cellular_capability_classic.h b/cellular/cellular_capability_classic.h
index 73a8e43..30e197e 100644
--- a/cellular/cellular_capability_classic.h
+++ b/cellular/cellular_capability_classic.h
@@ -125,7 +125,7 @@
friend class CellularTest;
friend class CellularCapabilityCdmaTest;
friend class CellularCapabilityClassicTest;
- friend class CellularCapabilityGSMTest;
+ friend class CellularCapabilityGsmTest;
FRIEND_TEST(CellularCapabilityClassicTest, EnableModemFail);
FRIEND_TEST(CellularCapabilityClassicTest, EnableModemSucceed);
FRIEND_TEST(CellularCapabilityClassicTest, FinishEnable);
diff --git a/cellular/cellular_capability_classic_unittest.cc b/cellular/cellular_capability_classic_unittest.cc
index 3102111..1ce38ef 100644
--- a/cellular/cellular_capability_classic_unittest.cc
+++ b/cellular/cellular_capability_classic_unittest.cc
@@ -118,8 +118,8 @@
cellular_->service_ = service;
}
- CellularCapabilityGSM* GetGsmCapability() {
- return static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+ CellularCapabilityGsm* GetGsmCapability() {
+ return static_cast<CellularCapabilityGsm*>(cellular_->capability_.get());
}
void ReleaseCapabilityProxies() {
@@ -194,8 +194,8 @@
const string& /*path*/,
const string& /*service*/) override {
// TODO(benchan): This code conditionally returns a nullptr to avoid
- // CellularCapabilityGSM::InitProperties (and thus
- // CellularCapabilityGSM::GetIMSI) from being called during the
+ // CellularCapabilityGsm::InitProperties (and thus
+ // CellularCapabilityGsm::GetIMSI) from being called during the
// construction. Remove this workaround after refactoring the tests.
if (test_->create_gsm_card_proxy_from_factory_) {
return std::move(test_->gsm_card_proxy_);
@@ -227,8 +227,8 @@
}
void SetGSMNetworkProxy() {
- CellularCapabilityGSM* gsm_capability =
- static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+ CellularCapabilityGsm* gsm_capability =
+ static_cast<CellularCapabilityGsm*>(cellular_->capability_.get());
gsm_capability->network_proxy_ = std::move(gsm_network_proxy_);
}
@@ -356,7 +356,7 @@
}
cellular_->state_ = Cellular::kStateConnected;
- static_cast<CellularCapabilityGSM*>(capability_)->registration_state_ =
+ static_cast<CellularCapabilityGsm*>(capability_)->registration_state_ =
MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING;
cellular_->SetAllowRoaming(true, nullptr);
EXPECT_TRUE(cellular_->GetAllowRoaming(nullptr));
@@ -423,7 +423,7 @@
Error error;
Stringmap apn_info;
KeyValueStore props;
- CellularCapabilityGSM* gsm_capability = GetGsmCapability();
+ CellularCapabilityGsm* gsm_capability = GetGsmCapability();
apn_info[kApnProperty] = kLastGoodApn;
apn_info[kApnUsernameProperty] = kLastGoodUsername;
diff --git a/cellular/cellular_capability_gsm.cc b/cellular/cellular_capability_gsm.cc
index 7f321f3..88c1f29 100644
--- a/cellular/cellular_capability_gsm.cc
+++ b/cellular/cellular_capability_gsm.cc
@@ -40,31 +40,31 @@
namespace Logging {
static auto kModuleLogScope = ScopeLogger::kCellular;
-static string ObjectID(CellularCapabilityGSM* c) {
+static string ObjectID(CellularCapabilityGsm* c) {
return c->cellular()->GetRpcIdentifier();
}
}
// static
-const char CellularCapabilityGSM::kNetworkPropertyAccessTechnology[] =
+const char CellularCapabilityGsm::kNetworkPropertyAccessTechnology[] =
"access-tech";
-const char CellularCapabilityGSM::kNetworkPropertyID[] = "operator-num";
-const char CellularCapabilityGSM::kNetworkPropertyLongName[] = "operator-long";
-const char CellularCapabilityGSM::kNetworkPropertyShortName[] =
+const char CellularCapabilityGsm::kNetworkPropertyID[] = "operator-num";
+const char CellularCapabilityGsm::kNetworkPropertyLongName[] = "operator-long";
+const char CellularCapabilityGsm::kNetworkPropertyShortName[] =
"operator-short";
-const char CellularCapabilityGSM::kNetworkPropertyStatus[] = "status";
-const char CellularCapabilityGSM::kPhoneNumber[] = "*99#";
-const char CellularCapabilityGSM::kPropertyAccessTechnology[] =
+const char CellularCapabilityGsm::kNetworkPropertyStatus[] = "status";
+const char CellularCapabilityGsm::kPhoneNumber[] = "*99#";
+const char CellularCapabilityGsm::kPropertyAccessTechnology[] =
"AccessTechnology";
-const char CellularCapabilityGSM::kPropertyEnabledFacilityLocks[] =
+const char CellularCapabilityGsm::kPropertyEnabledFacilityLocks[] =
"EnabledFacilityLocks";
-const char CellularCapabilityGSM::kPropertyUnlockRequired[] = "UnlockRequired";
-const char CellularCapabilityGSM::kPropertyUnlockRetries[] = "UnlockRetries";
+const char CellularCapabilityGsm::kPropertyUnlockRequired[] = "UnlockRequired";
+const char CellularCapabilityGsm::kPropertyUnlockRetries[] = "UnlockRetries";
-const int CellularCapabilityGSM::kGetIMSIRetryLimit = 40;
-const int64_t CellularCapabilityGSM::kGetIMSIRetryDelayMilliseconds = 500;
+const int CellularCapabilityGsm::kGetIMSIRetryLimit = 40;
+const int64_t CellularCapabilityGsm::kGetIMSIRetryDelayMilliseconds = 500;
-CellularCapabilityGSM::CellularCapabilityGSM(Cellular* cellular,
+CellularCapabilityGsm::CellularCapabilityGsm(Cellular* cellular,
ModemInfo* modem_info)
: CellularCapabilityClassic(cellular, modem_info),
mobile_operator_info_(
@@ -78,7 +78,7 @@
SLOG(this, 2) << "Cellular capability constructed: GSM";
mobile_operator_info_->Init();
HelpRegisterConstDerivedKeyValueStore(
- kSIMLockStatusProperty, &CellularCapabilityGSM::SimLockStatusToProperty);
+ kSIMLockStatusProperty, &CellularCapabilityGsm::SimLockStatusToProperty);
this->cellular()->set_scanning_supported(true);
// TODO(benchan): This is a hack to initialize the GSM card proxy for GetIMSI
@@ -91,19 +91,19 @@
cellular->dbus_path(), cellular->dbus_service());
// TODO(benchan): To allow unit testing using a mock proxy without further
// complicating the code, the test proxy factory is set up to return a nullptr
- // pointer when CellularCapabilityGSM is constructed. Refactor the code to
+ // pointer when CellularCapabilityGsm is constructed. Refactor the code to
// avoid this hack.
if (card_proxy_.get())
InitProperties();
}
-CellularCapabilityGSM::~CellularCapabilityGSM() {}
+CellularCapabilityGsm::~CellularCapabilityGsm() {}
-string CellularCapabilityGSM::GetTypeString() const {
+string CellularCapabilityGsm::GetTypeString() const {
return kTechnologyFamilyGsm;
}
-KeyValueStore CellularCapabilityGSM::SimLockStatusToProperty(Error* /*error*/) {
+KeyValueStore CellularCapabilityGsm::SimLockStatusToProperty(Error* /*error*/) {
KeyValueStore status;
status.SetBool(kSIMLockEnabledProperty, sim_lock_status_.enabled);
status.SetString(kSIMLockTypeProperty, sim_lock_status_.lock_type);
@@ -111,17 +111,17 @@
return status;
}
-void CellularCapabilityGSM::HelpRegisterConstDerivedKeyValueStore(
+void CellularCapabilityGsm::HelpRegisterConstDerivedKeyValueStore(
const string& name,
- KeyValueStore(CellularCapabilityGSM::*get)(Error* error)) {
+ KeyValueStore(CellularCapabilityGsm::*get)(Error* error)) {
cellular()->mutable_store()->RegisterDerivedKeyValueStore(
name,
KeyValueStoreAccessor(
- new CustomAccessor<CellularCapabilityGSM, KeyValueStore>(
+ new CustomAccessor<CellularCapabilityGsm, KeyValueStore>(
this, get, nullptr)));
}
-void CellularCapabilityGSM::InitProxies() {
+void CellularCapabilityGsm::InitProxies() {
CellularCapabilityClassic::InitProxies();
// TODO(benchan): Remove this check after refactoring the proxy
// initialization.
@@ -132,70 +132,70 @@
network_proxy_ = control_interface()->CreateModemGSMNetworkProxy(
cellular()->dbus_path(), cellular()->dbus_service());
network_proxy_->set_signal_quality_callback(
- Bind(&CellularCapabilityGSM::OnSignalQualitySignal,
+ Bind(&CellularCapabilityGsm::OnSignalQualitySignal,
weak_ptr_factory_.GetWeakPtr()));
network_proxy_->set_network_mode_callback(
- Bind(&CellularCapabilityGSM::OnNetworkModeSignal,
+ Bind(&CellularCapabilityGsm::OnNetworkModeSignal,
weak_ptr_factory_.GetWeakPtr()));
network_proxy_->set_registration_info_callback(
- Bind(&CellularCapabilityGSM::OnRegistrationInfoSignal,
+ Bind(&CellularCapabilityGsm::OnRegistrationInfoSignal,
weak_ptr_factory_.GetWeakPtr()));
}
-void CellularCapabilityGSM::InitProperties() {
+void CellularCapabilityGsm::InitProperties() {
CellularTaskList* tasks = new CellularTaskList();
ResultCallback cb_ignore_error =
- Bind(&CellularCapabilityGSM::StepCompletedCallback,
+ Bind(&CellularCapabilityGsm::StepCompletedCallback,
weak_ptr_factory_.GetWeakPtr(), ResultCallback(), true, tasks);
// Chrome checks if a SIM is present before allowing the modem to be enabled,
// so shill needs to obtain IMSI, as an indicator of SIM presence, even
// before the device is enabled.
- tasks->push_back(Bind(&CellularCapabilityGSM::GetIMSI,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetIMSI,
weak_ptr_factory_.GetWeakPtr(), cb_ignore_error));
RunNextStep(tasks);
}
-void CellularCapabilityGSM::StartModem(Error* error,
+void CellularCapabilityGsm::StartModem(Error* error,
const ResultCallback& callback) {
InitProxies();
CellularTaskList* tasks = new CellularTaskList();
ResultCallback cb =
- Bind(&CellularCapabilityGSM::StepCompletedCallback,
+ Bind(&CellularCapabilityGsm::StepCompletedCallback,
weak_ptr_factory_.GetWeakPtr(), callback, false, tasks);
ResultCallback cb_ignore_error =
- Bind(&CellularCapabilityGSM::StepCompletedCallback,
+ Bind(&CellularCapabilityGsm::StepCompletedCallback,
weak_ptr_factory_.GetWeakPtr(), callback, true, tasks);
if (!cellular()->IsUnderlyingDeviceEnabled())
- tasks->push_back(Bind(&CellularCapabilityGSM::EnableModem,
+ tasks->push_back(Bind(&CellularCapabilityGsm::EnableModem,
weak_ptr_factory_.GetWeakPtr(), cb));
// If we're within range of the home network, the modem will try to
// register once it's enabled, or may be already registered if we
// started out enabled.
if (!IsUnderlyingDeviceRegistered() &&
!cellular()->selected_network().empty())
- tasks->push_back(Bind(&CellularCapabilityGSM::Register,
+ tasks->push_back(Bind(&CellularCapabilityGsm::Register,
weak_ptr_factory_.GetWeakPtr(), cb));
- tasks->push_back(Bind(&CellularCapabilityGSM::GetIMEI,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetIMEI,
weak_ptr_factory_.GetWeakPtr(), cb));
get_imsi_retries_ = 0;
- tasks->push_back(Bind(&CellularCapabilityGSM::GetIMSI,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetIMSI,
weak_ptr_factory_.GetWeakPtr(), cb));
- tasks->push_back(Bind(&CellularCapabilityGSM::GetSPN,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetSPN,
weak_ptr_factory_.GetWeakPtr(), cb_ignore_error));
- tasks->push_back(Bind(&CellularCapabilityGSM::GetMSISDN,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetMSISDN,
weak_ptr_factory_.GetWeakPtr(), cb_ignore_error));
- tasks->push_back(Bind(&CellularCapabilityGSM::GetProperties,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetProperties,
weak_ptr_factory_.GetWeakPtr(), cb));
- tasks->push_back(Bind(&CellularCapabilityGSM::GetModemInfo,
+ tasks->push_back(Bind(&CellularCapabilityGsm::GetModemInfo,
weak_ptr_factory_.GetWeakPtr(), cb_ignore_error));
- tasks->push_back(Bind(&CellularCapabilityGSM::FinishEnable,
+ tasks->push_back(Bind(&CellularCapabilityGsm::FinishEnable,
weak_ptr_factory_.GetWeakPtr(), cb));
RunNextStep(tasks);
}
-bool CellularCapabilityGSM::IsUnderlyingDeviceRegistered() const {
+bool CellularCapabilityGsm::IsUnderlyingDeviceRegistered() const {
switch (cellular()->modem_state()) {
case Cellular::kModemStateFailed:
case Cellular::kModemStateUnknown:
@@ -216,19 +216,19 @@
return false;
}
-void CellularCapabilityGSM::ReleaseProxies() {
+void CellularCapabilityGsm::ReleaseProxies() {
SLOG(this, 2) << __func__;
CellularCapabilityClassic::ReleaseProxies();
card_proxy_.reset();
network_proxy_.reset();
}
-bool CellularCapabilityGSM::AreProxiesInitialized() const {
+bool CellularCapabilityGsm::AreProxiesInitialized() const {
return (CellularCapabilityClassic::AreProxiesInitialized() &&
card_proxy_.get() && network_proxy_.get());
}
-void CellularCapabilityGSM::OnServiceCreated() {
+void CellularCapabilityGsm::OnServiceCreated() {
cellular()->service()->SetActivationState(kActivationStateActivated);
}
@@ -239,7 +239,7 @@
// - the list of APNs found in the mobile broadband provider DB for the
// home provider associated with the current SIM
// - as a last resort, attempt to connect with no APN
-void CellularCapabilityGSM::SetupApnTryList() {
+void CellularCapabilityGsm::SetupApnTryList() {
apn_try_list_.clear();
DCHECK(cellular()->service().get());
@@ -256,13 +256,13 @@
cellular()->apn_list().end());
}
-void CellularCapabilityGSM::SetupConnectProperties(
+void CellularCapabilityGsm::SetupConnectProperties(
KeyValueStore* properties) {
SetupApnTryList();
FillConnectPropertyMap(properties);
}
-void CellularCapabilityGSM::FillConnectPropertyMap(
+void CellularCapabilityGsm::FillConnectPropertyMap(
KeyValueStore* properties) {
properties->SetString(kConnectPropertyPhoneNumber, kPhoneNumber);
@@ -284,17 +284,17 @@
}
}
-void CellularCapabilityGSM::Connect(const KeyValueStore& properties,
+void CellularCapabilityGsm::Connect(const KeyValueStore& properties,
Error* error,
const ResultCallback& callback) {
SLOG(this, 2) << __func__;
- ResultCallback cb = Bind(&CellularCapabilityGSM::OnConnectReply,
+ ResultCallback cb = Bind(&CellularCapabilityGsm::OnConnectReply,
weak_ptr_factory_.GetWeakPtr(),
callback);
simple_proxy_->Connect(properties, error, cb, kTimeoutConnect);
}
-void CellularCapabilityGSM::OnConnectReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnConnectReply(const ResultCallback& callback,
const Error& error) {
CellularServiceRefPtr service = cellular()->service();
if (!service) {
@@ -326,12 +326,12 @@
}
// always called from an async context
-void CellularCapabilityGSM::GetIMEI(const ResultCallback& callback) {
+void CellularCapabilityGsm::GetIMEI(const ResultCallback& callback) {
SLOG(this, 2) << __func__;
CHECK(!callback.is_null());
Error error;
if (cellular()->imei().empty()) {
- GSMIdentifierCallback cb = Bind(&CellularCapabilityGSM::OnGetIMEIReply,
+ GSMIdentifierCallback cb = Bind(&CellularCapabilityGsm::OnGetIMEIReply,
weak_ptr_factory_.GetWeakPtr(), callback);
card_proxy_->GetIMEI(&error, cb, kTimeoutDefault);
if (error.IsFailure())
@@ -343,12 +343,12 @@
}
// always called from an async context
-void CellularCapabilityGSM::GetIMSI(const ResultCallback& callback) {
+void CellularCapabilityGsm::GetIMSI(const ResultCallback& callback) {
SLOG(this, 2) << __func__;
CHECK(!callback.is_null());
Error error;
if (cellular()->imsi().empty()) {
- GSMIdentifierCallback cb = Bind(&CellularCapabilityGSM::OnGetIMSIReply,
+ GSMIdentifierCallback cb = Bind(&CellularCapabilityGsm::OnGetIMSIReply,
weak_ptr_factory_.GetWeakPtr(),
callback);
card_proxy_->GetIMSI(&error, cb, kTimeoutDefault);
@@ -363,12 +363,12 @@
}
// always called from an async context
-void CellularCapabilityGSM::GetSPN(const ResultCallback& callback) {
+void CellularCapabilityGsm::GetSPN(const ResultCallback& callback) {
SLOG(this, 2) << __func__;
CHECK(!callback.is_null());
Error error;
if (spn_.empty()) {
- GSMIdentifierCallback cb = Bind(&CellularCapabilityGSM::OnGetSPNReply,
+ GSMIdentifierCallback cb = Bind(&CellularCapabilityGsm::OnGetSPNReply,
weak_ptr_factory_.GetWeakPtr(),
callback);
card_proxy_->GetSPN(&error, cb, kTimeoutDefault);
@@ -381,13 +381,13 @@
}
// always called from an async context
-void CellularCapabilityGSM::GetMSISDN(const ResultCallback& callback) {
+void CellularCapabilityGsm::GetMSISDN(const ResultCallback& callback) {
SLOG(this, 2) << __func__;
CHECK(!callback.is_null());
Error error;
string mdn = cellular()->mdn();
if (mdn.empty()) {
- GSMIdentifierCallback cb = Bind(&CellularCapabilityGSM::OnGetMSISDNReply,
+ GSMIdentifierCallback cb = Bind(&CellularCapabilityGsm::OnGetMSISDNReply,
weak_ptr_factory_.GetWeakPtr(),
callback);
card_proxy_->GetMSISDN(&error, cb, kTimeoutDefault);
@@ -399,23 +399,23 @@
}
}
-void CellularCapabilityGSM::GetSignalQuality() {
+void CellularCapabilityGsm::GetSignalQuality() {
SLOG(this, 2) << __func__;
SignalQualityCallback callback =
- Bind(&CellularCapabilityGSM::OnGetSignalQualityReply,
+ Bind(&CellularCapabilityGsm::OnGetSignalQualityReply,
weak_ptr_factory_.GetWeakPtr());
network_proxy_->GetSignalQuality(nullptr, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::GetRegistrationState() {
+void CellularCapabilityGsm::GetRegistrationState() {
SLOG(this, 2) << __func__;
RegistrationInfoCallback callback =
- Bind(&CellularCapabilityGSM::OnGetRegistrationInfoReply,
+ Bind(&CellularCapabilityGsm::OnGetRegistrationInfoReply,
weak_ptr_factory_.GetWeakPtr());
network_proxy_->GetRegistrationInfo(nullptr, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::GetProperties(const ResultCallback& callback) {
+void CellularCapabilityGsm::GetProperties(const ResultCallback& callback) {
SLOG(this, 2) << __func__;
// TODO(petkov): Switch to asynchronous calls (crbug.com/200687).
@@ -432,12 +432,12 @@
}
// always called from an async context
-void CellularCapabilityGSM::Register(const ResultCallback& callback) {
+void CellularCapabilityGsm::Register(const ResultCallback& callback) {
SLOG(this, 2) << __func__ << " \"" << cellular()->selected_network()
<< "\"";
CHECK(!callback.is_null());
Error error;
- ResultCallback cb = Bind(&CellularCapabilityGSM::OnRegisterReply,
+ ResultCallback cb = Bind(&CellularCapabilityGsm::OnRegisterReply,
weak_ptr_factory_.GetWeakPtr(), callback);
network_proxy_->Register(cellular()->selected_network(), &error, cb,
kTimeoutRegister);
@@ -445,19 +445,19 @@
callback.Run(error);
}
-void CellularCapabilityGSM::RegisterOnNetwork(
+void CellularCapabilityGsm::RegisterOnNetwork(
const string& network_id,
Error* error,
const ResultCallback& callback) {
SLOG(this, 2) << __func__ << "(" << network_id << ")";
CHECK(error);
desired_network_ = network_id;
- ResultCallback cb = Bind(&CellularCapabilityGSM::OnRegisterReply,
+ ResultCallback cb = Bind(&CellularCapabilityGsm::OnRegisterReply,
weak_ptr_factory_.GetWeakPtr(), callback);
network_proxy_->Register(network_id, error, cb, kTimeoutRegister);
}
-void CellularCapabilityGSM::OnRegisterReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnRegisterReply(const ResultCallback& callback,
const Error& error) {
SLOG(this, 2) << __func__ << "(" << error << ")";
@@ -479,12 +479,12 @@
callback.Run(error);
}
-bool CellularCapabilityGSM::IsRegistered() const {
+bool CellularCapabilityGsm::IsRegistered() const {
return (registration_state_ == MM_MODEM_GSM_NETWORK_REG_STATUS_HOME ||
registration_state_ == MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING);
}
-void CellularCapabilityGSM::SetUnregistered(bool searching) {
+void CellularCapabilityGsm::SetUnregistered(bool searching) {
// If we're already in some non-registered state, don't override that
if (registration_state_ == MM_MODEM_GSM_NETWORK_REG_STATUS_HOME ||
registration_state_ == MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING) {
@@ -494,21 +494,21 @@
}
}
-void CellularCapabilityGSM::RequirePIN(
+void CellularCapabilityGsm::RequirePIN(
const std::string& pin, bool require,
Error* error, const ResultCallback& callback) {
CHECK(error);
card_proxy_->EnablePIN(pin, require, error, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::EnterPIN(const string& pin,
+void CellularCapabilityGsm::EnterPIN(const string& pin,
Error* error,
const ResultCallback& callback) {
CHECK(error);
card_proxy_->SendPIN(pin, error, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::UnblockPIN(const string& unblock_code,
+void CellularCapabilityGsm::UnblockPIN(const string& unblock_code,
const string& pin,
Error* error,
const ResultCallback& callback) {
@@ -516,21 +516,21 @@
card_proxy_->SendPUK(unblock_code, pin, error, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::ChangePIN(
+void CellularCapabilityGsm::ChangePIN(
const string& old_pin, const string& new_pin,
Error* error, const ResultCallback& callback) {
CHECK(error);
card_proxy_->ChangePIN(old_pin, new_pin, error, callback, kTimeoutDefault);
}
-void CellularCapabilityGSM::Scan(Error* error,
+void CellularCapabilityGsm::Scan(Error* error,
const ResultStringmapsCallback& callback) {
- ScanResultsCallback cb = Bind(&CellularCapabilityGSM::OnScanReply,
+ ScanResultsCallback cb = Bind(&CellularCapabilityGsm::OnScanReply,
weak_ptr_factory_.GetWeakPtr(), callback);
network_proxy_->Scan(error, cb, kTimeoutScan);
}
-void CellularCapabilityGSM::OnScanReply(
+void CellularCapabilityGsm::OnScanReply(
const ResultStringmapsCallback& callback,
const GSMScanResults& results,
const Error& error) {
@@ -540,7 +540,7 @@
callback.Run(found_networks, error);
}
-Stringmap CellularCapabilityGSM::ParseScanResult(const GSMScanResult& result) {
+Stringmap CellularCapabilityGsm::ParseScanResult(const GSMScanResult& result) {
Stringmap parsed;
for (const auto& property_key_value_pair : result) {
const string& property_key = property_key_value_pair.first;
@@ -608,14 +608,14 @@
return parsed;
}
-void CellularCapabilityGSM::SetAccessTechnology(uint32_t access_technology) {
+void CellularCapabilityGsm::SetAccessTechnology(uint32_t access_technology) {
access_technology_ = access_technology;
if (cellular()->service().get()) {
cellular()->service()->SetNetworkTechnology(GetNetworkTechnologyString());
}
}
-string CellularCapabilityGSM::GetNetworkTechnologyString() const {
+string CellularCapabilityGsm::GetNetworkTechnologyString() const {
switch (access_technology_) {
case MM_MODEM_GSM_ACCESS_TECH_GSM:
case MM_MODEM_GSM_ACCESS_TECH_GSM_COMPACT:
@@ -638,7 +638,7 @@
return "";
}
-string CellularCapabilityGSM::GetRoamingStateString() const {
+string CellularCapabilityGsm::GetRoamingStateString() const {
switch (registration_state_) {
case MM_MODEM_GSM_NETWORK_REG_STATUS_HOME:
return kRoamingStateHome;
@@ -650,7 +650,7 @@
return kRoamingStateUnknown;
}
-void CellularCapabilityGSM::OnPropertiesChanged(
+void CellularCapabilityGsm::OnPropertiesChanged(
const string& interface,
const KeyValueStore& properties,
const vector<string>& invalidated_properties) {
@@ -691,12 +691,12 @@
}
}
-void CellularCapabilityGSM::OnNetworkModeSignal(uint32_t /*mode*/) {
+void CellularCapabilityGsm::OnNetworkModeSignal(uint32_t /*mode*/) {
// TODO(petkov): Implement this.
NOTIMPLEMENTED();
}
-void CellularCapabilityGSM::OnRegistrationInfoSignal(
+void CellularCapabilityGsm::OnRegistrationInfoSignal(
uint32_t status, const string& operator_code, const string& operator_name) {
SLOG(this, 2) << __func__ << ": regstate=" << status
<< ", opercode=" << operator_code
@@ -707,24 +707,24 @@
cellular()->HandleNewRegistrationState();
}
-void CellularCapabilityGSM::OnSignalQualitySignal(uint32_t quality) {
+void CellularCapabilityGsm::OnSignalQualitySignal(uint32_t quality) {
cellular()->HandleNewSignalQuality(quality);
}
-void CellularCapabilityGSM::OnGetRegistrationInfoReply(
+void CellularCapabilityGsm::OnGetRegistrationInfoReply(
uint32_t status, const string& operator_code, const string& operator_name,
const Error& error) {
if (error.IsSuccess())
OnRegistrationInfoSignal(status, operator_code, operator_name);
}
-void CellularCapabilityGSM::OnGetSignalQualityReply(uint32_t quality,
+void CellularCapabilityGsm::OnGetSignalQualityReply(uint32_t quality,
const Error& error) {
if (error.IsSuccess())
OnSignalQualitySignal(quality);
}
-void CellularCapabilityGSM::OnGetIMEIReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnGetIMEIReply(const ResultCallback& callback,
const string& imei,
const Error& error) {
if (error.IsSuccess()) {
@@ -736,7 +736,7 @@
callback.Run(error);
}
-void CellularCapabilityGSM::OnGetIMSIReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnGetIMSIReply(const ResultCallback& callback,
const string& imsi,
const Error& error) {
if (error.IsSuccess()) {
@@ -756,7 +756,7 @@
cellular()->set_sim_present(false);
if (get_imsi_retries_++ < kGetIMSIRetryLimit) {
SLOG(this, 2) << "GetIMSI failed - " << error << ". Retrying";
- base::Closure retry_get_imsi_cb = Bind(&CellularCapabilityGSM::GetIMSI,
+ base::Closure retry_get_imsi_cb = Bind(&CellularCapabilityGsm::GetIMSI,
weak_ptr_factory_.GetWeakPtr(),
callback);
cellular()->dispatcher()->PostDelayedTask(
@@ -771,7 +771,7 @@
}
}
-void CellularCapabilityGSM::OnGetSPNReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnGetSPNReply(const ResultCallback& callback,
const string& spn,
const Error& error) {
if (error.IsSuccess()) {
@@ -784,7 +784,7 @@
callback.Run(error);
}
-void CellularCapabilityGSM::OnGetMSISDNReply(const ResultCallback& callback,
+void CellularCapabilityGsm::OnGetMSISDNReply(const ResultCallback& callback,
const string& msisdn,
const Error& error) {
if (error.IsSuccess()) {
diff --git a/cellular/cellular_capability_gsm.h b/cellular/cellular_capability_gsm.h
index 24daa22..9fb2c43 100644
--- a/cellular/cellular_capability_gsm.h
+++ b/cellular/cellular_capability_gsm.h
@@ -39,10 +39,10 @@
class ModemInfo;
-class CellularCapabilityGSM : public CellularCapabilityClassic {
+class CellularCapabilityGsm : public CellularCapabilityClassic {
public:
- CellularCapabilityGSM(Cellular* cellular, ModemInfo* modem_info);
- ~CellularCapabilityGSM() override;
+ CellularCapabilityGsm(Cellular* cellular, ModemInfo* modem_info);
+ ~CellularCapabilityGsm() override;
// Inherited from CellularCapability.
std::string GetTypeString() const override;
@@ -105,23 +105,23 @@
private:
friend class CellularTest;
- friend class CellularCapabilityGSMTest;
+ friend class CellularCapabilityGsmTest;
friend class CellularCapabilityClassicTest;
- FRIEND_TEST(CellularCapabilityGSMTest, GetIMEI);
- FRIEND_TEST(CellularCapabilityGSMTest, GetIMSI);
- FRIEND_TEST(CellularCapabilityGSMTest, GetIMSIFails);
- FRIEND_TEST(CellularCapabilityGSMTest, GetMSISDN);
- FRIEND_TEST(CellularCapabilityGSMTest, GetSPN);
- FRIEND_TEST(CellularCapabilityGSMTest, RequirePIN);
- FRIEND_TEST(CellularCapabilityGSMTest, EnterPIN);
- FRIEND_TEST(CellularCapabilityGSMTest, UnblockPIN);
- FRIEND_TEST(CellularCapabilityGSMTest, ChangePIN);
- FRIEND_TEST(CellularCapabilityGSMTest, ParseScanResult);
- FRIEND_TEST(CellularCapabilityGSMTest, ParseScanResultProviderLookup);
- FRIEND_TEST(CellularCapabilityGSMTest, RegisterOnNetwork);
- FRIEND_TEST(CellularCapabilityGSMTest, SetAccessTechnology);
- FRIEND_TEST(CellularCapabilityGSMTest, GetRegistrationState);
- FRIEND_TEST(CellularCapabilityGSMTest, OnPropertiesChanged);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetIMEI);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetIMSI);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetIMSIFails);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetMSISDN);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetSPN);
+ FRIEND_TEST(CellularCapabilityGsmTest, RequirePIN);
+ FRIEND_TEST(CellularCapabilityGsmTest, EnterPIN);
+ FRIEND_TEST(CellularCapabilityGsmTest, UnblockPIN);
+ FRIEND_TEST(CellularCapabilityGsmTest, ChangePIN);
+ FRIEND_TEST(CellularCapabilityGsmTest, ParseScanResult);
+ FRIEND_TEST(CellularCapabilityGsmTest, ParseScanResultProviderLookup);
+ FRIEND_TEST(CellularCapabilityGsmTest, RegisterOnNetwork);
+ FRIEND_TEST(CellularCapabilityGsmTest, SetAccessTechnology);
+ FRIEND_TEST(CellularCapabilityGsmTest, GetRegistrationState);
+ FRIEND_TEST(CellularCapabilityGsmTest, OnPropertiesChanged);
FRIEND_TEST(CellularCapabilityClassicTest, AllowRoaming);
FRIEND_TEST(CellularCapabilityClassicTest, TryApns);
FRIEND_TEST(CellularTest, ScanAsynchronousFailure);
@@ -168,7 +168,7 @@
void HelpRegisterConstDerivedKeyValueStore(
const std::string& name,
- KeyValueStore(CellularCapabilityGSM::*get)(Error* error));
+ KeyValueStore(CellularCapabilityGsm::*get)(Error* error));
bool IsUnderlyingDeviceRegistered() const;
@@ -228,9 +228,9 @@
std::deque<Stringmap> apn_try_list_;
SimLockStatus sim_lock_status_;
- base::WeakPtrFactory<CellularCapabilityGSM> weak_ptr_factory_;
+ base::WeakPtrFactory<CellularCapabilityGsm> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(CellularCapabilityGSM);
+ DISALLOW_COPY_AND_ASSIGN(CellularCapabilityGsm);
};
} // namespace shill
diff --git a/cellular/cellular_capability_gsm_unittest.cc b/cellular/cellular_capability_gsm_unittest.cc
index 7ebe463..6be1e2f 100644
--- a/cellular/cellular_capability_gsm_unittest.cc
+++ b/cellular/cellular_capability_gsm_unittest.cc
@@ -51,9 +51,9 @@
namespace shill {
-class CellularCapabilityGSMTest : public testing::Test {
+class CellularCapabilityGsmTest : public testing::Test {
public:
- CellularCapabilityGSMTest()
+ CellularCapabilityGsmTest()
: control_interface_(this),
modem_info_(&control_interface_, &dispatcher_, nullptr, nullptr),
create_card_proxy_from_factory_(false),
@@ -76,7 +76,7 @@
Technology::kCellular);
}
- ~CellularCapabilityGSMTest() override {
+ ~CellularCapabilityGsmTest() override {
cellular_->service_ = nullptr;
capability_ = nullptr;
device_adaptor_ = nullptr;
@@ -84,7 +84,7 @@
void SetUp() override {
capability_ =
- static_cast<CellularCapabilityGSM*>(cellular_->capability_.get());
+ static_cast<CellularCapabilityGsm*>(cellular_->capability_.get());
device_adaptor_ =
static_cast<DeviceMockAdaptor*>(cellular_->adaptor());
}
@@ -187,7 +187,7 @@
class TestControl : public MockControl {
public:
- explicit TestControl(CellularCapabilityGSMTest* test) : test_(test) {}
+ explicit TestControl(CellularCapabilityGsmTest* test) : test_(test) {}
std::unique_ptr<ModemProxyInterface> CreateModemProxy(
const string& /*path*/,
@@ -205,8 +205,8 @@
const string& /*path*/,
const string& /*service*/) override {
// TODO(benchan): This code conditionally returns a nullptr to avoid
- // CellularCapabilityGSM::InitProperties (and thus
- // CellularCapabilityGSM::GetIMSI) from being called during the
+ // CellularCapabilityGsm::InitProperties (and thus
+ // CellularCapabilityGsm::GetIMSI) from being called during the
// construction. Remove this workaround after refactoring the tests.
if (test_->create_card_proxy_from_factory_) {
return std::move(test_->card_proxy_);
@@ -221,7 +221,7 @@
}
private:
- CellularCapabilityGSMTest* test_;
+ CellularCapabilityGsmTest* test_;
};
void SetCardProxy() {
@@ -283,18 +283,18 @@
SetupCommonProxiesExpectations();
EXPECT_CALL(*proxy_, Enable(_, _, _, CellularCapability::kTimeoutEnable))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeEnable));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeEnable));
EXPECT_CALL(*card_proxy_,
GetIMEI(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetIMEI));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetIMEI));
EXPECT_CALL(*card_proxy_,
GetIMSI(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetIMSI));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetIMSI));
EXPECT_CALL(*network_proxy_, AccessTechnology());
EXPECT_CALL(*card_proxy_, EnabledFacilityLocks());
EXPECT_CALL(*proxy_,
GetModemInfo(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetModemInfo));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetModemInfo));
EXPECT_CALL(*network_proxy_,
GetRegistrationInfo(_, _, CellularCapability::kTimeoutDefault));
EXPECT_CALL(*network_proxy_,
@@ -319,7 +319,7 @@
std::unique_ptr<MockModemSimpleProxy> simple_proxy_;
std::unique_ptr<MockModemGSMCardProxy> card_proxy_;
std::unique_ptr<MockModemGSMNetworkProxy> network_proxy_;
- CellularCapabilityGSM* capability_; // Owned by |cellular_|.
+ CellularCapabilityGsm* capability_; // Owned by |cellular_|.
DeviceMockAdaptor* device_adaptor_; // Owned by |cellular_|.
CellularRefPtr cellular_;
@@ -328,42 +328,42 @@
MockMobileOperatorInfo* mock_serving_operator_info_;
};
-const char CellularCapabilityGSMTest::kAddress[] = "1122334455";
-const char CellularCapabilityGSMTest::kTestMobileProviderDBPath[] =
+const char CellularCapabilityGsmTest::kAddress[] = "1122334455";
+const char CellularCapabilityGsmTest::kTestMobileProviderDBPath[] =
"provider_db_unittest.bfd";
-const char CellularCapabilityGSMTest::kTestCarrier[] = "The Cellular Carrier";
-const char CellularCapabilityGSMTest::kTestNetwork[] = "310555";
-const char CellularCapabilityGSMTest::kPIN[] = "9876";
-const char CellularCapabilityGSMTest::kPUK[] = "8765";
-const char CellularCapabilityGSMTest::kIMEI[] = "987654321098765";
-const char CellularCapabilityGSMTest::kIMSI[] = "310150123456789";
-const char CellularCapabilityGSMTest::kMSISDN[] = "12345678901";
-const int CellularCapabilityGSMTest::kStrength = 80;
+const char CellularCapabilityGsmTest::kTestCarrier[] = "The Cellular Carrier";
+const char CellularCapabilityGsmTest::kTestNetwork[] = "310555";
+const char CellularCapabilityGsmTest::kPIN[] = "9876";
+const char CellularCapabilityGsmTest::kPUK[] = "8765";
+const char CellularCapabilityGsmTest::kIMEI[] = "987654321098765";
+const char CellularCapabilityGsmTest::kIMSI[] = "310150123456789";
+const char CellularCapabilityGsmTest::kMSISDN[] = "12345678901";
+const int CellularCapabilityGsmTest::kStrength = 80;
-TEST_F(CellularCapabilityGSMTest, PropertyStore) {
+TEST_F(CellularCapabilityGsmTest, PropertyStore) {
EXPECT_TRUE(cellular_->store().Contains(kSIMLockStatusProperty));
}
-TEST_F(CellularCapabilityGSMTest, GetIMEI) {
+TEST_F(CellularCapabilityGsmTest, GetIMEI) {
EXPECT_CALL(*card_proxy_, GetIMEI(_, _, CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetIMEI));
+ &CellularCapabilityGsmTest::InvokeGetIMEI));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
ASSERT_TRUE(cellular_->imei().empty());
- capability_->GetIMEI(Bind(&CellularCapabilityGSMTest::TestCallback,
+ capability_->GetIMEI(Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_EQ(kIMEI, cellular_->imei());
}
-TEST_F(CellularCapabilityGSMTest, GetIMSI) {
+TEST_F(CellularCapabilityGsmTest, GetIMSI) {
SetMockMobileOperatorInfoObjects();
EXPECT_CALL(*card_proxy_, GetIMSI(_, _, CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetIMSI));
+ &CellularCapabilityGsmTest::InvokeGetIMSI));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
- ResultCallback callback = Bind(&CellularCapabilityGSMTest::TestCallback,
+ ResultCallback callback = Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this));
EXPECT_TRUE(cellular_->imsi().empty());
EXPECT_FALSE(cellular_->sim_present());
@@ -376,18 +376,18 @@
// In this test, the call to the proxy's GetIMSI() will always indicate failure,
// which will cause the retry logic to call the proxy again a number of times.
// Eventually, the retries expire.
-TEST_F(CellularCapabilityGSMTest, GetIMSIFails) {
+TEST_F(CellularCapabilityGsmTest, GetIMSIFails) {
ScopedMockLog log;
EXPECT_CALL(log, Log(logging::LOG_INFO,
::testing::EndsWith("cellular_capability_gsm.cc"),
::testing::StartsWith("GetIMSI failed - ")));
EXPECT_CALL(*card_proxy_, GetIMSI(_, _, CellularCapability::kTimeoutDefault))
- .Times(CellularCapabilityGSM::kGetIMSIRetryLimit + 2)
+ .Times(CellularCapabilityGsm::kGetIMSIRetryLimit + 2)
.WillRepeatedly(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetIMSIFails));
+ &CellularCapabilityGsmTest::InvokeGetIMSIFails));
EXPECT_CALL(*this, TestCallback(IsFailure())).Times(2);
SetCardProxy();
- ResultCallback callback = Bind(&CellularCapabilityGSMTest::TestCallback,
+ ResultCallback callback = Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this));
EXPECT_TRUE(cellular_->imsi().empty());
EXPECT_FALSE(cellular_->sim_present());
@@ -400,51 +400,51 @@
capability_->sim_lock_status_.lock_type.clear();
cellular_->set_sim_present(false);
capability_->get_imsi_retries_ = 0;
- EXPECT_EQ(CellularCapabilityGSM::kGetIMSIRetryDelayMilliseconds,
+ EXPECT_EQ(CellularCapabilityGsm::kGetIMSIRetryDelayMilliseconds,
capability_->get_imsi_retry_delay_milliseconds_);
// Set the delay to zero to speed up the test.
capability_->get_imsi_retry_delay_milliseconds_ = 0;
capability_->GetIMSI(callback);
- for (int i = 0; i < CellularCapabilityGSM::kGetIMSIRetryLimit; ++i) {
+ for (int i = 0; i < CellularCapabilityGsm::kGetIMSIRetryLimit; ++i) {
dispatcher_.DispatchPendingEvents();
}
- EXPECT_EQ(CellularCapabilityGSM::kGetIMSIRetryLimit + 1,
+ EXPECT_EQ(CellularCapabilityGsm::kGetIMSIRetryLimit + 1,
capability_->get_imsi_retries_);
EXPECT_TRUE(cellular_->imsi().empty());
EXPECT_FALSE(cellular_->sim_present());
}
-TEST_F(CellularCapabilityGSMTest, GetMSISDN) {
+TEST_F(CellularCapabilityGsmTest, GetMSISDN) {
EXPECT_CALL(*card_proxy_, GetMSISDN(_, _,
CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetMSISDN));
+ &CellularCapabilityGsmTest::InvokeGetMSISDN));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
ASSERT_TRUE(cellular_->mdn().empty());
- capability_->GetMSISDN(Bind(&CellularCapabilityGSMTest::TestCallback,
+ capability_->GetMSISDN(Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_EQ(kMSISDN, cellular_->mdn());
}
-TEST_F(CellularCapabilityGSMTest, GetSPN) {
+TEST_F(CellularCapabilityGsmTest, GetSPN) {
EXPECT_CALL(*card_proxy_, GetSPN(_, _, CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetSPN));
+ &CellularCapabilityGsmTest::InvokeGetSPN));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
ASSERT_TRUE(capability_->spn_.empty());
- capability_->GetSPN(Bind(&CellularCapabilityGSMTest::TestCallback,
+ capability_->GetSPN(Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_EQ(kTestCarrier, capability_->spn_);
}
-TEST_F(CellularCapabilityGSMTest, GetSignalQuality) {
+TEST_F(CellularCapabilityGsmTest, GetSignalQuality) {
EXPECT_CALL(*network_proxy_,
GetSignalQuality(_, _, CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetSignalQuality));
+ &CellularCapabilityGsmTest::InvokeGetSignalQuality));
SetNetworkProxy();
CreateService();
EXPECT_EQ(0, cellular_->service()->strength());
@@ -452,20 +452,20 @@
EXPECT_EQ(kStrength, cellular_->service()->strength());
}
-TEST_F(CellularCapabilityGSMTest, RegisterOnNetwork) {
+TEST_F(CellularCapabilityGsmTest, RegisterOnNetwork) {
EXPECT_CALL(*network_proxy_, Register(kTestNetwork, _, _,
CellularCapability::kTimeoutRegister))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeRegister));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeRegister));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetNetworkProxy();
Error error;
capability_->RegisterOnNetwork(kTestNetwork, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_EQ(kTestNetwork, cellular_->selected_network());
}
-TEST_F(CellularCapabilityGSMTest, IsRegistered) {
+TEST_F(CellularCapabilityGsmTest, IsRegistered) {
EXPECT_FALSE(capability_->IsRegistered());
SetRegistrationState(MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE);
EXPECT_FALSE(capability_->IsRegistered());
@@ -481,12 +481,12 @@
EXPECT_TRUE(capability_->IsRegistered());
}
-TEST_F(CellularCapabilityGSMTest, GetRegistrationState) {
+TEST_F(CellularCapabilityGsmTest, GetRegistrationState) {
ASSERT_FALSE(capability_->IsRegistered());
EXPECT_CALL(*network_proxy_,
GetRegistrationInfo(_, _, CellularCapability::kTimeoutDefault))
.WillOnce(Invoke(this,
- &CellularCapabilityGSMTest::InvokeGetRegistrationInfo));
+ &CellularCapabilityGsmTest::InvokeGetRegistrationInfo));
SetNetworkProxy();
capability_->GetRegistrationState();
EXPECT_TRUE(capability_->IsRegistered());
@@ -494,70 +494,70 @@
capability_->registration_state_);
}
-TEST_F(CellularCapabilityGSMTest, RequirePIN) {
+TEST_F(CellularCapabilityGsmTest, RequirePIN) {
EXPECT_CALL(*card_proxy_, EnablePIN(kPIN, true, _, _,
CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeEnablePIN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeEnablePIN));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
Error error;
capability_->RequirePIN(kPIN, true, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_TRUE(error.IsSuccess());
}
-TEST_F(CellularCapabilityGSMTest, EnterPIN) {
+TEST_F(CellularCapabilityGsmTest, EnterPIN) {
EXPECT_CALL(*card_proxy_, SendPIN(kPIN, _, _,
CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeSendPIN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeSendPIN));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
Error error;
capability_->EnterPIN(kPIN, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_TRUE(error.IsSuccess());
}
-TEST_F(CellularCapabilityGSMTest, UnblockPIN) {
+TEST_F(CellularCapabilityGsmTest, UnblockPIN) {
EXPECT_CALL(*card_proxy_, SendPUK(kPUK, kPIN, _, _,
CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeSendPUK));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeSendPUK));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
Error error;
capability_->UnblockPIN(kPUK, kPIN, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_TRUE(error.IsSuccess());
}
-TEST_F(CellularCapabilityGSMTest, ChangePIN) {
+TEST_F(CellularCapabilityGsmTest, ChangePIN) {
static const char kOldPIN[] = "1111";
EXPECT_CALL(*card_proxy_, ChangePIN(kOldPIN, kPIN, _, _,
CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeChangePIN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeChangePIN));
EXPECT_CALL(*this, TestCallback(IsSuccess()));
SetCardProxy();
Error error;
capability_->ChangePIN(kOldPIN, kPIN, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
EXPECT_TRUE(error.IsSuccess());
}
-TEST_F(CellularCapabilityGSMTest, ParseScanResult) {
+TEST_F(CellularCapabilityGsmTest, ParseScanResult) {
static const char kID[] = "123";
static const char kLongName[] = "long name";
static const char kShortName[] = "short name";
GSMScanResult result;
- result[CellularCapabilityGSM::kNetworkPropertyStatus] = "1";
- result[CellularCapabilityGSM::kNetworkPropertyID] = kID;
- result[CellularCapabilityGSM::kNetworkPropertyLongName] = kLongName;
- result[CellularCapabilityGSM::kNetworkPropertyShortName] = kShortName;
- result[CellularCapabilityGSM::kNetworkPropertyAccessTechnology] = "3";
+ result[CellularCapabilityGsm::kNetworkPropertyStatus] = "1";
+ result[CellularCapabilityGsm::kNetworkPropertyID] = kID;
+ result[CellularCapabilityGsm::kNetworkPropertyLongName] = kLongName;
+ result[CellularCapabilityGsm::kNetworkPropertyShortName] = kShortName;
+ result[CellularCapabilityGsm::kNetworkPropertyAccessTechnology] = "3";
result["unknown property"] = "random value";
Stringmap parsed = capability_->ParseScanResult(result);
EXPECT_EQ(5, parsed.size());
@@ -568,7 +568,7 @@
EXPECT_EQ(kNetworkTechnologyEdge, parsed[kTechnologyProperty]);
}
-TEST_F(CellularCapabilityGSMTest, ParseScanResultProviderLookup) {
+TEST_F(CellularCapabilityGsmTest, ParseScanResultProviderLookup) {
static const char kID[] = "10001";
const string kLongName = "TestNetworkLongName";
// Replace the |MobileOperatorInfo| used by |ParseScanResult| by a mock.
@@ -583,14 +583,14 @@
EXPECT_CALL(*mock_mobile_operator_info, operator_name()).
WillRepeatedly(ReturnRef(kLongName));
GSMScanResult result;
- result[CellularCapabilityGSM::kNetworkPropertyID] = kID;
+ result[CellularCapabilityGsm::kNetworkPropertyID] = kID;
Stringmap parsed = capability_->ParseScanResult(result);
EXPECT_EQ(2, parsed.size());
EXPECT_EQ(kID, parsed[kNetworkIdProperty]);
EXPECT_EQ(kLongName, parsed[kLongNameProperty]);
}
-TEST_F(CellularCapabilityGSMTest, SetAccessTechnology) {
+TEST_F(CellularCapabilityGsmTest, SetAccessTechnology) {
capability_->SetAccessTechnology(MM_MODEM_GSM_ACCESS_TECH_GSM);
EXPECT_EQ(MM_MODEM_GSM_ACCESS_TECH_GSM, capability_->access_technology_);
CreateService();
@@ -600,7 +600,7 @@
EXPECT_EQ(kNetworkTechnologyGprs, cellular_->service()->network_technology());
}
-TEST_F(CellularCapabilityGSMTest, GetNetworkTechnologyString) {
+TEST_F(CellularCapabilityGsmTest, GetNetworkTechnologyString) {
EXPECT_EQ("", capability_->GetNetworkTechnologyString());
SetAccessTechnology(MM_MODEM_GSM_ACCESS_TECH_GSM);
EXPECT_EQ(kNetworkTechnologyGsm, capability_->GetNetworkTechnologyString());
@@ -623,7 +623,7 @@
capability_->GetNetworkTechnologyString());
}
-TEST_F(CellularCapabilityGSMTest, GetRoamingStateString) {
+TEST_F(CellularCapabilityGsmTest, GetRoamingStateString) {
EXPECT_EQ(kRoamingStateUnknown, capability_->GetRoamingStateString());
SetRegistrationState(MM_MODEM_GSM_NETWORK_REG_STATUS_HOME);
EXPECT_EQ(kRoamingStateHome, capability_->GetRoamingStateString());
@@ -637,7 +637,7 @@
EXPECT_EQ(kRoamingStateUnknown, capability_->GetRoamingStateString());
}
-TEST_F(CellularCapabilityGSMTest, OnPropertiesChanged) {
+TEST_F(CellularCapabilityGsmTest, OnPropertiesChanged) {
EXPECT_EQ(MM_MODEM_GSM_ACCESS_TECH_UNKNOWN, capability_->access_technology_);
EXPECT_FALSE(capability_->sim_lock_status_.enabled);
EXPECT_EQ("", capability_->sim_lock_status_.lock_type);
@@ -645,12 +645,12 @@
KeyValueStore props;
static const char kLockType[] = "sim-pin";
const int kRetries = 3;
- props.SetUint(CellularCapabilityGSM::kPropertyAccessTechnology,
+ props.SetUint(CellularCapabilityGsm::kPropertyAccessTechnology,
MM_MODEM_GSM_ACCESS_TECH_EDGE);
- props.SetUint(CellularCapabilityGSM::kPropertyEnabledFacilityLocks,
+ props.SetUint(CellularCapabilityGsm::kPropertyEnabledFacilityLocks,
MM_MODEM_GSM_FACILITY_SIM);
- props.SetString(CellularCapabilityGSM::kPropertyUnlockRequired, kLockType);
- props.SetUint(CellularCapabilityGSM::kPropertyUnlockRetries, kRetries);
+ props.SetString(CellularCapabilityGsm::kPropertyUnlockRequired, kLockType);
+ props.SetUint(CellularCapabilityGsm::kPropertyUnlockRetries, kRetries);
// Call with the 'wrong' interface and nothing should change.
capability_->OnPropertiesChanged(MM_MODEM_GSM_INTERFACE, props,
vector<string>());
@@ -697,69 +697,69 @@
EXPECT_EQ(kRetries, capability_->sim_lock_status_.retries_left);
}
-TEST_F(CellularCapabilityGSMTest, StartModemSuccess) {
+TEST_F(CellularCapabilityGsmTest, StartModemSuccess) {
SetupCommonStartModemExpectations();
EXPECT_CALL(*card_proxy_,
GetSPN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetSPN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetSPN));
EXPECT_CALL(*card_proxy_,
GetMSISDN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetMSISDN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetMSISDN));
AllowCreateCardProxyFromFactory();
Error error;
capability_->StartModem(
- &error, Bind(&CellularCapabilityGSMTest::TestCallback, Unretained(this)));
+ &error, Bind(&CellularCapabilityGsmTest::TestCallback, Unretained(this)));
dispatcher_.DispatchPendingEvents();
}
-TEST_F(CellularCapabilityGSMTest, StartModemGetSPNFail) {
+TEST_F(CellularCapabilityGsmTest, StartModemGetSPNFail) {
SetupCommonStartModemExpectations();
EXPECT_CALL(*card_proxy_,
GetSPN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetSPNFail));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetSPNFail));
EXPECT_CALL(*card_proxy_,
GetMSISDN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetMSISDN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetMSISDN));
AllowCreateCardProxyFromFactory();
Error error;
capability_->StartModem(
- &error, Bind(&CellularCapabilityGSMTest::TestCallback, Unretained(this)));
+ &error, Bind(&CellularCapabilityGsmTest::TestCallback, Unretained(this)));
dispatcher_.DispatchPendingEvents();
}
-TEST_F(CellularCapabilityGSMTest, StartModemGetMSISDNFail) {
+TEST_F(CellularCapabilityGsmTest, StartModemGetMSISDNFail) {
SetupCommonStartModemExpectations();
EXPECT_CALL(*card_proxy_,
GetSPN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetSPN));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetSPN));
EXPECT_CALL(*card_proxy_,
GetMSISDN(_, _, CellularCapability::kTimeoutDefault))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeGetMSISDNFail));
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeGetMSISDNFail));
AllowCreateCardProxyFromFactory();
Error error;
capability_->StartModem(
- &error, Bind(&CellularCapabilityGSMTest::TestCallback, Unretained(this)));
+ &error, Bind(&CellularCapabilityGsmTest::TestCallback, Unretained(this)));
dispatcher_.DispatchPendingEvents();
}
-TEST_F(CellularCapabilityGSMTest, ConnectFailureNoService) {
+TEST_F(CellularCapabilityGsmTest, ConnectFailureNoService) {
// Make sure we don't crash if the connect failed and there is no
// CellularService object. This can happen if the modem is enabled and
// then quickly disabled.
SetupCommonProxiesExpectations();
EXPECT_CALL(*simple_proxy_,
- Connect(_, _, _, CellularCapabilityGSM::kTimeoutConnect))
- .WillOnce(Invoke(this, &CellularCapabilityGSMTest::InvokeConnectFail));
+ Connect(_, _, _, CellularCapabilityGsm::kTimeoutConnect))
+ .WillOnce(Invoke(this, &CellularCapabilityGsmTest::InvokeConnectFail));
EXPECT_CALL(*this, TestCallback(IsFailure()));
InitProxies();
EXPECT_FALSE(capability_->cellular()->service());
Error error;
KeyValueStore props;
capability_->Connect(props, &error,
- Bind(&CellularCapabilityGSMTest::TestCallback,
+ Bind(&CellularCapabilityGsmTest::TestCallback,
Unretained(this)));
}
diff --git a/cellular/cellular_unittest.cc b/cellular/cellular_unittest.cc
index 9dda7a0..4cf7300 100644
--- a/cellular/cellular_unittest.cc
+++ b/cellular/cellular_unittest.cc
@@ -518,8 +518,8 @@
const string& /*path*/,
const string& /*service*/) override {
// TODO(benchan): This code conditionally returns a nullptr to avoid
- // CellularCapabilityGSM::InitProperties (and thus
- // CellularCapabilityGSM::GetIMSI) from being called during the
+ // CellularCapabilityGsm::InitProperties (and thus
+ // CellularCapabilityGsm::GetIMSI) from being called during the
// construction. Remove this workaround after refactoring the tests.
CHECK(!test_->create_gsm_card_proxy_from_factory_ ||
test_->gsm_card_proxy_);
@@ -579,8 +579,8 @@
return static_cast<CellularCapabilityCdma*>(device_->capability_.get());
}
- CellularCapabilityGSM* GetCapabilityGSM() {
- return static_cast<CellularCapabilityGSM*>(device_->capability_.get());
+ CellularCapabilityGsm* GetCapabilityGSM() {
+ return static_cast<CellularCapabilityGsm*>(device_->capability_.get());
}
CellularCapabilityUniversal* GetCapabilityUniversal() {
@@ -647,10 +647,10 @@
const char CellularTest::kTestMobileProviderDBPath[] =
"provider_db_unittest.bfd";
const Stringmaps CellularTest::kTestNetworksGSM =
- {{{CellularCapabilityGSM::kNetworkPropertyStatus, "1"},
- {CellularCapabilityGSM::kNetworkPropertyID, "0000"},
- {CellularCapabilityGSM::kNetworkPropertyLongName, "some_long_name"},
- {CellularCapabilityGSM::kNetworkPropertyShortName, "short"}}};
+ {{{CellularCapabilityGsm::kNetworkPropertyStatus, "1"},
+ {CellularCapabilityGsm::kNetworkPropertyID, "0000"},
+ {CellularCapabilityGsm::kNetworkPropertyLongName, "some_long_name"},
+ {CellularCapabilityGsm::kNetworkPropertyShortName, "short"}}};
const Stringmaps CellularTest::kTestNetworksCellular =
{{{kStatusProperty, "available"},
{kNetworkIdProperty, "0000"},
