Allows to skip old tests for new networks.

If the getDataRegistrationState interface is tested on a new RAT
(e.g. 5g) that was not supported in this version, this allows the
test to be skipped for newer networks.

Bug: 303672201
Test: atest VtsHalRadioV1_0TargetTest:PerInstance/RadioHidlTest
Change-Id: I1bbaefd1f1f41bb4b46fb515e5a1bc6b80153c74
This commit is contained in:
sangyun
2024-01-24 13:40:54 +09:00
parent 2f66667556
commit 3fd567437c
2 changed files with 13 additions and 2 deletions

View File

@@ -16,6 +16,7 @@
#include <android-base/logging.h>
#include <android/hardware/radio/1.2/IRadio.h>
#include <gtest/gtest.h>
#include <radio_hidl_hal_utils_v1_0.h>
using namespace ::android::hardware::radio::V1_0;
@@ -72,11 +73,16 @@ TEST_P(RadioHidlTest, getDataRegistrationState) {
CellIdentityTdscdma cit = cellIdentities.cellIdentityTdscdma[0];
hidl_mcc = cit.mcc;
hidl_mnc = cit.mnc;
} else {
} else if (cellInfoType == CellInfoType::CDMA) {
// CellIndentityCdma has no mcc and mnc.
EXPECT_EQ(CellInfoType::CDMA, cellInfoType);
EXPECT_EQ(1, cellIdentities.cellIdentityCdma.size());
checkMccMnc = false;
} else {
// This test can be skipped for newer networks if a new RAT (e.g. 5g) that was not
// supported in this version is added to the response from a modem that supports a new
// version of this interface.
GTEST_SKIP() << "Exempt from 1.0 test: camped on a new network:" << (int)cellInfoType;
}
// Check only one CellIdentity is size 1, and others must be 0.

View File

@@ -807,11 +807,16 @@ TEST_P(RadioHidlTest_v1_2, getDataRegistrationState) {
cellIdentities.cellIdentityTdscdma[0];
hidl_mcc = cit.base.mcc;
hidl_mnc = cit.base.mnc;
} else {
} else if (cellInfoType == CellInfoType::CDMA) {
// CellIndentityCdma has no mcc and mnc.
EXPECT_EQ(CellInfoType::CDMA, cellInfoType);
EXPECT_EQ(1, cellIdentities.cellIdentityCdma.size());
checkMccMnc = false;
} else {
// This test can be skipped for newer networks if a new RAT (e.g. 5g) that was not
// supported in this version is added to the response from a modem that supports a new
// version of this interface.
GTEST_SKIP() << "Exempt from 1.2 test: camped on a new network:" << (int)cellInfoType;
}
// Check only one CellIdentity is size 1, and others must be 0.