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

Commit 33b550ce authored by Shuo Qian's avatar Shuo Qian
Browse files

Revert "Modify VTS error check so that the error code can be displayed" 

This reverts commit cf243eba.

Change-Id: Idd42b12cdcbaab1476e460c34f3b4b60c38dead0
parent cf243eba

radio/1.0/vts/functional/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -50,13 +50,10 @@ cc_test { 


cc_library_static {

    name: "RadioVtsTestUtilBase",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["hidl_defaults"],

    srcs : [

        "vts_test_util.cpp"

    ],

    shared_libs: [

        "android.hardware.radio@1.0",

    ],

}



cc_library_headers {

radio/1.0/vts/functional/radio_hidl_hal_cell_broadcast.cpp

+21 −21
Original line number Diff line number Diff line
@@ -74,10 +74,11 @@ TEST_F(RadioHidlTest, setGsmBroadcastConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::INVALID_ARGUMENTS,

                                      RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

    }

}
@@ -94,10 +95,9 @@ TEST_F(RadioHidlTest, getGsmBroadcastConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::INVALID_MODEM_STATE, RadioError::INVALID_STATE},

            CHECK_GENERAL_ERROR));

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

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

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

    }

}
@@ -122,9 +122,9 @@ TEST_F(RadioHidlTest, setCdmaBroadcastConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::INVALID_MODEM_STATE},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

    }

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



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

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR));

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

    }

}
@@ -160,9 +159,9 @@ TEST_F(RadioHidlTest, setCdmaBroadcastActivation) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::INVALID_ARGUMENTS},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

    }

}
@@ -180,10 +179,11 @@ TEST_F(RadioHidlTest, setGsmBroadcastActivation) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_MODEM_STATE,

             RadioError::INVALID_STATE, RadioError::OPERATION_NOT_ALLOWED},

            CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+20 −19
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ TEST_F(RadioHidlTest, setupDataCall) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW,

                                      RadioError::OP_NOT_ALLOWED_DURING_VOICE_CALL,

                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT},

                                     CHECK_OEM_ERROR));

        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::SIM_ABSENT || CheckOEMError());

    }

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



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                      RadioError::SIM_ABSENT, RadioError::INVALID_CALL_ID},

                                     CHECK_OEM_ERROR));

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

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

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

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

    }

}
@@ -118,9 +118,9 @@ TEST_F(RadioHidlTest, getDataCallList) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}));

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

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

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

    }

}
@@ -160,10 +160,10 @@ TEST_F(RadioHidlTest, setInitialAttachApn) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                      RadioError::SUBSCRIPTION_NOT_AVAILABLE},

                                     CHECK_OEM_ERROR));

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

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

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

                    CheckOEMError());

    }

}
@@ -224,8 +224,9 @@ TEST_F(RadioHidlTest, setDataProfile) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                      RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED}));

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

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

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+9 −5
Original line number Diff line number Diff line
@@ -310,10 +310,14 @@ TEST_F(RadioHidlTest, supplyNetworkDepersonalization) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::INVALID_ARGUMENTS, RadioError::INTERNAL_ERR,

             RadioError::INVALID_SIM_STATE, RadioError::MODEM_ERR, RadioError::NO_MEMORY,

             RadioError::PASSWORD_INCORRECT, RadioError::SIM_ABSENT, RadioError::SYSTEM_ERR}));

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

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

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

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_ims.cpp

+19 −25
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ TEST_F(RadioHidlTest, getClir) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::MODEM_ERR},

                                     CHECK_GENERAL_ERROR));

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

    }

}
@@ -71,9 +70,9 @@ TEST_F(RadioHidlTest, getFacilityLockForApp) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

    }

}
@@ -95,9 +94,9 @@ TEST_F(RadioHidlTest, setFacilityLockForApp) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

    }

}
@@ -117,10 +116,11 @@ TEST_F(RadioHidlTest, setBarringPassword) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::FDN_CHECK_FAILURE,

                                      RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR},

                                     CHECK_GENERAL_ERROR));

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

    }

}
@@ -137,8 +137,7 @@ TEST_F(RadioHidlTest, getClip) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::MODEM_ERR},

                                     CHECK_GENERAL_ERROR));

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

    }

}
@@ -156,8 +155,8 @@ TEST_F(RadioHidlTest, setSuppServiceNotifications) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE, RadioError::SIM_ABSENT}));

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

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

    }

}
@@ -175,11 +174,7 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS RadioError::RADIO_NOT_AVAILABLE,

             RadioError::NO_MEMORY, RadioError::SYSTEM_ERR, RadioError::REQUEST_NOT_SUPPORTED,

             RadioError::CANCELLED}));

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

    }

}
@@ -196,9 +191,8 @@ TEST_F(RadioHidlTest, getImsRegistrationState) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::MODEM_ERR, RadioError::INVALID_MODEM_STATE},

            CHECK_GENERAL_ERROR));

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

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

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

    }

}