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

Commit a85ee67c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Relax measurement tests to allow 3 empty GnssData" into main

parents 4541ef41 8c495af3

gnss/aidl/vts/gnss_hal_test.cpp

+8 −0
Original line number Diff line number Diff line
@@ -474,6 +474,10 @@ void GnssHalTest::collectMeasurementIntervals(const sp<GnssMeasurementCallbackAi 
        GnssData lastGnssData;

        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastGnssData, timeoutSeconds));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i <= 2 && lastGnssData.measurements.size() == 0) {

            // Allow 3 seconds tolerance for empty measurement

            continue;

        }

        ASSERT_TRUE(lastGnssData.measurements.size() > 0);



        // Validity check GnssData fields
@@ -519,6 +523,10 @@ void GnssHalTest::checkGnssDataFields(const sp<GnssMeasurementCallbackAidl>& cal 
        GnssData lastGnssData;

        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastGnssData, timeoutSeconds));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i <= 2 && lastGnssData.measurements.size() == 0) {

            // Allow 3 seconds tolerance to report empty measurement

            continue;

        }

        ASSERT_TRUE(lastGnssData.measurements.size() > 0);



        // Validity check GnssData fields

gnss/aidl/vts/gnss_hal_test_cases.cpp

+16 −1
Original line number Diff line number Diff line
@@ -419,6 +419,10 @@ TEST_P(GnssHalTest, TestGnssMeasurementExtensionAndSatellitePvt) { 
        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastMeasurement,

                                                      kFirstGnssMeasurementTimeoutSeconds));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i <= 2 && lastMeasurement.measurements.size() == 0) {

            // Allow 3 seconds tolerance for empty measurement

            continue;

        }

        ASSERT_TRUE(lastMeasurement.measurements.size() > 0);



        // Validity check GnssData fields
@@ -479,6 +483,10 @@ TEST_P(GnssHalTest, TestCorrelationVector) { 
        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastMeasurement,

                                                      kFirstGnssMeasurementTimeoutSeconds));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i <= 2 && lastMeasurement.measurements.size() == 0) {

            // Allow 3 seconds tolerance for empty measurement

            continue;

        }

        ASSERT_TRUE(lastMeasurement.measurements.size() > 0);



        // Validity check GnssData fields
@@ -1335,7 +1343,10 @@ TEST_P(GnssHalTest, TestGnssAgcInGnssMeasurement) { 
        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastMeasurement,

                                                      kFirstGnssMeasurementTimeoutSeconds));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i > 2) {

            // Allow 3 seconds tolerance for empty measurement

            ASSERT_TRUE(lastMeasurement.measurements.size() > 0);

        }



        // Validity check GnssData fields

        checkGnssMeasurementClockFields(lastMeasurement);
@@ -1790,6 +1801,10 @@ TEST_P(GnssHalTest, TestAccumulatedDeltaRange) { 
        GnssData lastGnssData;

        ASSERT_TRUE(callback->gnss_data_cbq_.retrieve(lastGnssData, 10));

        EXPECT_EQ(callback->gnss_data_cbq_.calledCount(), i + 1);

        if (i <= 2 && lastGnssData.measurements.size() == 0) {

            // Allow 3 seconds tolerance to report empty measurement

            continue;

        }

        ASSERT_TRUE(lastGnssData.measurements.size() > 0);



        // Validity check GnssData fields