Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make GetLocationLowPower test warning instead of failing am: 5f0bbe9324 am: 2d8c961797 am: 38fa12db10

Browse Source 
Change-Id: Iac9ffec1f664d9ac0233be90d6e66a9a0073e516
This commit is contained in:
Yu-Han Yang
2020-03-28 22:58:47 +00:00
committed by Automerger Merge Worker
parent c359d74f02 38fa12db10
commit 689b0a4dfc
6 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gnss/1.1/vts/functional/gnss_hal_test.cpp
View File

@@ -99,7 +99,7 @@ void GnssHalTest::SetPositionMode(const int min_interval_msec, const bool low_po
EXPECT_TRUE(result);
}
bool GnssHalTest::StartAndCheckFirstLocation() {
bool GnssHalTest::StartAndCheckFirstLocation(bool strict) {
auto result = gnss_hal_->start();
EXPECT_TRUE(result.isOk());
@@ -110,11 +110,14 @@ bool GnssHalTest::StartAndCheckFirstLocation() {
* so allow time to demodulate ephemeris over the air.
*/
const int kFirstGnssLocationTimeoutSeconds = 75;
int locationCalledCount = 0;
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,
kFirstGnssLocationTimeoutSeconds));
int locationCalledCount = gnss_cb_->location_cbq_.calledCount();
EXPECT_EQ(locationCalledCount, 1);
if (strict) {
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,
kFirstGnssLocationTimeoutSeconds));
locationCalledCount = gnss_cb_->location_cbq_.calledCount();
EXPECT_EQ(locationCalledCount, 1);
}
if (locationCalledCount > 0) {
// don't require speed on first fix
@@ -138,7 +141,7 @@ void GnssHalTest::StartAndCheckLocations(int count) {
SetPositionMode(kMinIntervalMsec, kLowPowerMode);
EXPECT_TRUE(StartAndCheckFirstLocation());
EXPECT_TRUE(StartAndCheckFirstLocation(/* strict= */ true));
for (int i = 1; i < count; i++) {
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,

4
gnss/1.1/vts/functional/gnss_hal_test.h
View File

@@ -102,9 +102,11 @@ class GnssHalTest : public testing::TestWithParam<std::string> {
* <p> Note this leaves the Location request active, to enable Stop call vs. other call
* reordering tests.
*
* <p> if 'strict' is true, the test will fail if no location is generated.
*
* returns true if a location was successfully generated
*/
bool StartAndCheckFirstLocation();
bool StartAndCheckFirstLocation(bool strict);
/*
* CheckLocation:

2
gnss/1.1/vts/functional/gnss_hal_test_cases.cpp
View File

@@ -93,7 +93,7 @@ TEST_P(GnssHalTest, GetLocationLowPower) {
SetPositionMode(kMinIntervalMsec, kLowPowerMode);
// Don't expect true - as without AGPS access
if (!StartAndCheckFirstLocation()) {
if (!StartAndCheckFirstLocation(/* strict= */ false)) {
ALOGW("GetLocationLowPower test - no first low power location received.");
}

16
gnss/2.0/vts/functional/gnss_hal_test.cpp
View File

@@ -97,7 +97,7 @@ void GnssHalTest::SetPositionMode(const int min_interval_msec, const bool low_po
EXPECT_TRUE(result);
}
bool GnssHalTest::StartAndCheckFirstLocation() {
bool GnssHalTest::StartAndCheckFirstLocation(bool strict) {
const auto result = gnss_hal_->start();
EXPECT_TRUE(result.isOk());
@@ -107,12 +107,14 @@ bool GnssHalTest::StartAndCheckFirstLocation() {
* so allow time to demodulate ephemeris over the air.
*/
const int kFirstGnssLocationTimeoutSeconds = 75;
int locationCalledCount = 0;
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,
kFirstGnssLocationTimeoutSeconds));
int locationCalledCount = gnss_cb_->location_cbq_.calledCount();
EXPECT_EQ(locationCalledCount, 1);
if (strict) {
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,
kFirstGnssLocationTimeoutSeconds));
locationCalledCount = gnss_cb_->location_cbq_.calledCount();
EXPECT_EQ(locationCalledCount, 1);
}
if (locationCalledCount > 0) {
// don't require speed on first fix
CheckLocation(gnss_cb_->last_location_, false);
@@ -135,7 +137,7 @@ void GnssHalTest::StartAndCheckLocations(int count) {
SetPositionMode(kMinIntervalMsec, kLowPowerMode);
EXPECT_TRUE(StartAndCheckFirstLocation());
EXPECT_TRUE(StartAndCheckFirstLocation(/* strict= */ true));
for (int i = 1; i < count; i++) {
EXPECT_TRUE(gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_,

4
gnss/2.0/vts/functional/gnss_hal_test.h
View File

@@ -152,9 +152,11 @@ class GnssHalTest : public testing::TestWithParam<std::string> {
* <p> Note this leaves the Location request active, to enable Stop call vs. other call
* reordering tests.
*
* <p> if 'strict' is true, the test will fail if no location is generated.
*
* returns true if a location was successfully generated
*/
bool StartAndCheckFirstLocation();
bool StartAndCheckFirstLocation(bool strict);
/*
* CheckLocation:

8
gnss/2.0/vts/functional/gnss_hal_test_cases.cpp
View File

@@ -395,7 +395,7 @@ TEST_P(GnssHalTest, TestGnssDataElapsedRealtimeFlags) {
}
TEST_P(GnssHalTest, TestGnssLocationElapsedRealtime) {
StartAndCheckFirstLocation();
StartAndCheckFirstLocation(/* strict= */ true);
ASSERT_TRUE((int)gnss_cb_->last_location_.elapsedRealtime.flags <=
(int)(ElapsedRealtimeFlags::HAS_TIMESTAMP_NS |
@@ -411,7 +411,7 @@ TEST_P(GnssHalTest, TestGnssLocationElapsedRealtime) {
// This test only verify that injectBestLocation_2_0 does not crash.
TEST_P(GnssHalTest, TestInjectBestLocation_2_0) {
StartAndCheckFirstLocation();
StartAndCheckFirstLocation(/* strict= */ true);
gnss_hal_->injectBestLocation_2_0(gnss_cb_->last_location_);
StopAndClearLocations();
}
@@ -455,7 +455,7 @@ TEST_P(GnssHalTest, GetLocationLowPower) {
SetPositionMode(kMinIntervalMsec, kLowPowerMode);
// Don't expect true - as without AGPS access
if (!StartAndCheckFirstLocation()) {
if (!StartAndCheckFirstLocation(/* strict= */ false)) {
ALOGW("GetLocationLowPower test - no first low power location received.");
}
@@ -854,4 +854,4 @@ TEST_P(GnssHalTest, BlacklistConstellation) {
result = gnss_configuration_hal->setBlacklist(sources);
ASSERT_TRUE(result.isOk());
EXPECT_TRUE(result);
}
}