From d19ee31e6c9ed0fb9154fd426a08ad41459f1958 Mon Sep 17 00:00:00 2001 From: Cassie Date: Wed, 7 Feb 2018 10:41:45 -0800 Subject: [PATCH] Dot allow error OPERATION_NOT_ALLOWED and REQUEST_NOT_SUPPORTED for startNetworkScan in VTS test. Bug: 71636480 Test: VTS test Change-Id: I067f9fe94e20399fd0f07c6b2b0713544b717959 --- .../1.2/vts/functional/radio_hidl_hal_api.cpp | 94 ++++++------------- 1 file changed, 28 insertions(+), 66 deletions(-) diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp index 64a598a165..06a7f77ce2 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -43,13 +43,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::SIM_ABSENT})); } else if (cardStatus.cardState == CardState::PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); } } @@ -73,12 +69,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::INVALID_ARGUMENTS})); + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -110,15 +104,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -150,15 +140,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -190,15 +176,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -230,15 +212,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -270,15 +248,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -310,15 +284,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS, - RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS})); } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE( - CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); } } @@ -350,14 +320,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); - } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + {RadioError::NONE, RadioError::SIM_ABSENT})); + } else if (cardStatus.cardState == CardState::PRESENT) { + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); } } @@ -390,13 +356,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors( - radioRsp_v1_2->rspInfo.error, - {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); - } else if (cardStatus.cardState == CardState::PRESENT) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, - {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, - RadioError::OPERATION_NOT_ALLOWED})); + {RadioError::NONE, RadioError::SIM_ABSENT})); + } else if (cardStatus.cardState == CardState::PRESENT) { + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); } }