Index: device/bluetooth/test/bluetooth_test.h |
diff --git a/device/bluetooth/test/bluetooth_test.h b/device/bluetooth/test/bluetooth_test.h |
index 5b7caaf148c8a32926d3642635f6b6f80ae2758c..d9df15fd5a7a25b351fe811ad5c6a34cb5c2ccd0 100644 |
--- a/device/bluetooth/test/bluetooth_test.h |
+++ b/device/bluetooth/test/bluetooth_test.h |
@@ -41,6 +41,10 @@ class BluetoothTestBase : public testing::Test { |
public: |
enum class Call { EXPECTED, NOT_EXPECTED }; |
+ // Contains the device id, new value being sent and a flag to indicate if |
+ // this is an indication instead. |
+ using NotificationType = std::tuple<std::string, std::vector<uint8_t>, bool>; |
scheib
2016/06/07 05:10:04
Please use a struct with named members instead of
rkc
2016/06/09 21:08:27
Using a struct raises several complications.
First
scheib
2016/06/09 21:34:35
If not a struct, then named parameters to the meth
rkc
2016/06/12 00:24:28
Done.
|
+ |
static const std::string kTestAdapterName; |
static const std::string kTestAdapterAddress; |
@@ -263,7 +267,7 @@ class BluetoothTestBase : public testing::Test { |
// Returns the value for the last notification that was sent on this |
// characteristic. |
- virtual std::vector<uint8_t> LastNotifactionValueForCharacteristic( |
+ virtual NotificationType LastNotifactionValueForCharacteristic( |
BluetoothLocalGattCharacteristic* characteristic); |
// Remembers |descriptor|'s platform specific object to be used in a |