Set skipSubChannel both to true and false when testing scan and step methods.

Bug: b/33382424, b/32022455
Test: VTS
Change-Id: If61fef78555c69a10e3b239ec8cc61bb199e399c
This commit is contained in:
Tomasz Wasilczyk 2017-03-14 10:20:53 -07:00
parent b39197c5d1
commit a8dec0f907

View file

@ -455,6 +455,7 @@ TEST_F(BroadcastRadioHidlTest, SetConfigurationFails) {
* - the HAL implements the method * - the HAL implements the method
* - the method returns 0 (no error) * - the method returns 0 (no error)
* - the tuned callback is received within kTuneCallbacktimeoutNs ns * - the tuned callback is received within kTuneCallbacktimeoutNs ns
* - skipping sub-channel or not does not fail the call
*/ */
TEST_F(BroadcastRadioHidlTest, Scan) { TEST_F(BroadcastRadioHidlTest, Scan) {
ASSERT_EQ(true, openTuner()); ASSERT_EQ(true, openTuner());
@ -468,7 +469,7 @@ TEST_F(BroadcastRadioHidlTest, Scan) {
// test scan DOWN // test scan DOWN
mCallbackCalled = false; mCallbackCalled = false;
hidlResult = mTuner->scan(Direction::DOWN, true); hidlResult = mTuner->scan(Direction::DOWN, false);
EXPECT_TRUE(hidlResult.isOk()); EXPECT_TRUE(hidlResult.isOk());
EXPECT_EQ(Result::OK, hidlResult); EXPECT_EQ(Result::OK, hidlResult);
EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs)); EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));
@ -481,13 +482,14 @@ TEST_F(BroadcastRadioHidlTest, Scan) {
* - the HAL implements the method * - the HAL implements the method
* - the method returns 0 (no error) * - the method returns 0 (no error)
* - the tuned callback is received within kTuneCallbacktimeoutNs ns * - the tuned callback is received within kTuneCallbacktimeoutNs ns
* - skipping sub-channel or not does not fail the call
*/ */
TEST_F(BroadcastRadioHidlTest, Step) { TEST_F(BroadcastRadioHidlTest, Step) {
ASSERT_EQ(true, openTuner()); ASSERT_EQ(true, openTuner());
ASSERT_TRUE(checkAntenna()); ASSERT_TRUE(checkAntenna());
// test step UP // test step UP
mCallbackCalled = false; mCallbackCalled = false;
Return<Result> hidlResult = mTuner->step(Direction::UP, true); Return<Result> hidlResult = mTuner->step(Direction::UP, false);
EXPECT_TRUE(hidlResult.isOk()); EXPECT_TRUE(hidlResult.isOk());
EXPECT_EQ(Result::OK, hidlResult); EXPECT_EQ(Result::OK, hidlResult);
EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs)); EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));