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

Commit e7d3d89e authored by Yu-Han Yang's avatar Yu-Han Yang Committed by android-build-merger
Browse files

Call SetGnssCallback in SetUp 

am: 8c7a0309

Change-Id: If471f7b19cb12ddf6d823f25f0db3abd46a14cfd
parents 4de364a4 8c7a0309

gnss/1.1/vts/functional/gnss_hal_test.cpp

+26 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ void GnssHalTest::SetUp() { 
        GnssHidlEnvironment::Instance()->getServiceName<IGnss>());

    list_gnss_sv_status_.clear();

    ASSERT_NE(gnss_hal_, nullptr);



    SetUpGnssCallback();

}



void GnssHalTest::TearDown() {
@@ -44,6 +46,30 @@ void GnssHalTest::TearDown() { 
    }

}



void GnssHalTest::SetUpGnssCallback() {

    gnss_cb_ = new GnssCallback(*this);

    ASSERT_NE(gnss_cb_, nullptr);



    auto result = gnss_hal_->setCallback_1_1(gnss_cb_);

    if (!result.isOk()) {

        ALOGE("result of failed setCallback %s", result.description().c_str());

    }



    ASSERT_TRUE(result.isOk());

    ASSERT_TRUE(result);



    /*

     * All capabilities, name and systemInfo callbacks should trigger

     */

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

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

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



    EXPECT_EQ(capabilities_called_count_, 1);

    EXPECT_EQ(info_called_count_, 1);

    EXPECT_EQ(name_called_count_, 1);

}



void GnssHalTest::StopAndClearLocations() {

    auto result = gnss_hal_->stop();

gnss/1.1/vts/functional/gnss_hal_test.h

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,12 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase { 
        Return<void> gnssSvStatusCb(const IGnssCallback::GnssSvStatus& svStatus) override;

    };



    /*

     * SetUpGnssCallback:

     *   Set GnssCallback and verify the result.

     */

    void SetUpGnssCallback();



    /*

     * StartAndGetSingleLocation:

     * Helper function to get one Location and check fields

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+1 −28
Original line number Diff line number Diff line
@@ -38,34 +38,6 @@ using android::hardware::gnss::V1_1::IGnssMeasurement; 
 */

TEST_F(GnssHalTest, SetupTeardownCreateCleanup) {}



/*

 * SetCallbackResponses:

 * Sets up the callback, awaits the capability, info & name

 */

TEST_F(GnssHalTest, SetCallbackResponses) {

    gnss_cb_ = new GnssCallback(*this);

    ASSERT_NE(gnss_cb_, nullptr);



    auto result = gnss_hal_->setCallback_1_1(gnss_cb_);

    if (!result.isOk()) {

        ALOGE("result of failed setCallback %s", result.description().c_str());

    }



    ASSERT_TRUE(result.isOk());

    ASSERT_TRUE(result);



    /*

     * All capabilities, name and systemInfo callbacks should trigger

     */

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

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

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



    EXPECT_EQ(capabilities_called_count_, 1);

    EXPECT_EQ(info_called_count_, 1);

    EXPECT_EQ(name_called_count_, 1);

}



/*

 * TestGnssMeasurementCallback:

 * Gets the GnssMeasurementExtension and verify that it returns an actual extension.
@@ -283,6 +255,7 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) { 
        if (strongest_sv_is_reobserved) break;

    }

    EXPECT_TRUE(strongest_sv_is_reobserved);

    StopAndClearLocations();

}



/*