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

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

Merge "Tolerate 1 sv status in GNSS blacklist VTS test" into pi-dev 

am: 366c0abb

Change-Id: I16811f768d24ccf809ffd700690d672e757d4f8f
parents 09112b2a 366c0abb

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+10 −5
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) { 


    StartAndCheckLocations(kLocationsToAwait);



    EXPECT_GE((int)list_gnss_sv_status_.size(), kLocationsToAwait);

    // Tolerate 1 less sv status to handle edge cases in reporting.

    EXPECT_GE((int)list_gnss_sv_status_.size() + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", (int)list_gnss_sv_status_.size(),

          kLocationsToAwait);
@@ -239,7 +240,8 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) { 
    location_called_count_ = 0;

    StartAndCheckLocations(kLocationsToAwait);



    EXPECT_GE((int)list_gnss_sv_status_.size(), kLocationsToAwait);

    // Tolerate 1 less sv status to handle edge cases in reporting.

    EXPECT_GE((int)list_gnss_sv_status_.size() + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", (int)list_gnss_sv_status_.size(),

          kLocationsToAwait);

    for (const auto& gnss_sv_status : list_gnss_sv_status_) {
@@ -263,7 +265,8 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) { 


    StartAndCheckLocations(kLocationsToAwait);



    EXPECT_GE((int)list_gnss_sv_status_.size(), kLocationsToAwait);

    // Tolerate 1 less sv status to handle edge cases in reporting.

    EXPECT_GE((int)list_gnss_sv_status_.size() + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", (int)list_gnss_sv_status_.size(),

          kLocationsToAwait);
@@ -299,7 +302,8 @@ TEST_F(GnssHalTest, BlacklistConstellation) { 


    StartAndCheckLocations(kLocationsToAwait);



    EXPECT_GE((int)list_gnss_sv_status_.size(), kLocationsToAwait);

    // Tolerate 1 less sv status to handle edge cases in reporting.

    EXPECT_GE((int)list_gnss_sv_status_.size() + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", (int)list_gnss_sv_status_.size(),

          kLocationsToAwait);
@@ -349,7 +353,8 @@ TEST_F(GnssHalTest, BlacklistConstellation) { 
    location_called_count_ = 0;

    StartAndCheckLocations(kLocationsToAwait);



    EXPECT_GE((int)list_gnss_sv_status_.size(), kLocationsToAwait);

    // Tolerate 1 less sv status to handle edge cases in reporting.

    EXPECT_GE((int)list_gnss_sv_status_.size() + 1, kLocationsToAwait);

    ALOGD("Observed %d GnssSvStatus, while awaiting %d Locations", (int)list_gnss_sv_status_.size(),

          kLocationsToAwait);

    for (const auto& gnss_sv_status : list_gnss_sv_status_) {