Merge "Change sytle of radio and sap tests to clang google" (7441c791) · Commits · e / os / android_hardware_interfaces

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+104 −103

Original line number	Diff line number	Diff line
		@@ -64,8 +64,9 @@ TEST_F(RadioHidlTest, setGsmBroadcastConfig) {
		gbSmsConfig5.toCodeScheme = 255;
		gbSmsConfig5.selected = true;

		android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo> gsmBroadcastSmsConfigsInfoList
		= {gbSmsConfig1, gbSmsConfig2, gbSmsConfig3, gbSmsConfig4, gbSmsConfig5};
		android::hardware::hidl_vec<GsmBroadcastSmsConfigInfo>
		gsmBroadcastSmsConfigsInfoList = {
		gbSmsConfig1, gbSmsConfig2, gbSmsConfig3, gbSmsConfig4, gbSmsConfig5};

		radio->setGsmBroadcastConfig(++serial, gsmBroadcastSmsConfigsInfoList);

		@@ -106,8 +107,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) {
		cbSmsConfig.language = 1;
		cbSmsConfig.selected = true;

		android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo> cdmaBroadcastSmsConfigInfoList
		= {cbSmsConfig};
		android::hardware::hidl_vec<CdmaBroadcastSmsConfigInfo>
		cdmaBroadcastSmsConfigInfoList = {cbSmsConfig};

		radio->setCdmaBroadcastConfig(++serial, cdmaBroadcastSmsConfigInfoList);

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+147 −147

Original line number	Diff line number	Diff line
		@@ -67,8 +67,8 @@ TEST_F(RadioHidlTest, setupDataCall) {
		bool roamingAllowed = false;
		bool isRoaming = false;

		radio->setupDataCall(++serial, radioTechnology, dataProfileInfo, modemCognitive,
		roamingAllowed, isRoaming);
		radio->setupDataCall(++serial, radioTechnology, dataProfileInfo,
		modemCognitive, roamingAllowed, isRoaming);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		@@ -144,8 +144,8 @@ TEST_F(RadioHidlTest, setInitialAttachApn) {
		bool modemCognitive = true;
		bool isRoaming = false;

		radio->setInitialAttachApn(++serial, dataProfileInfo,
		modemCognitive, isRoaming);
		radio->setInitialAttachApn(++serial, dataProfileInfo, modemCognitive,
		isRoaming);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		@@ -202,7 +202,8 @@ TEST_F(RadioHidlTest, setDataProfile) {
		dataProfileInfo.mvnoMatchData = hidl_string();

		// Create a dataProfileInfoList
		android::hardware::hidl_vec<DataProfileInfo> dataProfileInfoList = {dataProfileInfo};
		android::hardware::hidl_vec<DataProfileInfo> dataProfileInfoList = {
		dataProfileInfo};

		bool isRoadming = false;

		@@ -216,4 +217,3 @@ TEST_F(RadioHidlTest, setDataProfile) {
		// TODO(shuoq): Will add error check when we know the expected error from QC
		}
		}

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+200 −186

Original line number	Diff line number	Diff line
		@@ -20,9 +20,12 @@
		* Test IRadio.getIccCardStatus() for the response returned.
		*/
		TEST_F(RadioHidlTest, getIccCardStatus) {
		EXPECT_LE(cardStatus.applications.size(), (unsigned int) RadioConst::CARD_MAX_APPS);
		EXPECT_LT(cardStatus.gsmUmtsSubscriptionAppIndex, (int) RadioConst::CARD_MAX_APPS);
		EXPECT_LT(cardStatus.cdmaSubscriptionAppIndex, (int) RadioConst::CARD_MAX_APPS);
		EXPECT_LE(cardStatus.applications.size(),
		(unsigned int)RadioConst::CARD_MAX_APPS);
		EXPECT_LT(cardStatus.gsmUmtsSubscriptionAppIndex,
		(int)RadioConst::CARD_MAX_APPS);
		EXPECT_LT(cardStatus.cdmaSubscriptionAppIndex,
		(int)RadioConst::CARD_MAX_APPS);
		EXPECT_LT(cardStatus.imsSubscriptionAppIndex, (int)RadioConst::CARD_MAX_APPS);
		}

		@@ -32,12 +35,13 @@ TEST_F(RadioHidlTest, getIccCardStatus) {
		TEST_F(RadioHidlTest, supplyIccPinForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPinForApp(++serial, hidl_string("test1"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		@@ -54,13 +58,15 @@ TEST_F(RadioHidlTest, supplyIccPinForApp) {
		TEST_F(RadioHidlTest, supplyIccPukForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPukForApp(++serial, hidl_string("test1"), hidl_string("test2"),
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPukForApp(++serial, hidl_string("test1"),
		hidl_string("test2"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);
		@@ -76,12 +82,13 @@ TEST_F(RadioHidlTest, supplyIccPukForApp) {
		TEST_F(RadioHidlTest, supplyIccPin2ForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPin2ForApp(++serial, hidl_string("test1"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		@@ -98,13 +105,15 @@ TEST_F(RadioHidlTest, supplyIccPin2ForApp) {
		TEST_F(RadioHidlTest, supplyIccPuk2ForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPuk2ForApp(++serial, hidl_string("test1"), hidl_string("test2"),
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->supplyIccPuk2ForApp(++serial, hidl_string("test1"),
		hidl_string("test2"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);
		@@ -120,13 +129,15 @@ TEST_F(RadioHidlTest, supplyIccPuk2ForApp) {
		TEST_F(RadioHidlTest, changeIccPinForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		radio->changeIccPinForApp(++serial, hidl_string("test1"), hidl_string("test2"),
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->changeIccPinForApp(++serial, hidl_string("test1"),
		hidl_string("test2"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);
		@@ -142,13 +153,15 @@ TEST_F(RadioHidlTest, changeIccPinForApp) {
		TEST_F(RadioHidlTest, changeIccPin2ForApp) {
		int serial = 1;

		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and 3GPP2 apps only
		// Pass wrong password and check PASSWORD_INCORRECT returned for 3GPP and
		// 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		radio->changeIccPin2ForApp(++serial, hidl_string("test1"), hidl_string("test2"),
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->changeIccPin2ForApp(++serial, hidl_string("test1"),
		hidl_string("test2"),
		cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(serial, radioRsp->rspInfo.serial);
		@@ -166,10 +179,10 @@ TEST_F(RadioHidlTest, getImsiForApp) {

		// Check success returned while getting imsi for 3GPP and 3GPP2 apps only
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		if (cardStatus.applications[i].appType == AppType::SIM
		\|\| cardStatus.applications[i].appType == AppType::USIM
		\|\| cardStatus.applications[i].appType == AppType::RUIM
		\|\| cardStatus.applications[i].appType == AppType::CSIM) {
		if (cardStatus.applications[i].appType == AppType::SIM \|\|
		cardStatus.applications[i].appType == AppType::USIM \|\|
		cardStatus.applications[i].appType == AppType::RUIM \|\|
		cardStatus.applications[i].appType == AppType::CSIM) {
		radio->getImsiForApp(++serial, cardStatus.applications[i].aidPtr);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		@@ -278,7 +291,8 @@ TEST_F(RadioHidlTest, iccTransmitApduLogicalChannel) {
		TEST_F(RadioHidlTest, requestIccSimAuthentication) {
		int serial = 1;

		// Pass wrong challenge string and check RadioError::INVALID_ARGUMENTS returned as error.
		// Pass wrong challenge string and check RadioError::INVALID_ARGUMENTS
		// returned as error.
		for (int i = 0; i < (int)cardStatus.applications.size(); i++) {
		radio->requestIccSimAuthentication(++serial, 0, hidl_string("test"),
		cardStatus.applications[i].aidPtr);

radio/1.0/vts/functional/radio_hidl_hal_ims.cpp

+112 −110

Original line number	Diff line number	Diff line
		@@ -31,9 +31,9 @@ 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(radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::SYSTEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		}
		}

		@@ -65,17 +65,18 @@ TEST_F(RadioHidlTest, getFacilityLockForApp) {
		int32_t serviceClass = 1;
		std::string appId = "";

		radio->getFacilityLockForApp(++serial, facility, password, serviceClass, appId);
		radio->getFacilityLockForApp(++serial, facility, password, serviceClass,
		appId);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		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(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::SYSTEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		}
		}

		@@ -90,17 +91,18 @@ TEST_F(RadioHidlTest, setFacilityLockForApp) {
		int32_t serviceClass = 1;
		std::string appId = "";

		radio->setFacilityLockForApp(++serial, facility, lockState, password, serviceClass, appId);
		radio->setFacilityLockForApp(++serial, facility, lockState, password,
		serviceClass, appId);

		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
		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(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::SYSTEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		}
		}

		@@ -120,10 +122,10 @@ TEST_F(RadioHidlTest, setBarringPassword) {
		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(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS \|\|
		radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::SYSTEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		}
		}

		@@ -140,9 +142,9 @@ 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(radioRsp->rspInfo.error == RadioError::MODEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::SYSTEM_ERR \|\|
		radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);
		}
		}

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+400 −399

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

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

		@@ -647,8 +648,8 @@ 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::NONE \|\|
		radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED);
		}
		}

		@@ -664,8 +665,8 @@ TEST_F(RadioHidlTest, stopLceService) {
		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::NONE \|\|
		radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED);
		}
		}

		@@ -681,8 +682,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::NONE \|\|
		radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED);
		}
		}