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

Commit 23075148 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Fix vts tests:"

parents 4b649ea1 2fb2eeaf

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+7 −6
Original line number Diff line number Diff line
@@ -442,8 +442,9 @@ TEST_F(RadioHidlTest, setCdmaSubscriptionSource) { 


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

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

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

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

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

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

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

    }

}
@@ -509,7 +510,7 @@ TEST_F(RadioHidlTest, nvReadItem) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

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

    }

}
@@ -528,7 +529,7 @@ TEST_F(RadioHidlTest, nvWriteItem) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

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

    }

}
@@ -545,7 +546,7 @@ TEST_F(RadioHidlTest, nvWriteCdmaPrl) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

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

    }

}
@@ -599,7 +600,7 @@ TEST_F(RadioHidlTest, getHardwareConfig) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

+11 −3
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ TEST_F(RadioHidlTest, sendEnvelope) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

    }



    // Test with sending random string
@@ -49,8 +51,10 @@ TEST_F(RadioHidlTest, sendEnvelope) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

    }

}
@@ -70,7 +74,10 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

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

    }



    serial = GetRandomSerialNumber();
@@ -85,6 +92,7 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }