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

Commit 526a3a29 authored by Sarah Chin's avatar Sarah Chin Committed by Sarah Kim
Browse files

Backport VTS fixes to previous test versions 

Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
Merged-In: I77e0706f413ce9defb174f00ee145dcc01f5d780
(cherry picked from commit 8ab8f0d1)
parent 9426eab4

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+11 −4
Original line number Diff line number Diff line
@@ -87,12 +87,19 @@ TEST_P(RadioHidlTest, getDataRegistrationState) { 
                                                 cellIdentities.cellIdentityTdscdma.size());



        if (checkMccMnc) {

            // 32 bit system gets result: "\xff\xff\xff..." from RIL, which is not testable. Only

            // test for 64 bit here. TODO: remove this limit after b/113181277 being fixed.

            if (hidl_mcc.size() < 4 && hidl_mnc.size() < 4) {

            // 32 bit system gets result: "\xff\xff\xff..." from RIL, which is not testable.

            // Only test for 64 bit here. TODO: remove this limit after b/113181277 being fixed.

            int mccSize = hidl_mcc.size();

            EXPECT_TRUE(mccSize == 0 || mccSize == 3);

            if (mccSize > 0) {

                int mcc = stoi(hidl_mcc);

                int mnc = stoi(hidl_mnc);

                EXPECT_TRUE(mcc >= 0 && mcc <= 999);

            }



            int mncSize = hidl_mnc.size();

            EXPECT_TRUE(mncSize == 0 || mncSize == 2 || mncSize == 3);

            if (mncSize > 0) {

                int mnc = stoi(hidl_mnc);

                EXPECT_TRUE(mnc >= 0 && mnc <= 999);

            }

        }

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+16 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { 
    serial = GetRandomSerialNumber();



    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 4,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 60,
@@ -155,7 +155,7 @@ TEST_P(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { 
    serial = GetRandomSerialNumber();



    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 301,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 60,
@@ -821,13 +821,22 @@ TEST_P(RadioHidlTest_v1_2, getDataRegistrationState) { 
                  cellIdentities.cellIdentityTdscdma.size());



    // 32 bit system might return invalid mcc and mnc hidl string "\xff\xff..."

    if (checkMccMnc && hidl_mcc.size() < 4 && hidl_mnc.size() < 4) {

    if (checkMccMnc) {

        int mccSize = hidl_mcc.size();

        EXPECT_TRUE(mccSize == 0 || mccSize == 3);

        if (mccSize > 0) {

            int mcc = stoi(hidl_mcc);

        int mnc = stoi(hidl_mnc);

            EXPECT_TRUE(mcc >= 0 && mcc <= 999);

        }



        int mncSize = hidl_mnc.size();

        EXPECT_TRUE(mncSize == 0 || mncSize == 2 || mncSize == 3);

        if (mncSize > 0) {

            int mnc = stoi(hidl_mnc);

            EXPECT_TRUE(mnc >= 0 && mnc <= 999);

        }

    }

}



/*

 * Test IRadio.getAvailableBandModes() for the response returned.

radio/1.4/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ TEST_P(RadioHidlTest_v1_4, startNetworkScan_InvalidInterval1) { 
    serial = GetRandomSerialNumber();



    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 4,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 60,
@@ -368,7 +368,7 @@ TEST_P(RadioHidlTest_v1_4, startNetworkScan_InvalidInterval2) { 
    serial = GetRandomSerialNumber();



    ::android::hardware::radio::V1_2::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 301,

            .specifiers = {::GERAN_SPECIFIER_P900, ::GERAN_SPECIFIER_850},

            .maxSearchTime = 60,

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan_InvalidInterval1) { 
            .channels = {128, 129}};



    ::android::hardware::radio::V1_5::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 4,

            .specifiers = {specifierP900, specifier850},

            .maxSearchTime = 60,
@@ -700,7 +700,7 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan_InvalidInterval2) { 
            .channels = {128, 129}};



    ::android::hardware::radio::V1_5::NetworkScanRequest request = {

            .type = ScanType::ONE_SHOT,

            .type = ScanType::PERIODIC,

            .interval = 301,

            .specifiers = {specifierP900, specifier850},

            .maxSearchTime = 60,