Bluetooth: call DeviceChanged observer method on IsConnecting() change

device/bluetooth/bluetooth_experimental_chromeos_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
@@ skipping 949 matching lines @@
   device->Connect(
       NULL,
       base::Bind(&BluetoothExperimentalChromeOSTest::Callback,
                  base::Unretained(this)),
       base::Bind(&BluetoothExperimentalChromeOSTest::ConnectErrorCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  EXPECT_EQ(1, observer.device_changed_count_);
+  EXPECT_EQ(3, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, ConnectUnpairableDevice) {
   GetAdapter();
   DiscoverDevices();
 
@@ skipping 10 matching lines @@
   device->Connect(
       NULL,
       base::Bind(&BluetoothExperimentalChromeOSTest::Callback,
                  base::Unretained(this)),
       base::Bind(&BluetoothExperimentalChromeOSTest::ConnectErrorCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  EXPECT_EQ(1, observer.device_changed_count_);
+  EXPECT_EQ(3, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   // Make sure the trusted property has been set to true.
   FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(
           dbus::ObjectPath(FakeBluetoothDeviceClient::kMicrosoftMousePath));
   EXPECT_TRUE(properties->trusted.value());
@@ skipping 28 matching lines @@
   device->Connect(
       NULL,
       base::Bind(&BluetoothExperimentalChromeOSTest::Callback,
                  base::Unretained(this)),
       base::Bind(&BluetoothExperimentalChromeOSTest::ConnectErrorCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Connecting will trigger true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, ConnectDeviceFails) {
   GetAdapter();
   DiscoverDevices();
 
   BluetoothDevice* device = adapter_->GetDevice(
@@ skipping 10 matching lines @@
       NULL,
       base::Bind(&BluetoothExperimentalChromeOSTest::Callback,
                  base::Unretained(this)),
       base::Bind(&BluetoothExperimentalChromeOSTest::ConnectErrorCallback,
                  base::Unretained(this)));
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_FAILED, last_connect_error_);
 
-  EXPECT_EQ(0, observer.device_changed_count_);
+  EXPECT_EQ(2, observer.device_changed_count_);
 
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, DisconnectDevice) {
   GetAdapter();
 
   BluetoothDevice* device = adapter_->GetDevice(
       FakeBluetoothDeviceClient::kPairedDeviceAddress);
@@ skipping 88 matching lines @@
                  base::Unretained(this)));
 
   EXPECT_EQ(0, pairing_delegate.call_count_);
   EXPECT_TRUE(device->IsConnecting());
 
   message_loop.Run();
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(1, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
@@ skipping 33 matching lines @@
   EXPECT_EQ(1, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.display_pincode_count_);
   EXPECT_EQ("123456", pairing_delegate.last_pincode_);
   EXPECT_TRUE(device->IsConnecting());
 
   message_loop.Run();
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 
@@ skipping 51 matching lines @@
 
   // 8 KeysEntered notifications (0 to 7, inclusive). Two aditional calls for
   // DisplayPasskey() and DismissDisplayOrConfirm().
   EXPECT_EQ(10, pairing_delegate.call_count_);
   EXPECT_EQ(8, pairing_delegate.keys_entered_count_);
   EXPECT_EQ(7U, pairing_delegate.last_entered_);
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 
@@ skipping 32 matching lines @@
   EXPECT_EQ(1, pairing_delegate.request_pincode_count_);
   EXPECT_TRUE(device->IsConnecting());
 
   // Set the PIN.
   device->SetPinCode("1234");
   message_loop.Run();
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
@@ skipping 34 matching lines @@
   EXPECT_EQ(123456U, pairing_delegate.last_passkey_);
   EXPECT_TRUE(device->IsConnecting());
 
   // Confirm the passkey.
   device->ConfirmPairing();
   message_loop.Run();
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
@@ skipping 35 matching lines @@
   EXPECT_EQ(1, pairing_delegate.request_passkey_count_);
   EXPECT_TRUE(device->IsConnecting());
 
   // Set the Passkey.
   device->SetPasskey(1234);
   message_loop.Run();
 
   EXPECT_EQ(1, callback_count_);
   EXPECT_EQ(0, error_callback_count_);
 
-  // One change for connected, and one for paired.
-  EXPECT_EQ(2, observer.device_changed_count_);
+  // Two changes for connecting, one change for connected, and one for paired.
+  EXPECT_EQ(4, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
@@ skipping 76 matching lines @@
 
   EXPECT_EQ(0, pairing_delegate.call_count_);
   EXPECT_TRUE(device->IsConnecting());
 
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_FAILED, last_connect_error_);
 
-  // Just one change for paired, the device should not be connected.
-  EXPECT_EQ(1, observer.device_changed_count_);
+  // Two changes for connecting, and one for paired; the device should not be
+  // connected.
+  EXPECT_EQ(3, observer.device_changed_count_);
   EXPECT_EQ(device, observer.last_device_);
 
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(1, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
@@ skipping 35 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Reject the pairing.
   device->RejectPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_REJECTED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingCancelledAtPinCode) {
@@ skipping 25 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Cancel the pairing.
   device->CancelPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_CANCELED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingRejectedAtPasskey) {
@@ skipping 25 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Reject the pairing.
   device->RejectPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_REJECTED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingCancelledAtPasskey) {
@@ skipping 25 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Cancel the pairing.
   device->CancelPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_CANCELED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingRejectedAtConfirmation) {
@@ skipping 25 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Reject the pairing.
   device->RejectPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_REJECTED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingCancelledAtConfirmation) {
@@ skipping 25 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Cancel the pairing.
   device->CancelPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_CANCELED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(2, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 TEST_F(BluetoothExperimentalChromeOSTest, PairingCancelledInFlight) {
@@ skipping 24 matching lines @@
   EXPECT_TRUE(device->IsConnecting());
 
   // Cancel the pairing.
   device->CancelPairing();
   message_loop.Run();
 
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1, error_callback_count_);
   EXPECT_EQ(BluetoothDevice::ERROR_AUTH_CANCELED, last_connect_error_);
 
-  // Should be no changes.
-  EXPECT_EQ(0, observer.device_changed_count_);
+  // Should be no changes except connecting going true and false.
+  EXPECT_EQ(2, observer.device_changed_count_);
   EXPECT_FALSE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
   EXPECT_FALSE(device->IsPaired());
 
   // Pairing dialog should be dismissed
   EXPECT_EQ(1, pairing_delegate.call_count_);
   EXPECT_EQ(1, pairing_delegate.dismiss_count_);
 }
 
 }  // namespace chromeos