Merge "VTS: Check return status of initialize and close" am: 5956e27299

am: 47e876a673

Change-Id: Ic45abea566ef09a1edfa10bf469ea73027185095
This commit is contained in:
Jack He
2018-10-09 06:37:51 -07:00
committed by android-build-merger

View File

@@ -170,8 +170,9 @@ class BluetoothHidlTest : public ::testing::VtsHalHidlTargetTestBase {
acl_cb_count = 0;
sco_cb_count = 0;
ASSERT_EQ(initialized, false);
bluetooth->initialize(bluetooth_cb);
ASSERT_FALSE(initialized);
// Should not be checked in production code
ASSERT_TRUE(bluetooth->initialize(bluetooth_cb).isOk());
bluetooth_cb->SetWaitTimeout(kCallbackNameInitializationComplete,
WAIT_FOR_INIT_TIMEOUT);
@@ -186,15 +187,16 @@ class BluetoothHidlTest : public ::testing::VtsHalHidlTargetTestBase {
bluetooth_cb->WaitForCallback(kCallbackNameInitializationComplete)
.no_timeout);
ASSERT_EQ(initialized, true);
ASSERT_TRUE(initialized);
}
virtual void TearDown() override {
bluetooth->close();
handle_no_ops();
EXPECT_EQ(static_cast<size_t>(0), event_queue.size());
EXPECT_EQ(static_cast<size_t>(0), sco_queue.size());
EXPECT_EQ(static_cast<size_t>(0), acl_queue.size());
// Should not be checked in production code
ASSERT_TRUE(bluetooth->close().isOk());
handle_no_ops();
EXPECT_EQ(static_cast<size_t>(0), event_queue.size());
EXPECT_EQ(static_cast<size_t>(0), sco_queue.size());
EXPECT_EQ(static_cast<size_t>(0), acl_queue.size());
}
void setBufferSizes();