diff options
author | Amit Mahajan | 2018-06-25 16:16:37 -0500 |
---|---|---|
committer | Keun Soo Yim | 2018-08-28 17:40:38 -0500 |
commit | 15fec86821e1bc3451a032adfa3b5e7732693a70 (patch) | |
tree | a5c00f8dbb76bb5d72293a9a67c734c3e83429ec | |
parent | 77db79a6945021518bc703b3727f9d2a63652722 (diff) | |
download | platform-hardware-interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.tar.gz platform-hardware-interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.tar.xz platform-hardware-interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.zip |
Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN.
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110716988
Merged-In: I9a5f014d498db00d818870cbd73e119f66562ef1
Change-Id: I9a5f014d498db00d818870cbd73e119f66562ef1
(cherry picked from commit c7896501db413c9a0fa44d2697da4079610075d8)
-rw-r--r-- | radio/1.2/vts/functional/radio_hidl_hal_api.cpp | 22 |
1 files changed, 18 insertions, 4 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 03911da6..7a47bd52 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp | |||
@@ -525,7 +525,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisDlK | |||
525 | 525 | ||
526 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisDlKbps, rspInfo.error = %s\n", | 526 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisDlKbps, rspInfo.error = %s\n", |
527 | toString(radioRsp_v1_2->rspInfo.error).c_str()); | 527 | toString(radioRsp_v1_2->rspInfo.error).c_str()); |
528 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); | 528 | // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for |
529 | // GERAN | ||
530 | ASSERT_TRUE( | ||
531 | CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, | ||
532 | {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); | ||
529 | } | 533 | } |
530 | 534 | ||
531 | /* | 535 | /* |
@@ -546,7 +550,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK | |||
546 | 550 | ||
547 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", | 551 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", |
548 | toString(radioRsp_v1_2->rspInfo.error).c_str()); | 552 | toString(radioRsp_v1_2->rspInfo.error).c_str()); |
549 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); | 553 | // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for |
554 | // GERAN | ||
555 | ASSERT_TRUE( | ||
556 | CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, | ||
557 | {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); | ||
550 | } | 558 | } |
551 | 559 | ||
552 | /* | 560 | /* |
@@ -564,7 +572,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) { | |||
564 | 572 | ||
565 | ALOGI("setLinkCapacityReportingCriteria_emptyParams, rspInfo.error = %s\n", | 573 | ALOGI("setLinkCapacityReportingCriteria_emptyParams, rspInfo.error = %s\n", |
566 | toString(radioRsp_v1_2->rspInfo.error).c_str()); | 574 | toString(radioRsp_v1_2->rspInfo.error).c_str()); |
567 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); | 575 | // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for |
576 | // GERAN | ||
577 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, | ||
578 | {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); | ||
568 | } | 579 | } |
569 | 580 | ||
570 | /* | 581 | /* |
@@ -583,7 +594,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) { | |||
583 | 594 | ||
584 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", | 595 | ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", |
585 | toString(radioRsp_v1_2->rspInfo.error).c_str()); | 596 | toString(radioRsp_v1_2->rspInfo.error).c_str()); |
586 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); | 597 | // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for |
598 | // GERAN | ||
599 | ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, | ||
600 | {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); | ||
587 | } | 601 | } |
588 | 602 | ||
589 | /* | 603 | /* |