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

Side by Side Diff: device/bluetooth/bluetooth_device_unittest.cc

Issue 1583333003: bluetooth: Invalidate connection objects if a connection fails and add histograms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Address scheib's comments Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/bluetooth/bluetooth_device.h" 5 #include "device/bluetooth/bluetooth_device.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 InitWithFakeAdapter(); 450 InitWithFakeAdapter();
451 StartLowEnergyDiscoverySession(); 451 StartLowEnergyDiscoverySession();
452 BluetoothDevice* device = DiscoverLowEnergyDevice(3); 452 BluetoothDevice* device = DiscoverLowEnergyDevice(3);
453 453
454 ResetEventCounts(); 454 ResetEventCounts();
455 device->CreateGattConnection(GetGattConnectionCallback(Call::NOT_EXPECTED), 455 device->CreateGattConnection(GetGattConnectionCallback(Call::NOT_EXPECTED),
456 GetConnectErrorCallback(Call::EXPECTED)); 456 GetConnectErrorCallback(Call::EXPECTED));
457 EXPECT_EQ(1, gatt_connection_attempts_); 457 EXPECT_EQ(1, gatt_connection_attempts_);
458 SimulateGattConnectionError(device, BluetoothDevice::ERROR_AUTH_FAILED); 458 SimulateGattConnectionError(device, BluetoothDevice::ERROR_AUTH_FAILED);
459 SimulateGattConnectionError(device, BluetoothDevice::ERROR_FAILED); 459 SimulateGattConnectionError(device, BluetoothDevice::ERROR_FAILED);
460 EXPECT_EQ(BluetoothDevice::ERROR_AUTH_FAILED, last_connect_error_code_); 460 // TODO: Change to ERROR_AUTH_FAILED. We should be getting a callback
461 // only with the first error, but our android framework doesn't yet
462 // support sending different errors.
463 // http://crbug.com/578191
464 EXPECT_EQ(BluetoothDevice::ERROR_FAILED, last_connect_error_code_);
461 for (BluetoothGattConnection* connection : gatt_connections_) 465 for (BluetoothGattConnection* connection : gatt_connections_)
462 EXPECT_FALSE(connection->IsConnected()); 466 EXPECT_FALSE(connection->IsConnected());
463 } 467 }
464 #endif // defined(OS_ANDROID) 468 #endif // defined(OS_ANDROID)
465 469
466 #if defined(OS_ANDROID) 470 #if defined(OS_ANDROID)
467 TEST_F(BluetoothTest, GattServices_ObserversCalls) { 471 TEST_F(BluetoothTest, GattServices_ObserversCalls) {
468 InitWithFakeAdapter(); 472 InitWithFakeAdapter();
469 StartLowEnergyDiscoverySession(); 473 StartLowEnergyDiscoverySession();
470 BluetoothDevice* device = DiscoverLowEnergyDevice(3); 474 BluetoothDevice* device = DiscoverLowEnergyDevice(3);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 ResetEventCounts(); 528 ResetEventCounts();
525 SimulateGattConnection(device); 529 SimulateGattConnection(device);
526 EXPECT_EQ(1, gatt_discovery_attempts_); 530 EXPECT_EQ(1, gatt_discovery_attempts_);
527 531
528 SimulateGattServicesDiscoveryError(device); 532 SimulateGattServicesDiscoveryError(device);
529 EXPECT_EQ(0u, device->GetGattServices().size()); 533 EXPECT_EQ(0u, device->GetGattServices().size());
530 } 534 }
531 #endif // defined(OS_ANDROID) 535 #endif // defined(OS_ANDROID)
532 536
533 } // namespace device 537 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698