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

Commit 60449e68 authored by Sanket Padawe's avatar Sanket Padawe Committed by Gerrit Code Review
Browse files

Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."

parents 7f8b76a3 6f957ea5

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+18 −1
Original line number Original line Diff line number Diff line
@@ -416,6 +416,23 @@ TEST_F(RadioHidlTest, getCdmaSubscriptionSource) { 
    }

    }

}

}





/*

 * Test IRadio.setCdmaSubscriptionSource() for the response returned.

 */

TEST_F(RadioHidlTest, setCdmaSubscriptionSource) {

    int serial = 1;



    radio->setCdmaSubscriptionSource(++serial, CdmaSubscriptionSource::RUIM_SIM);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



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

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

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

    }

}



/*

/*

 * Test IRadio.getVoiceRadioTechnology() for the response returned.

 * Test IRadio.getVoiceRadioTechnology() for the response returned.

 */

 */
@@ -455,7 +472,7 @@ TEST_F(RadioHidlTest, setCellInfoListRate) { 
    int serial = 1;

    int serial = 1;





    // TODO(sanketpadawe): RIL crashes with value of rate = 10

    // TODO(sanketpadawe): RIL crashes with value of rate = 10

    radio->setCellInfoListRate(++serial, 0);

    radio->setCellInfoListRate(++serial, 10);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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

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

radio/1.0/vts/functional/radio_hidl_hal_voice.cpp

+31 −23
Original line number Original line Diff line number Diff line
@@ -28,8 +28,7 @@ TEST_F(RadioHidlTest, getCurrentCalls) { 
    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(radioRsp->rspInfo.error == RadioError::NONE);

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

    }

    }

}

}
@@ -87,8 +86,7 @@ TEST_F(RadioHidlTest, hangupWaitingOrBackground) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -106,8 +104,7 @@ TEST_F(RadioHidlTest, hangupForegroundResumeBackground) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -125,8 +122,7 @@ TEST_F(RadioHidlTest, switchWaitingOrHoldingAndActive) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -144,8 +140,7 @@ TEST_F(RadioHidlTest, conference) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -163,8 +158,7 @@ TEST_F(RadioHidlTest, rejectCall) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -182,8 +176,7 @@ TEST_F(RadioHidlTest, getLastCallFailCause) { 
    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::INVALID_ARGUMENTS

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

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

    }

    }

}

}
@@ -218,8 +211,7 @@ TEST_F(RadioHidlTest, cancelPendingUssd) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -319,8 +311,7 @@ TEST_F(RadioHidlTest, acceptCall) { 
    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::INVALID_ARGUMENTS

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

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

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

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

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

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

    }

    }
@@ -357,11 +348,30 @@ TEST_F(RadioHidlTest, explicitCallTransfer) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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

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





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

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

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

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

    }

}



/*

 * Test IRadio.sendCDMAFeatureCode() for the response returned.

 */

TEST_F(RadioHidlTest, sendCDMAFeatureCode) {

    int serial = 1;



    radio->sendCDMAFeatureCode(serial, hidl_string());

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



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

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

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS

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

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

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

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

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

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

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

    }

    }

}

}
@@ -414,8 +424,7 @@ TEST_F(RadioHidlTest, stopDtmf) { 
    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::INVALID_ARGUMENTS

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::SYSTEM_ERR

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

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

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

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

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

    }

    }
@@ -450,8 +459,7 @@ TEST_F(RadioHidlTest, getMute) { 
    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::INVALID_ARGUMENTS

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

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

    }

    }

}

}

radio/1.0/vts/functional/radio_response.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -496,7 +496,9 @@ Return<void> RadioResponse::setLocationUpdatesResponse( 
    return Void();

    return Void();

}

}





Return<void> RadioResponse::setCdmaSubscriptionSourceResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

    return Void();

}

}
@@ -539,7 +541,9 @@ Return<void> RadioResponse::getPreferredVoicePrivacyResponse( 
    return Void();

    return Void();

}

}





Return<void> RadioResponse::sendCDMAFeatureCodeResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::sendCDMAFeatureCodeResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

    return Void();

}

}