From 96f01bb75d34badbda6109ddd7c9c5bb880760f0 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Thu, 30 Jan 2020 20:17:13 -0800 Subject: [PATCH] Remove setSystemSelectionChannels vts test. This HAL API was not enforced in IRadio 1.3. The vts was disabled. Now we have new API setSystemSelectionChannels_1_5 in IRadio 1.5 and corresponding vts test. We no longer need this old disabled vts. Bug: 146062695 Test: vts Change-Id: Ie81cb38c4848118318b9df5eef799469ff362f16 Merged-In: Ie81cb38c4848118318b9df5eef799469ff362f16 --- .../1.3/vts/functional/radio_hidl_hal_api.cpp | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/radio/1.3/vts/functional/radio_hidl_hal_api.cpp b/radio/1.3/vts/functional/radio_hidl_hal_api.cpp index 4e4814103d..ca64305bfe 100644 --- a/radio/1.3/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.3/vts/functional/radio_hidl_hal_api.cpp @@ -75,38 +75,3 @@ TEST_P(RadioHidlTest_v1_3, getModemStackStatus) { radioRsp_v1_3->rspInfo.error, {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); } - -/* - * Test IRadio.setSystemSelectionChannels() for the response returned. - * - * This test is excluded from manifest, due to non-implementation in Q. Tracked by b/130254624. - */ -TEST_P(RadioHidlTest_v1_3, setSystemSelectionChannels) { - serial = GetRandomSerialNumber(); - - RadioAccessSpecifier specifier = {.radioAccessNetwork = RadioAccessNetworks::GERAN, - .geranBands = {GeranBands::BAND_450, GeranBands::BAND_480}, - .channels = {1, 2}}; - - Return res = radio_v1_3->setSystemSelectionChannels(serial, true, {specifier}); - ASSERT_OK(res); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type); - EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial); - ALOGI("setSystemSelectionChannels, rspInfo.error = %s\n", - toString(radioRsp_v1_3->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_3->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INTERNAL_ERR})); - - if (radioRsp_v1_3->rspInfo.error == RadioError::NONE) { - Return res = radio_v1_3->setSystemSelectionChannels(serial, false, {specifier}); - ASSERT_OK(res); - EXPECT_EQ(std::cv_status::no_timeout, wait()); - EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_3->rspInfo.type); - EXPECT_EQ(serial, radioRsp_v1_3->rspInfo.serial); - ALOGI("setSystemSelectionChannels, rspInfo.error = %s\n", - toString(radioRsp_v1_3->rspInfo.error).c_str()); - EXPECT_EQ(RadioError::NONE, radioRsp_v1_3->rspInfo.error); - } -} \ No newline at end of file