Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2448f70 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Revert "Allows to skip old tests for new networks." 

This reverts commit 3fd56743.

Reason for revert: Radio 1.0 should not support NR. This is by API design.

Change-Id: Ib32c194ed8c07443f95cb514e7f2fa4e905e0e3e
parent 3fd56743

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+1 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#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;
@@ -73,16 +72,11 @@ TEST_P(RadioHidlTest, getDataRegistrationState) { 
            CellIdentityTdscdma cit = cellIdentities.cellIdentityTdscdma[0];

            hidl_mcc = cit.mcc;

            hidl_mnc = cit.mnc;

        } else if (cellInfoType == CellInfoType::CDMA) {

        } else {

            // 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.

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+1 −6
Original line number Diff line number Diff line
@@ -807,16 +807,11 @@ TEST_P(RadioHidlTest_v1_2, getDataRegistrationState) { 
            cellIdentities.cellIdentityTdscdma[0];

        hidl_mcc = cit.base.mcc;

        hidl_mnc = cit.base.mnc;

    } else if (cellInfoType == CellInfoType::CDMA) {

    } else {

        // 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.