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

Commit 538790de authored by Cassie's avatar Cassie Committed by android-build-merger
Browse files

Merge "Dot allow error OPERATION_NOT_ALLOWED and REQUEST_NOT_SUPPORTED for... 

Merge "Dot allow error OPERATION_NOT_ALLOWED and REQUEST_NOT_SUPPORTED for startNetworkScan in VTS test." am: bc2e6fec am: 99c25f30
am: fea475e9

Change-Id: Iaf74f720be9e4966f7898509d070f6067a114fc1
parents 50d2efbb fea475e9

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+28 −66
Original line number Diff line number Diff line
@@ -43,13 +43,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { 


    ALOGI("startNetworkScan, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED,

                                      RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::SIM_ABSENT}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,

                                      RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}
@@ -73,12 +69,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidArgument) { 
          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED,

                                      RadioError::INVALID_ARGUMENTS}));

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -110,15 +104,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval1) { 
    ALOGI("startNetworkScan_InvalidInterval1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -150,15 +140,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidInterval2) { 
    ALOGI("startNetworkScan_InvalidInterval2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -190,15 +176,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime1) { 
    ALOGI("startNetworkScan_InvalidMaxSearchTime1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -230,15 +212,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidMaxSearchTime2) { 
    ALOGI("startNetworkScan_InvalidMaxSearchTime2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -270,15 +248,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity1) { 
    ALOGI("startNetworkScan_InvalidPeriodicity1, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -310,15 +284,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_InvalidPeriodicity2) { 
    ALOGI("startNetworkScan_InvalidPeriodicity2, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS,

             RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::SIM_ABSENT, RadioError::INVALID_ARGUMENTS}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                             {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED,

                              RadioError::OPERATION_NOT_ALLOWED}));

            CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS}));

    }

}
@@ -350,14 +320,10 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest1) { 
    ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED,

             RadioError::OPERATION_NOT_ALLOWED}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,

                                      RadioError::OPERATION_NOT_ALLOWED}));

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

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}
@@ -390,13 +356,9 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan_GoodRequest2) { 
    ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %s\n",

          toString(radioRsp_v1_2->rspInfo.error).c_str());

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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_v1_2->rspInfo.error,

            {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::REQUEST_NOT_SUPPORTED,

             RadioError::OPERATION_NOT_ALLOWED}));

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error,

                                     {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED,

                                      RadioError::OPERATION_NOT_ALLOWED}));

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

    } else if (cardStatus.cardState == CardState::PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE}));

    }

}