Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7162)

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc

Issue 10816023: Ensure canonical Bluetooth UUIDs are used. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
index 6eb0e20f9c0c356a19b69d6efa4b385c1d982cb0..0db3a32e5c2ba9e31fba1c70dc815ea4d19431a7 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
@@ -75,6 +75,8 @@ class BluetoothApiTest : public PlatformAppApiTest {
scoped_refptr<Extension> empty_extension_;
};
+// This is the canonical UUID for the short UUID 0010.
+static const char kCanonicalUuid[] = "00000010-0000-1000-8000-00805f9b34fb";
static const char kOutOfBandPairingDataHash[] = "0123456789ABCDEh";
static const char kOutOfBandPairingDataRandomizer[] = "0123456789ABCDEr";
@@ -140,9 +142,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
devices.push_back(device1_.get());
devices.push_back(device2_.get());
- EXPECT_CALL(*device1_, ProvidesServiceWithUUID("foo"))
+ EXPECT_CALL(*device1_, ProvidesServiceWithUUID(kCanonicalUuid))
.WillOnce(testing::Return(false));
- EXPECT_CALL(*device2_, ProvidesServiceWithUUID("foo"))
+ EXPECT_CALL(*device2_, ProvidesServiceWithUUID(kCanonicalUuid))
.WillOnce(testing::Return(true));
EXPECT_CALL(*mock_adapter_, GetDevices())
@@ -153,7 +155,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
get_devices = setupFunction(new api::BluetoothGetDevicesFunction);
scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
get_devices,
- "[{\"uuid\":\"foo\"}]",
+ "[{\"uuid\":\"0010\"}]",
browser()));
ASSERT_EQ(base::Value::TYPE_LIST, result->GetType());
@@ -196,6 +198,16 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
ASSERT_TRUE(result->GetAsList(&list));
EXPECT_EQ(2u, list->GetSize());
+
+ // Try again with an error
+ testing::Mock::VerifyAndClearExpectations(mock_adapter_);
+
+ get_devices = setupFunction(new api::BluetoothGetDevicesFunction);
+ std::string error(
+ utils::RunFunctionAndReturnError(get_devices,
+ "[{\"uuid\":\"foo\"}]",
+ browser()));
+ EXPECT_FALSE(error.empty());
satorux1 2012/07/24 18:29:21 would it make sense to check the error contents wi
bryeung 2012/07/24 19:50:09 Doesn't really seem worthwhile: I don't think it a
}
IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetLocalOutOfBandPairingData) {

Powered by Google App Engine
This is Rietveld 408576698