Merge "Skip radio VTS test cases on deprecated interfaces" (43175bec) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ cc_test {
		],
		static_libs: [
		"android.hardware.radio@1.0",
		"android.hardware.radio@1.1",
		"android.hardware.radio@1.2",
		],
		test_config: "vts_hal_radio_target_test.xml",
		test_suites: [

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		#include <android-base/logging.h>
		#include <android/hardware/radio/1.2/IRadio.h>
		#include <radio_hidl_hal_utils_v1_0.h>

		using namespace ::android::hardware::radio::V1_0;
		@@ -139,6 +140,9 @@ TEST_P(RadioHidlTest, setupDataCall) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// setupDataCall is deprecated on radio::V1_2 with setupDataCall_1_2
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
		@@ -164,6 +168,9 @@ TEST_P(RadioHidlTest, deactivateDataCall) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// deactivateDataCall is deprecated on radio::V1_2 with deactiveDataCall_1_2
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+16 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		#include <android-base/logging.h>
		#include <android/hardware/radio/1.2/IRadio.h>
		#include <radio_hidl_hal_utils_v1_0.h>

		/*
		@@ -771,6 +772,9 @@ TEST_P(RadioHidlTest, startLceService) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// HAL 1.2 and later use the always-on LCE that relies on indications.
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp->rspInfo.error,
		@@ -792,6 +796,9 @@ TEST_P(RadioHidlTest, stopLceService) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// HAL 1.2 and later use the always-on LCE that relies on indications.
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::LCE_NOT_SUPPORTED,
		@@ -812,6 +819,9 @@ TEST_P(RadioHidlTest, pullLceData) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// HAL 1.2 and later use the always-on LCE that relies on indications.
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::INTERNAL_ERR,
		@@ -971,6 +981,9 @@ TEST_P(RadioHidlTest, setIndicationFilter) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// setIndicationFilter is deprecated on radio::V1_2 with setIndicationFilter_1_2
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_2);

		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;

		if (cardStatus.cardState == CardState::ABSENT) {
		@@ -992,6 +1005,9 @@ TEST_P(RadioHidlTest, setSimCardPower) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		// setSimCardPower is deprecated on radio::V1_1 with setSimCardPower_1_1
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(1_1);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
		{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));

radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ using ::android::sp;

		#define TIMEOUT_PERIOD 75
		#define RADIO_SERVICE_NAME "slot1"
		#define SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL_VERSION_AT_LEAST(__ver__) \
		SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL(__ver__, radio, radioRsp)

		class RadioHidlTest;
		extern CardStatus cardStatus;

radio/1.0/vts/functional/vts_test_util.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,20 @@ using ::android::hardware::radio::V1_0::RegState;
		using ::android::hardware::radio::V1_0::SapResultCode;
		using namespace std;

		/*
		* MACRO used to skip test case when radio response return error REQUEST_NOT_SUPPORTED
		* on HAL versions which has deprecated the request interfaces. The MACRO can only be used
		* AFTER receiving radio response.
		*/
		#define SKIP_TEST_IF_REQUEST_NOT_SUPPORTED_WITH_HAL(__ver__, __radio__, __radioRsp__) \
		do { \
		sp<::android::hardware::radio::V##__ver__::IRadio> __radio = \
		::android::hardware::radio::V##__ver__::IRadio::castFrom(__radio__); \
		if (__radio && __radioRsp__->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED) { \
		GTEST_SKIP() << "REQUEST_NOT_SUPPORTED"; \
		} \
		} while (0)

		enum CheckFlag {
		CHECK_DEFAULT = 0,
		CHECK_GENERAL_ERROR = 1,