Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Unified Diff: device/bluetooth/test/bluetooth_test_mac.mm

Issue 2738563002: Bluetooth: macOS: cleanup code. (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/test/bluetooth_test_mac.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/test/bluetooth_test_mac.mm
diff --git a/device/bluetooth/test/bluetooth_test_mac.mm b/device/bluetooth/test/bluetooth_test_mac.mm
index be4d037b1026c733f9fd0135b35c5ebd235f4633..777e91339cf66d8d512b200378f7e9f0ebc7f116 100644
--- a/device/bluetooth/test/bluetooth_test_mac.mm
+++ b/device/bluetooth/test/bluetooth_test_mac.mm
@@ -230,15 +230,12 @@ BluetoothDevice* BluetoothTestMac::SimulateLowEnergyDevice(int device_ordinal) {
}
void BluetoothTestMac::SimulateGattConnection(BluetoothDevice* device) {
- BluetoothLowEnergyDeviceMac* lowEnergyDeviceMac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = lowEnergyDeviceMac->GetPeripheral();
- MockCBPeripheral* mockPeripheral = (MockCBPeripheral*)peripheral;
- [mockPeripheral setState:CBPeripheralStateConnected];
+ MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(device);
+ [peripheral_mock setState:CBPeripheralStateConnected];
CBCentralManager* centralManager =
ObjCCast<CBCentralManager>(mock_central_manager_->get());
[centralManager.delegate centralManager:centralManager
- didConnectPeripheral:peripheral];
+ didConnectPeripheral:peripheral_mock.peripheral];
}
void BluetoothTestMac::SimulateConnectedLowEnergyDevice(
@@ -276,55 +273,36 @@ void BluetoothTestMac::SimulateConnectedLowEnergyDevice(
void BluetoothTestMac::SimulateGattConnectionError(
BluetoothDevice* device,
BluetoothDevice::ConnectErrorCode errorCode) {
- BluetoothLowEnergyDeviceMac* lowEnergyDeviceMac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = lowEnergyDeviceMac->GetPeripheral();
- MockCBPeripheral* mockPeripheral = (MockCBPeripheral*)peripheral;
- [mockPeripheral setState:CBPeripheralStateDisconnected];
+ MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(device);
+ [peripheral_mock setState:CBPeripheralStateDisconnected];
CBCentralManager* centralManager =
ObjCCast<CBCentralManager>(mock_central_manager_->get());
NSError* error =
BluetoothDeviceMac::GetNSErrorFromConnectErrorCode(errorCode);
[centralManager.delegate centralManager:centralManager
- didFailToConnectPeripheral:peripheral
+ didFailToConnectPeripheral:peripheral_mock.peripheral
error:error];
}
void BluetoothTestMac::SimulateGattDisconnection(BluetoothDevice* device) {
- BluetoothLowEnergyDeviceMac* lowEnergyDeviceMac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = lowEnergyDeviceMac->GetPeripheral();
- MockCBPeripheral* peripheral_mock = (MockCBPeripheral*)peripheral;
+ MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(device);
[peripheral_mock setState:CBPeripheralStateDisconnected];
CBCentralManager* central_manager =
ObjCCast<CBCentralManager>(mock_central_manager_->get());
[central_manager.delegate centralManager:central_manager
- didDisconnectPeripheral:peripheral
+ didDisconnectPeripheral:peripheral_mock.peripheral
error:nil];
}
void BluetoothTestMac::SimulateGattServicesDiscovered(
BluetoothDevice* device,
const std::vector<std::string>& uuids) {
- BluetoothLowEnergyDeviceMac* device_mac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = device_mac->GetPeripheral();
- MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
- scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
- for (auto uuid : uuids) {
- CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
- [services addObject:cb_service_uuid];
- }
- [peripheral_mock addServices:services];
- [peripheral_mock mockDidDiscoverEvents];
+ AddServicesToDevice(device, uuids);
+ [GetMockCBPeripheral(device) mockDidDiscoverEvents];
}
void BluetoothTestMac::SimulateGattServicesChanged(BluetoothDevice* device) {
- BluetoothLowEnergyDeviceMac* device_mac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = device_mac->GetPeripheral();
- MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
- [peripheral_mock didModifyServices:@[]];
+ [GetMockCBPeripheral(device) didModifyServices:@[]];
}
void BluetoothTestMac::SimulateGattServiceRemoved(
@@ -334,10 +312,7 @@ void BluetoothTestMac::SimulateGattServiceRemoved(
BluetoothRemoteGattServiceMac* mac_gatt_service =
static_cast<BluetoothRemoteGattServiceMac*>(service);
BluetoothDevice* device = service->GetDevice();
- BluetoothLowEnergyDeviceMac* device_mac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = device_mac->GetPeripheral();
- MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
+ MockCBPeripheral* peripheral_mock = GetMockCBPeripheral(device);
[peripheral_mock removeService:mac_gatt_service->GetService()];
// After -[MockCBPeripheral removeService:], BluetoothLowEnergyDeviceMac is
// expected to call -[CBPeripheral discoverServices:]
@@ -491,17 +466,8 @@ void BluetoothTestMac::ExpectedNotifyValue(
void BluetoothTestMac::SimulateDidDiscoverServices(
BluetoothDevice* device,
const std::vector<std::string>& uuids) {
- BluetoothLowEnergyDeviceMac* device_mac =
- static_cast<BluetoothLowEnergyDeviceMac*>(device);
- CBPeripheral* peripheral = device_mac->GetPeripheral();
- MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
- scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
- for (auto uuid : uuids) {
- CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
- [services addObject:cb_service_uuid];
- }
- [peripheral_mock addServices:services];
- [peripheral_mock mockDidDiscoverServices];
+ AddServicesToDevice(device, uuids);
+ [GetMockCBPeripheral(device) mockDidDiscoverServices];
}
void BluetoothTestMac::OnFakeBluetoothDeviceConnectGattCalled() {
@@ -551,6 +517,16 @@ void BluetoothTestMac::ResetRetrieveConnectedPeripheralServiceUUIDs() {
}
MockCBPeripheral* BluetoothTestMac::GetMockCBPeripheral(
+ BluetoothDevice* device) const {
+ BluetoothLowEnergyDeviceMac* device_mac =
+ static_cast<BluetoothLowEnergyDeviceMac*>(device);
+ CBPeripheral* peripheral = device_mac->GetPeripheral();
+ MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
+ DCHECK(peripheral_mock);
+ return peripheral_mock;
+}
+
+MockCBPeripheral* BluetoothTestMac::GetMockCBPeripheral(
BluetoothRemoteGattService* service) const {
BluetoothDevice* device = service->GetDevice();
BluetoothLowEnergyDeviceMac* device_mac =
@@ -574,6 +550,16 @@ MockCBCharacteristic* BluetoothTest::GetCBMockCharacteristic(
return ObjCCast<MockCBCharacteristic>(cb_characteristic);
}
+void BluetoothTest::AddServicesToDevice(BluetoothDevice* device,
+ const std::vector<std::string>& uuids) {
+ scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
+ for (auto uuid : uuids) {
+ CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
+ [services addObject:cb_service_uuid];
+ }
+ [GetMockCBPeripheral(device) addServices:services];
+}
+
// Utility function for generating new (CBUUID, address) pairs where CBUUID
// hashes to address. For use when adding a new device address to the testing
// suite because CoreBluetooth peripherals have CBUUIDs in place of addresses,
« no previous file with comments | « device/bluetooth/test/bluetooth_test_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698