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

Commit b583b9e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 69069ea1 51fb7b82

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+9 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ TEST_F(RadioHidlTest, setupDataCall) { 
                    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 ||

                    CheckOEMError());

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

    }

}
@@ -98,7 +98,9 @@ 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 +118,8 @@ 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 +223,8 @@ 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_misc.cpp

+16 −14
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ TEST_F(RadioHidlTest, startLceService) { 
    if (cardStatus.cardState == CardState::ABSENT) {

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

    }

}
@@ -695,7 +696,8 @@ 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);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_sms.cpp

+20 −10
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);

    }

}
@@ -237,7 +240,8 @@ TEST_F(RadioHidlTest, getSmscAddress) { 


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

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

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

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

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

    }

}
@@ -257,7 +261,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 +290,8 @@ 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 +314,8 @@ 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 +368,8 @@ 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 +421,8 @@ 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 +443,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);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

+4 −2
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

    }



    // Test with sending random string
@@ -172,6 +173,7 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 
    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+1 −1

File changed.

Contains only whitespace changes.