Bringing 4 more BluetoothTest.* unit tests to Mac

device/bluetooth/test/bluetooth_test.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_
 #define DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
 
 class BluetoothAdapter;
 
 // A test fixture for Bluetooth that abstracts platform specifics for creating
 // and controlling fake low level objects.
 //
 // Subclasses on each platform implement this, and are then typedef-ed to
 // BluetoothTest.
 class BluetoothTestBase : public testing::Test {
  public:
   static const std::string kTestAdapterName;
   static const std::string kTestAdapterAddress;
 
+  static const std::string kTestDeviceName;
+  static const std::string kTestDeviceNameEmpty;
+
+  static const std::string kTestUUID1;
+  static const std::string kTestUUID2;
+  static const std::string kTestUUID3;
+  static const std::string kTestUUID4;
+
   BluetoothTestBase();
   ~BluetoothTestBase() override;
 
   // Initializes the BluetoothAdapter |adapter_| with the system adapter.
   virtual void InitWithDefaultAdapter(){};
 
   // Initializes the BluetoothAdapter |adapter_| with the system adapter forced
   // to be ignored as if it did not exist. This enables tests for when an
   // adapter is not present on the system.
   virtual void InitWithoutDefaultAdapter(){};
 
   // Initializes the BluetoothAdapter |adapter_| with a fake adapter that can be
   // controlled by this test fixture.
   virtual void InitWithFakeAdapter(){};
 
   // Create a fake Low Energy device and discover it.
-  // |device_ordinal| selects between multiple fake device data sets to produce.
-  //   1: AA:00:00:00:00:01 with simple default values.
-  //   2: AA:00:00:00:00:01 with different advertised Service UUIDs vs 1.
-  //   3: AA:00:00:00:00:01 with empty name, empty UUIDs.
-  //   4: BB:00:00:00:00:02 with empty name, empty UUIDs.
+  // |device_ordinal| selects between multiple fake device data sets to produce:
+  //   1: kTestDeviceName with advertised UUIDs kTestUUID1, kTestUUID2
+  //      Address AA:00:00:00:00:01 on Android. 01:00:00:90:1E:BE on Mac.

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

Please change the address on Android as well so that only one is used.

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

Done.

+  //   2: kTestDeviceName with advertised UUIDs kTestUUID3, kTestUUID4
+  //      Address AA:00:00:00:00:01 on Android. 01:00:00:90:1E:BE on Mac.
+  //   3: kTestDeviceNameEmpty with no advertised UUIDs.
+  //      Address AA:00:00:00:00:01 on Android. 01:00:00:90:1E:BE on Mac.
+  //   4: kTestDeviceNameEmpty with no advertised UUIDs.
+  //      Address BB:00:00:00:00:02 on Android. 02:00:00:8B:74:63 on Mac.
   virtual void DiscoverLowEnergyDevice(int device_ordinal){};
 
+  // Check if Low Energy is available. On Mac, we require OS X >= 10.10.

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

Logically this is used very early, so it fits better higher up. Move this up to
just after the destructor (and update order in other files too). 

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

Done.

+  virtual bool PlatformSupportsLowEnergy() = 0;
+
   // Callbacks that increment |callback_count_|, |error_callback_count_|:
   void Callback();
   void DiscoverySessionCallback(scoped_ptr<BluetoothDiscoverySession>);
   void ErrorCallback();
 
   // Accessors to get callbacks bound to this fixture:
   base::Closure GetCallback();
   BluetoothAdapter::DiscoverySessionCallback GetDiscoverySessionCallback();
   BluetoothAdapter::ErrorCallback GetErrorCallback();
 
   // A Message loop is required by some implementations that will PostTasks and
   // by base::RunLoop().RunUntilIdle() use in this fixuture.
   base::MessageLoop message_loop_;
 
   scoped_refptr<BluetoothAdapter> adapter_;
   ScopedVector<BluetoothDiscoverySession> discovery_sessions_;
   int callback_count_ = 0;
   int error_callback_count_ = 0;
   bool run_message_loop_to_wait_for_callbacks_ = true;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_