Merge "Fix failure vts tests:" into oc-dr1-dev (55967b13) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -123,7 +123,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) {

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

		@@ -140,7 +141,7 @@ TEST_F(RadioHidlTest, getCdmaBroadcastConfig) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -159,7 +160,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) {

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

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+6 −5

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

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

		@@ -216,7 +216,7 @@ TEST_F(RadioHidlTest, setPreferredNetworkType) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -705,7 +705,8 @@ TEST_F(RadioHidlTest, pullLceData) {

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

		@@ -745,7 +746,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
		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 \|\| CheckGeneralError());
		}

		/* Reset back to no carrier restriction */
		@@ -759,7 +760,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
		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 \|\| CheckGeneralError());
		}
		}

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@ TEST_F(RadioHidlTest, sendEnvelope) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(CheckGeneralError() \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::NONE);
		radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR);
		}

		// Test with sending random string
		@@ -54,7 +55,8 @@ TEST_F(RadioHidlTest, sendEnvelope) {
		std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
		ASSERT_TRUE(CheckGeneralError() \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::NONE);
		radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR);
		}
		}

		@@ -153,7 +155,8 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) {

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

		// Test with sending random string
		@@ -168,6 +171,7 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) {

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

radio/1.0/vts/functional/radio_hidl_hal_voice.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -214,7 +214,8 @@ TEST_F(RadioHidlTest, cancelPendingUssd) {

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

		@@ -370,7 +371,8 @@ TEST_F(RadioHidlTest, sendCDMAFeatureCode) {
		radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR);
		radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED);
		}
		}