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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc

Issue 593163002: Short-circuit failures in BLE js tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Testing new cls Created 6 years, 3 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
« no previous file with comments | « chrome/test/data/extensions/api_test/bluetooth_low_energy/write_descriptor_value/runtest.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
index e9997e9df87ac237203b4be25fe6500058183b60..98e289bf09a618499ec3d20245cedced9144dacc 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc
@@ -277,10 +277,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetServices) {
.WillOnce(Return(services));
// Load and wait for setup.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/get_services")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
armansito 2014/09/23 20:05:56 Instead of doing this, you can give an ExtensionTe
listener.Reply("go");
@@ -305,10 +306,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetService) {
.WillOnce(Return(service0_.get()));
// Load and wait for setup.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/get_service")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -323,7 +325,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ServiceEvents) {
catcher.RestrictToBrowserContext(browser()->profile());
// Load the extension and let it set up.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/service_events")));
@@ -347,6 +349,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ServiceEvents) {
mock_adapter_, device0_.get(), service0_.get());
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -375,9 +378,10 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedService) {
event_router()->GattDiscoveryCompleteForService(mock_adapter_,
service0_.get());
- ExtensionTestMessageListener get_service_success_listener("getServiceSuccess",
- true);
+ ExtensionTestMessageListener get_service_success_listener(true);
EXPECT_TRUE(get_service_success_listener.WaitUntilSatisfied());
+ ASSERT_EQ("getServiceSuccess", get_service_success_listener.message())
+ << get_service_success_listener.message();
testing::Mock::VerifyAndClearExpectations(mock_adapter_);
testing::Mock::VerifyAndClearExpectations(device0_.get());
@@ -388,9 +392,10 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedService) {
event_router()->GattServiceRemoved(
mock_adapter_, device0_.get(), service0_.get());
- ExtensionTestMessageListener get_service_fail_listener("getServiceFail",
- true);
+ ExtensionTestMessageListener get_service_fail_listener(true);
EXPECT_TRUE(get_service_fail_listener.WaitUntilSatisfied());
+ ASSERT_EQ("getServiceFail", get_service_fail_listener.message())
+ << get_service_fail_listener.message();
testing::Mock::VerifyAndClearExpectations(mock_adapter_);
testing::Mock::VerifyAndClearExpectations(device0_.get());
@@ -407,8 +412,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetIncludedServices) {
"bluetooth_low_energy/get_included_services")));
// Wait for initial call to end with failure as there is no mapping.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
// Set up for the rest of the calls before replying. Included services can be
// returned even if there is no instance ID mapping for them yet, so no need
@@ -433,6 +439,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetIncludedServices) {
listener.Reset();
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -499,10 +506,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetCharacteristic) {
.WillOnce(Return(chrc0_.get()));
// Load the extension and wait for first test.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/get_characteristic")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -563,6 +571,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, CharacteristicProperties) {
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/characteristic_properties")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -594,8 +603,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedCharacteristic) {
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/get_removed_characteristic")));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
testing::Mock::VerifyAndClearExpectations(mock_adapter_);
testing::Mock::VerifyAndClearExpectations(device0_.get());
testing::Mock::VerifyAndClearExpectations(service0_.get());
@@ -609,6 +619,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedCharacteristic) {
listener.Reply("go");
listener.Reset();
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -712,10 +723,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ReadCharacteristicValue) {
.WillOnce(InvokeCallbackArgument<1>())
.WillOnce(InvokeCallbackArgument<0>(value));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/read_characteristic_value")));
- EXPECT_TRUE(listener.WaitUntilSatisfied());
+ listener.WaitUntilSatisfied();
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -754,10 +766,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, WriteCharacteristicValue) {
EXPECT_CALL(*chrc0_, GetValue()).Times(1).WillOnce(ReturnRef(write_value));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/write_characteristic_value")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -795,10 +808,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptors) {
.WillOnce(Return(std::vector<BluetoothGattDescriptor*>()))
.WillOnce(Return(descriptors));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptors")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -839,10 +853,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetDescriptor) {
.WillOnce(Return(desc0_.get()));
// Load the extension and wait for first test.
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("bluetooth_low_energy/get_descriptor")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -879,8 +894,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedDescriptor) {
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/get_removed_descriptor")));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
testing::Mock::VerifyAndClearExpectations(mock_adapter_);
testing::Mock::VerifyAndClearExpectations(device0_.get());
testing::Mock::VerifyAndClearExpectations(service0_.get());
@@ -896,6 +912,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, GetRemovedDescriptor) {
listener.Reply("go");
listener.Reset();
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -969,10 +986,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ReadDescriptorValue) {
.WillOnce(InvokeCallbackArgument<1>())
.WillOnce(InvokeCallbackArgument<0>(value));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/read_descriptor_value")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -1017,10 +1035,11 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, WriteDescriptorValue) {
EXPECT_CALL(*desc0_, GetValue()).Times(1).WillOnce(ReturnRef(write_value));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/write_descriptor_value")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
listener.Reply("go");
@@ -1077,7 +1096,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, UuidPermissionEvents) {
ResultCatcher catcher;
catcher.RestrictToBrowserContext(browser()->profile());
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/uuid_permission_events")));
@@ -1097,6 +1116,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, UuidPermissionEvents) {
EXPECT_TRUE(listener.WaitUntilSatisfied());
listener.Reply("go");
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+ ASSERT_EQ("ready", listener.message()) << listener.message();
event_router()->GattDescriptorRemoved(mock_adapter_, desc0_.get());
event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
@@ -1184,15 +1204,17 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ConnectInProgress) {
.Times(1)
.WillOnce(SaveArg<0>(&connect_callback));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/connect_in_progress")));
- listener.WaitUntilSatisfied();
+ EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
connect_callback.Run(conn_ptr.Pass());
listener.Reset();
- listener.WaitUntilSatisfied();
+ EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
disconnect_callback.Run();
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -1249,11 +1271,12 @@ IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, StartStopNotifications) {
InvokeCallbackWithScopedPtrArg<0, BluetoothGattNotifySession>(
session1));
- ExtensionTestMessageListener listener("ready", true);
+ ExtensionTestMessageListener listener(true);
ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
"bluetooth_low_energy/start_stop_notifications")));
EXPECT_TRUE(listener.WaitUntilSatisfied());
+ ASSERT_EQ("ready", listener.message()) << listener.message();
std::vector<uint8> value;
event_router()->GattCharacteristicValueChanged(
« no previous file with comments | « chrome/test/data/extensions/api_test/bluetooth_low_energy/write_descriptor_value/runtest.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698