Merge "Fix Vts errors" (570b0cbf) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+17 −6

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

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

		@@ -92,7 +95,9 @@ TEST_F(RadioHidlTest, getGsmBroadcastConfig) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -117,7 +122,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

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

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

		@@ -152,7 +158,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -170,6 +177,10 @@ TEST_F(RadioHidlTest, setGsmBroadcastActivation) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+15 −4

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

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

		@@ -94,7 +100,7 @@ TEST_F(RadioHidlTest, deactivateDataCall) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

		if (cardStatus.cardState == CardState::ABSENT) {
		EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error);
		EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error);
		}
		}

		@@ -111,7 +117,8 @@ TEST_F(RadioHidlTest, getDataCallList) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -152,7 +159,11 @@ TEST_F(RadioHidlTest, setInitialAttachApn) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -316,6 +316,8 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

radio/1.0/vts/functional/radio_hidl_hal_ims.cpp

+16 −19

Original line number	Diff line number	Diff line
		@@ -31,9 +31,8 @@ TEST_F(RadioHidlTest, getClir) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -73,10 +72,9 @@ TEST_F(RadioHidlTest, getFacilityLockForApp) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -99,10 +97,9 @@ TEST_F(RadioHidlTest, setFacilityLockForApp) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -122,10 +119,11 @@ TEST_F(RadioHidlTest, setBarringPassword) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -142,9 +140,8 @@ TEST_F(RadioHidlTest, getClip) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -180,7 +177,7 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+40 −14

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

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

		@@ -124,7 +127,11 @@ TEST_F(RadioHidlTest, setNetworkSelectionModeManual) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -140,7 +147,11 @@ TEST_F(RadioHidlTest, getAvailableNetworks) {
		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 \|\|
		radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE \|\|
		radioRsp->rspInfo.error == RadioError::CANCELLED \|\|
		radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED);
		}
		}

		@@ -284,7 +295,9 @@ TEST_F(RadioHidlTest, getCdmaRoamingPreference) {
		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 \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR);
		}
		}

		@@ -462,7 +475,9 @@ TEST_F(RadioHidlTest, getCellInfoList) {
		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 \|\|
		radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND);
		}
		}

		@@ -565,7 +580,12 @@ TEST_F(RadioHidlTest, setUiccSubscription) {
		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::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::NONE \|\|
		radioRsp->rspInfo.error ==
		RadioError::SUBSCRIPTION_NOT_SUPPORTED \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR);
		}
		}

		@@ -597,7 +617,8 @@ TEST_F(RadioHidlTest, requestShutdown) {
		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);
		}
		}

		@@ -632,7 +653,9 @@ TEST_F(RadioHidlTest, setRadioCapability) {
		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::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::INVALID_STATE);
		}
		}

		@@ -648,8 +671,9 @@ TEST_F(RadioHidlTest, startLceService) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -682,8 +706,8 @@ TEST_F(RadioHidlTest, pullLceData) {
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);

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

		@@ -755,7 +779,8 @@ TEST_F(RadioHidlTest, sendDeviceState) {
		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::INVALID_ARGUMENTS);
		}
		}

		@@ -771,7 +796,8 @@ TEST_F(RadioHidlTest, setIndicationFilter) {
		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::INVALID_ARGUMENTS);
		}
		}