bluetooth: android: Implement Characteristic GetIdentifier, fix Service IDs too.

device/bluetooth/bluetooth_gatt_service_unittest.cc

Index: device/bluetooth/bluetooth_gatt_service_unittest.cc
diff --git a/device/bluetooth/bluetooth_gatt_service_unittest.cc b/device/bluetooth/bluetooth_gatt_service_unittest.cc
index 595905d299ca68007c70bf09f5c9c8334d622525..c3816f0c5a7aecb93d80892abd3e746729ea833b 100644
--- a/device/bluetooth/bluetooth_gatt_service_unittest.cc
+++ b/device/bluetooth/bluetooth_gatt_service_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
 
@@ -15,8 +15,50 @@
 
 namespace device {
 
+#if defined(OS_ANDROID) || defined(OS_MACOSX)
+class BluetoothGattServiceTest : public BluetoothTest {};
+#endif
+
+#if defined(OS_ANDROID)
+TEST_F(BluetoothGattServiceTest, GetIdentifier) {
+  InitWithFakeAdapter();
+  StartLowEnergyDiscoverySession();
+  // 2 devices to verify unique IDs across them.
+  BluetoothDevice* device1 = DiscoverLowEnergyDevice(3);
+  BluetoothDevice* device2 = DiscoverLowEnergyDevice(4);
+  device1->CreateGattConnection(GetGattConnectionCallback(),
+                                GetConnectErrorCallback());
+  device2->CreateGattConnection(GetGattConnectionCallback(),
+                                GetConnectErrorCallback());
+  SimulateGattConnection(device1);
+  SimulateGattConnection(device2);
+
+  // 2 duplicate UUIDs creating 2 service instances on each device.
+  std::vector<std::string> services;
+  std::string uuid = "00000000-0000-1000-8000-00805f9b34fb";
+  services.push_back(uuid);
+  services.push_back(uuid);
+  SimulateGattServicesDiscovered(device1, services);
+  SimulateGattServicesDiscovered(device2, services);
+  BluetoothGattService* service1 = device1->GetGattServices()[0];
+  BluetoothGattService* service2 = device1->GetGattServices()[1];
+  BluetoothGattService* service3 = device2->GetGattServices()[0];
+  BluetoothGattService* service4 = device2->GetGattServices()[1];
+
+  // All IDs are unique, even though they have the same UUID.
+  EXPECT_NE(service1->GetIdentifier(), service2->GetIdentifier());
+  EXPECT_NE(service1->GetIdentifier(), service3->GetIdentifier());
+  EXPECT_NE(service1->GetIdentifier(), service4->GetIdentifier());
+
+  EXPECT_NE(service2->GetIdentifier(), service3->GetIdentifier());
+  EXPECT_NE(service2->GetIdentifier(), service4->GetIdentifier());
+
+  EXPECT_NE(service3->GetIdentifier(), service4->GetIdentifier());
+}
+#endif  // defined(OS_ANDROID)
+
 #if defined(OS_ANDROID)
-TEST_F(BluetoothTest, GetUUIDAndGetIdentifier) {
+TEST_F(BluetoothGattServiceTest, GetUUID) {
   InitWithFakeAdapter();
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = DiscoverLowEnergyDevice(3);
@@ -34,15 +76,11 @@ TEST_F(BluetoothTest, GetUUIDAndGetIdentifier) {
   // Each has the same UUID.
   EXPECT_EQ(uuid, device->GetGattServices()[0]->GetUUID());
   EXPECT_EQ(uuid, device->GetGattServices()[1]->GetUUID());
-
-  // Instance IDs are unique.
-  EXPECT_NE(device->GetGattServices()[0]->GetIdentifier(),
-            device->GetGattServices()[1]->GetIdentifier());
 }
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
-TEST_F(BluetoothTest, GetCharacteristics_FindNone) {
+TEST_F(BluetoothGattServiceTest, GetCharacteristics_FindNone) {
   InitWithFakeAdapter();
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = DiscoverLowEnergyDevice(3);
@@ -61,7 +99,7 @@ TEST_F(BluetoothTest, GetCharacteristics_FindNone) {
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)
-TEST_F(BluetoothTest, GetCharacteristic_FindSeveral) {
+TEST_F(BluetoothGattServiceTest, GetCharacteristics_and_GetCharacteristic) {
   InitWithFakeAdapter();
   StartLowEnergyDiscoverySession();
   BluetoothDevice* device = DiscoverLowEnergyDevice(3);
@@ -69,12 +107,11 @@ TEST_F(BluetoothTest, GetCharacteristic_FindSeveral) {
                                GetConnectErrorCallback());
   SimulateGattConnection(device);
 
-  // Simulate a service, with no Characteristics:
+  // Simulate a service, with several Characteristics:
   std::vector<std::string> services;
   services.push_back("00000000-0000-1000-8000-00805f9b34fb");
   SimulateGattServicesDiscovered(device, services);
   BluetoothGattService* service = device->GetGattServices()[0];
-
   std::string characteristic_uuid1 = "00000001-0000-1000-8000-00805f9b34fb";
   std::string characteristic_uuid2 = "00000002-0000-1000-8000-00805f9b34fb";
   std::string characteristic_uuid3 = characteristic_uuid2;  // Duplicate UUID.
@@ -83,18 +120,12 @@ TEST_F(BluetoothTest, GetCharacteristic_FindSeveral) {
   SimulateGattCharacteristic(service, characteristic_uuid3);
 
   EXPECT_EQ(3u, service->GetCharacteristics().size());
-  // TODO(scheib): Implement GetIdentifier. crbug.com/545682
-  //     std::string characteristic_id1 =
-  //         service->GetCharacteristics()[0]->GetIdentifier();
-  // ...
-  // EXPECT_NE(characteristic_id2, characteristic_id3);
-  // For now, just hard-code:
-  std::string characteristic_id1 = "00000001-0000-1000-8000-00805f9b34fb0";
-  std::string characteristic_id2 = "00000002-0000-1000-8000-00805f9b34fb0";
-  std::string characteristic_id3 = "00000002-0000-1000-8000-00805f9b34fb1";
-  EXPECT_TRUE(service->GetCharacteristic(characteristic_id1));
-  EXPECT_TRUE(service->GetCharacteristic(characteristic_id2));
-  EXPECT_TRUE(service->GetCharacteristic(characteristic_id3));
+  std::string char_id1 = service->GetCharacteristics()[0]->GetIdentifier();
+  std::string char_id2 = service->GetCharacteristics()[1]->GetIdentifier();
+  std::string char_id3 = service->GetCharacteristics()[2]->GetIdentifier();
+  EXPECT_TRUE(service->GetCharacteristic(char_id1));
+  EXPECT_TRUE(service->GetCharacteristic(char_id2));
+  EXPECT_TRUE(service->GetCharacteristic(char_id3));
 }
 #endif  // defined(OS_ANDROID)