Bringing 4 more BluetoothTest.* unit tests to Mac

device/bluetooth/bluetooth_adapter_unittest.cc

Index: device/bluetooth/bluetooth_adapter_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index 2316ee5ac90b26959e4a877f7fc9c3fa0c1d3d0c..6a19ced487c7fa9aa31afb8d63ba76636c2e5a77 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -472,15 +472,23 @@ TEST_F(BluetoothTest, DiscoverySession) {
 }
 #endif  // defined(OS_ANDROID)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers a device.
-TEST_F(BluetoothTest, DiscoverDevice) {
+TEST_F(BluetoothTest, DiscoverLowEnergyDevice) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
   InitWithFakeAdapter();
   TestBluetoothAdapterObserver observer(adapter_);
 
   // Start discovery and find a device.
-  adapter_->StartDiscoverySession(GetDiscoverySessionCallback(),
-                                  GetErrorCallback());
+  scoped_ptr<BluetoothDiscoveryFilter> discovery_filter(
+      new BluetoothDiscoveryFilter(
+          BluetoothDiscoveryFilter::Transport::TRANSPORT_LE));
+  adapter_->StartDiscoverySessionWithFilter(discovery_filter.Pass(),
+                                            GetDiscoverySessionCallback(),
+                                            GetErrorCallback());
   base::RunLoop().RunUntilIdle();
   DiscoverLowEnergyDevice(1);
   base::RunLoop().RunUntilIdle();
@@ -488,11 +496,15 @@ TEST_F(BluetoothTest, DiscoverDevice) {
   BluetoothDevice* device = adapter_->GetDevice(observer.last_device_address());
   EXPECT_TRUE(device);
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers the same device multiple times.
-TEST_F(BluetoothTest, DiscoverDeviceTwice) {
+TEST_F(BluetoothTest, DiscoverLowEnergyDeviceTwice) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
   InitWithFakeAdapter();
   TestBluetoothAdapterObserver observer(adapter_);
 
@@ -511,14 +523,17 @@ TEST_F(BluetoothTest, DiscoverDeviceTwice) {
   DiscoverLowEnergyDevice(1);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(0, observer.device_added_count());
-  EXPECT_EQ(0, observer.device_changed_count());

[krstnmnlsn, 2015/07/22 23:23:17]

As previously discussed, it's not clear if / how we efficiently check if a
device has changed when BluetoothLowEnergyDeviceMac::Update is called.  Could
make it check only the fields we care about, or else this line has to go..

[scheib, 2015/07/23 18:15:25]

Well, in the implementation of Update (and all methods it calls) the new data
would need to be compared with the previously stored data to see if it were
different. It's a bit of work, and I'm not sure that we need it now. The
difficulty is that it will be hard to notice later if it produces a lot of
unnecessary work. But, OK with removing this line and sending update for now. 

[krstnmnlsn, 2015/07/23 22:03:29]

Yes, and the reason I'm hesitant on it is because my understanding from the
Apple doc is that the didDiscoverPeripheral: message should only be sent when a
peripheral has been discovered for the first time or really has an update.  See
the CBCentralManagerScanOptionAllowDuplicatesKey scanning option (which defaults
to NO)
https://developer.apple.com/library/prerelease/ios/documentation/CoreBluetoot...

   EXPECT_EQ(1u, adapter_->GetDevices().size());
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers a device, and then again with new Service UUIDs.
-TEST_F(BluetoothTest, DiscoverDeviceWithUpdatedUUIDs) {
+TEST_F(BluetoothTest, DiscoverLowEnergyDeviceWithUpdatedUUIDs) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
   InitWithFakeAdapter();
   TestBluetoothAdapterObserver observer(adapter_);
 
@@ -531,8 +546,8 @@ TEST_F(BluetoothTest, DiscoverDeviceWithUpdatedUUIDs) {
   BluetoothDevice* device = observer.last_device();
 
   // Check the initial UUIDs:
-  EXPECT_TRUE(ContainsValue(device->GetUUIDs(), BluetoothUUID("1800")));
-  EXPECT_FALSE(ContainsValue(device->GetUUIDs(), BluetoothUUID("1802")));
+  EXPECT_TRUE(ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUID1)));
+  EXPECT_FALSE(ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUID3)));
 
   // Discover same device again with updated UUIDs:
   observer.Reset();
@@ -544,8 +559,8 @@ TEST_F(BluetoothTest, DiscoverDeviceWithUpdatedUUIDs) {
   EXPECT_EQ(device, observer.last_device());
 
   // Expect new UUIDs:
-  EXPECT_FALSE(ContainsValue(device->GetUUIDs(), BluetoothUUID("1800")));
-  EXPECT_TRUE(ContainsValue(device->GetUUIDs(), BluetoothUUID("1802")));
+  EXPECT_FALSE(ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUID1)));
+  EXPECT_TRUE(ContainsValue(device->GetUUIDs(), BluetoothUUID(kTestUUID3)));
 
   // Discover same device again with empty UUIDs:
   observer.Reset();
@@ -559,11 +574,15 @@ TEST_F(BluetoothTest, DiscoverDeviceWithUpdatedUUIDs) {
   // Expect empty UUIDs:
   EXPECT_EQ(0u, device->GetUUIDs().size());
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_MACOSX)
 // Discovers multiple devices when addresses vary.
-TEST_F(BluetoothTest, DiscoverMultipleDevices) {
+TEST_F(BluetoothTest, DiscoverMultipleLowEnergyDevices) {
+  if (!PlatformSupportsLowEnergy()) {
+    LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test.";
+    return;
+  }
   InitWithFakeAdapter();
   TestBluetoothAdapterObserver observer(adapter_);
 
@@ -577,6 +596,6 @@ TEST_F(BluetoothTest, DiscoverMultipleDevices) {
   EXPECT_EQ(2, observer.device_added_count());
   EXPECT_EQ(2u, adapter_->GetDevices().size());
 }
-#endif  // defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID) || defined(OS_MACOSX)
 
 }  // namespace device