Merge "Fix some VTS for 2017 devices" (03c9b102) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+26 −16

Original line number	Diff line number	Diff line
		@@ -248,7 +248,8 @@ TEST_F(RadioHidlTest, getNeighboringCids) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
		}
		}

		@@ -280,7 +281,8 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -345,7 +347,8 @@ TEST_F(RadioHidlTest, setPreferredVoicePrivacy) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -361,7 +364,8 @@ TEST_F(RadioHidlTest, getPreferredVoicePrivacy) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -494,7 +498,8 @@ TEST_F(RadioHidlTest, setCellInfoListRate) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -562,7 +567,8 @@ TEST_F(RadioHidlTest, nvResetConfig) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -651,7 +657,6 @@ TEST_F(RadioHidlTest, setRadioCapability) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(CheckGeneralError() \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_STATE);
		@@ -670,7 +675,6 @@ TEST_F(RadioHidlTest, startLceService) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE \|\|
		radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		@@ -690,7 +694,8 @@ TEST_F(RadioHidlTest, stopLceService) {

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

		@@ -724,7 +729,8 @@ TEST_F(RadioHidlTest, getModemActivityInfo) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -778,7 +784,8 @@ TEST_F(RadioHidlTest, getAllowedCarriers) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -793,9 +800,11 @@ TEST_F(RadioHidlTest, sendDeviceState) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckGeneralError() \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
		}
		}

		@@ -810,9 +819,11 @@ TEST_F(RadioHidlTest, setIndicationFilter) {
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		if (cardStatus.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckGeneralError() \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
		}
		}

		@@ -828,7 +839,6 @@ TEST_F(RadioHidlTest, setSimCardPower) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
		}