diff --git a/gnss/aidl/vts/gnss_hal_test.cpp b/gnss/aidl/vts/gnss_hal_test.cpp index 6d5a9a2cf1..0dd8b32cf1 100644 --- a/gnss/aidl/vts/gnss_hal_test.cpp +++ b/gnss/aidl/vts/gnss_hal_test.cpp @@ -474,6 +474,10 @@ void GnssHalTest::collectMeasurementIntervals(const spgnss_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& 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 diff --git a/gnss/aidl/vts/gnss_hal_test_cases.cpp b/gnss/aidl/vts/gnss_hal_test_cases.cpp index 091b52311b..e4890a778e 100644 --- a/gnss/aidl/vts/gnss_hal_test_cases.cpp +++ b/gnss/aidl/vts/gnss_hal_test_cases.cpp @@ -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); - ASSERT_TRUE(lastMeasurement.measurements.size() > 0); + 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