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

Commit e43214e2 authored by Legler Wu's avatar Legler Wu Committed by android-build-merger
Browse files

Update VTS tests so that Mediatek pass more VTS for O. 

am: b36443a8

Change-Id: I57b1b941551d56bb46494aad50226b72009e9dde
parents 5b245a26 b36443a8

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+6 −3
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);

    }

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



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError());

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    CheckGeneralError());

    }

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



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+18 −6
Original line number Diff line number Diff line
@@ -76,9 +76,13 @@ TEST_F(RadioHidlTest, setupDataCall) { 


    if (cardStatus.cardState == CardState::ABSENT) {

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

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

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||

                    CheckOEMError());

    }

}
@@ -98,7 +102,10 @@ TEST_F(RadioHidlTest, deactivateDataCall) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||

                    CheckOEMError());

    }

}
@@ -116,7 +123,9 @@ TEST_F(RadioHidlTest, getDataCallList) { 


    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE);

                    radioRsp->rspInfo.error ==

                        RadioError::RADIO_NOT_AVAILABLE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -220,6 +229,9 @@ TEST_F(RadioHidlTest, setDataProfile) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        // TODO(shuoq): Will add error check when we know the expected error from QC

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error ==

                        RadioError::RADIO_NOT_AVAILABLE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { 
                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_SIM_STATE ||

                    radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT ||

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+18 −7
Original line number Diff line number Diff line
@@ -677,9 +677,11 @@ TEST_F(RadioHidlTest, startLceService) { 


    if (cardStatus.cardState == CardState::ABSENT) {

        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||

        ASSERT_TRUE(radioRsp->rspInfo.error ==

                        RadioError::RADIO_NOT_AVAILABLE ||

                    radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -697,7 +699,9 @@ TEST_F(RadioHidlTest, stopLceService) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||

                    radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

                    radioRsp->rspInfo.error ==

                        RadioError::REQUEST_NOT_SUPPORTED ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -713,8 +717,11 @@ TEST_F(RadioHidlTest, pullLceData) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() ||

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR);

        ASSERT_TRUE(radioRsp->rspInfo.error ==

                        RadioError::RADIO_NOT_AVAILABLE ||

                    CheckOEMError() ||

                    radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -755,7 +762,9 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error ==

                        RadioError::REQUEST_NOT_SUPPORTED);

    }



    /* Reset back to no carrier restriction */
@@ -769,7 +778,9 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        EXPECT_EQ(radioRsp->rspInfo.error, RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error ==

                        RadioError::REQUEST_NOT_SUPPORTED);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_sms.cpp

+27 −11
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ TEST_F(RadioHidlTest, sendSms) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE);

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

        EXPECT_EQ(0, radioRsp->sendSmsResult.errorCode);

    }

}
@@ -62,7 +63,8 @@ TEST_F(RadioHidlTest, sendSMSExpectMore) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE);

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -145,7 +147,8 @@ TEST_F(RadioHidlTest, sendCdmaSms) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE);

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -236,8 +239,11 @@ TEST_F(RadioHidlTest, getSmscAddress) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error ==

                        RadioError::INVALID_MODEM_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -257,7 +263,8 @@ TEST_F(RadioHidlTest, setSmscAddress) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT);

                    radioRsp->rspInfo.error == RadioError::INVALID_SMS_FORMAT ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -285,7 +292,9 @@ TEST_F(RadioHidlTest, writeSmsToSim) { 
                    radioRsp->rspInfo.error == RadioError::ENCODING_ERR ||

                    radioRsp->rspInfo.error == RadioError::NO_RESOURCES ||

                    radioRsp->rspInfo.error == RadioError::NETWORK_NOT_READY ||

                    radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS);

                    radioRsp->rspInfo.error ==

                        RadioError::INVALID_SMSC_ADDRESS ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -308,7 +317,9 @@ TEST_F(RadioHidlTest, deleteSmsOnSim) { 
                    radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY ||

                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);

                    radioRsp->rspInfo.error ==

                        RadioError::INVALID_MODEM_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -361,7 +372,9 @@ TEST_F(RadioHidlTest, writeSmsToRuim) { 
                    radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY ||

                    radioRsp->rspInfo.error == RadioError::INVALID_SMSC_ADDRESS);

                    radioRsp->rspInfo.error ==

                        RadioError::INVALID_SMSC_ADDRESS ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -413,7 +426,9 @@ TEST_F(RadioHidlTest, deleteSmsOnRuim) { 
                    radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                    radioRsp->rspInfo.error == RadioError::NO_SUCH_ENTRY ||

                    radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE);

                    radioRsp->rspInfo.error ==

                        RadioError::INVALID_MODEM_STATE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}
@@ -434,6 +449,7 @@ TEST_F(RadioHidlTest, reportSmsMemoryStatus) { 
        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::INVALID_STATE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

    }

}