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

Commit 2ab0ec06 authored by Sanket Padawe's avatar Sanket Padawe
Browse files

Fix some stk api Radio Vts tests. 

Bug: 37502436
Test: Manual vts
Change-Id: Idd9a1fd38413aed89aaa152cb9a91c001f18b339
Merged-in: Idd9a1fd38413aed89aaa152cb9a91c001f18b339
parent 827e2910

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

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

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }





    // Test with sending random string

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

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }

}

}
@@ -83,7 +85,8 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }

}

}
@@ -101,12 +104,10 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

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

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

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

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

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

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

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

    }

    }

}

}
@@ -123,7 +124,8 @@ TEST_F(RadioHidlTest, reportStkServiceIsRunning) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }

}

}
@@ -144,7 +146,8 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }





    // Test with sending random string

    // Test with sending random string
@@ -158,6 +161,7 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);





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

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

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

        ASSERT_TRUE(CheckGeneralError() ||

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

    }

    }

}
 
}

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -65,7 +65,8 @@ bool RadioHidlTest::CheckGeneralError() { 
            radioRsp->rspInfo.error == RadioError::NO_MEMORY ||

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

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

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

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

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

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

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

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

}

}





bool RadioHidlTest::CheckOEMError() {

bool RadioHidlTest::CheckOEMError() {