Merge changes from topic "gnss" (c325670c) · Commits · e / os / android_hardware_interfaces

gnss/1.1/vts/functional/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,5 +30,5 @@ cc_test {
		shared_libs: [
		"android.hardware.gnss.measurement_corrections@1.0",
		],
		test_suites: ["general-tests"],
		test_suites: ["general-tests", "vts-core"],
		}

gnss/1.1/vts/functional/VtsHalGnssV1_1TargetTest.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -15,15 +15,15 @@
		*/
		#define LOG_TAG "VtsHalGnssV1_1TargetTest"

		#include <VtsHalHidlTargetTestBase.h>
		#include <gtest/gtest.h>
		#include <hidl/GtestPrinter.h>
		#include <hidl/ServiceManagement.h>

		#include "gnss_hal_test.h"

		int main(int argc, char** argv) {
		::testing::AddGlobalTestEnvironment(GnssHidlEnvironment::Instance());
		::testing::InitGoogleTest(&argc, argv);
		GnssHidlEnvironment::Instance()->init(&argc, argv);
		int status = RUN_ALL_TESTS();
		ALOGI("Test result = %d", status);
		return status;
		}
		using android::hardware::gnss::V1_1::IGnss;

		INSTANTIATE_TEST_SUITE_P(
		PerInstance, GnssHalTest,
		testing::ValuesIn(android::hardware::getAllHalInstanceNames(IGnss::descriptor)),
		android::hardware::PrintInstanceNameToString);
		No newline at end of file

gnss/1.1/vts/functional/gnss_hal_test.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#define LOG_TAG "GnssHalTest"

		#include <android/hidl/manager/1.2/IServiceManager.h>
		#include <gtest/gtest.h>
		#include <hidl/GtestPrinter.h>
		#include <hidl/ServiceManagement.h>

		#include <gnss_hal_test.h>
		@@ -29,8 +31,7 @@ using ::android::hardware::hidl_vec;
		using ::android::hardware::gnss::common::Utils;

		void GnssHalTest::SetUp() {
		gnss_hal_ = ::testing::VtsHalHidlTargetTestBase::getService<IGnss>(
		GnssHidlEnvironment::Instance()->getServiceName<IGnss>());
		gnss_hal_ = IGnss::getService(GetParam());
		ASSERT_NE(gnss_hal_, nullptr);

		SetUpGnssCallback();

gnss/1.1/vts/functional/gnss_hal_test.h

+3 −19

Original line number	Diff line number	Diff line
		@@ -19,8 +19,7 @@

		#include <android/hardware/gnss/1.1/IGnss.h>

		#include <VtsHalHidlTargetTestBase.h>
		#include <VtsHalHidlTargetTestEnvBase.h>
		#include <gtest/gtest.h>
		#include "GnssCallbackEventQueue.h"

		using android::hardware::Return;
		@@ -37,23 +36,8 @@ using android::sp;

		#define TIMEOUT_SEC 2 // for basic commands/responses

		// Test environment for GNSS HIDL HAL.
		class GnssHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {
		public:
		// get the test environment singleton
		static GnssHidlEnvironment* Instance() {
		static GnssHidlEnvironment* instance = new GnssHidlEnvironment;
		return instance;
		}

		virtual void registerTestServices() override { registerTestService<IGnss>(); }

		private:
		GnssHidlEnvironment() {}
		};

		// The main test class for GNSS HAL.
		class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {
		class GnssHalTest : public testing::TestWithParam<std::string> {
		public:
		virtual void SetUp() override;

gnss/1.1/vts/functional/gnss_hal_test_cases.cpp

+11 −12

Original line number	Diff line number	Diff line
		@@ -18,9 +18,8 @@

		#include <gnss_hal_test.h>

		#include <VtsHalHidlTargetTestBase.h>

		#include <android/hardware/gnss/1.1/IGnssConfiguration.h>
		#include <gtest/gtest.h>

		using android::hardware::hidl_vec;

		@@ -39,13 +38,13 @@ using android::hardware::gnss::V1_1::IGnssMeasurement;
		*
		* Empty test fixture to verify basic Setup & Teardown
		*/
		TEST_F(GnssHalTest, SetupTeardownCreateCleanup) {}
		TEST_P(GnssHalTest, SetupTeardownCreateCleanup) {}

		/*
		* TestGnssMeasurementCallback:
		* Gets the GnssMeasurementExtension and verify that it returns an actual extension.
		*/
		TEST_F(GnssHalTest, TestGnssMeasurementCallback) {
		TEST_P(GnssHalTest, TestGnssMeasurementCallback) {
		auto gnssMeasurement_1_1 = gnss_hal_->getExtensionGnssMeasurement_1_1();
		ASSERT_TRUE(gnssMeasurement_1_1.isOk());
		auto gnssMeasurement_1_0 = gnss_hal_->getExtensionGnssMeasurement();
		@@ -65,7 +64,7 @@ TEST_F(GnssHalTest, TestGnssMeasurementCallback) {
		* NO_LOCATION_PERIOD_SEC and verfiy that no location is received. Also perform validity checks on
		* each received location.
		*/
		TEST_F(GnssHalTest, GetLocationLowPower) {
		TEST_P(GnssHalTest, GetLocationLowPower) {
		if (!IsGnssHalVersion_1_1()) {
		ALOGI("Test GetLocationLowPower skipped. GNSS HAL version is greater than 1.1.");
		return;
		@@ -97,7 +96,6 @@ TEST_F(GnssHalTest, GetLocationLowPower) {

		gnss_cb_->location_cbq_.retrieve(gnss_cb_->last_location_, kNoLocationPeriodSec);
		const int location_called_count = gnss_cb_->location_cbq_.calledCount();

		// Tolerate (ignore) one extra location right after the first one
		// to handle startup edge case scheduling limitations in some implementations
		if ((i == 1) && (location_called_count == 2)) {
		@@ -132,7 +130,8 @@ TEST_F(GnssHalTest, GetLocationLowPower) {
		*/

		IGnssConfiguration::BlacklistedSource FindStrongFrequentNonGpsSource(
		const list<IGnssCallback::GnssSvStatus> list_gnss_sv_status, const int min_observations) {
		const std::list<IGnssCallback::GnssSvStatus> list_gnss_sv_status,
		const int min_observations) {
		struct ComparableBlacklistedSource {
		IGnssConfiguration::BlacklistedSource id;

		@@ -218,7 +217,7 @@ IGnssConfiguration::BlacklistedSource FindStrongFrequentNonGpsSource(
		* 5b) Retry a few times, in case GNSS search strategy takes a while to reacquire even the
		* formerly strongest satellite
		*/
		TEST_F(GnssHalTest, BlacklistIndividualSatellites) {
		TEST_P(GnssHalTest, BlacklistIndividualSatellites) {
		if (!IsGnssHalVersion_1_1()) {
		ALOGI("Test BlacklistIndividualSatellites skipped. GNSS HAL version is greater than 1.1.");
		return;
		@@ -244,7 +243,7 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) {
		*/

		const int kGnssSvStatusTimeout = 2;
		list<IGnssCallback::GnssSvStatus> sv_status_list;
		std::list<IGnssCallback::GnssSvStatus> sv_status_list;
		int count = gnss_cb_->sv_status_cbq_.retrieve(sv_status_list, sv_status_cbq_size,
		kGnssSvStatusTimeout);
		ASSERT_EQ(count, sv_status_cbq_size);
		@@ -362,7 +361,7 @@ TEST_F(GnssHalTest, BlacklistIndividualSatellites) {
		* GnssStatus does not use any constellation but GPS.
		* 4a & b) Clean up by turning off location, and send in empty blacklist.
		*/
		TEST_F(GnssHalTest, BlacklistConstellation) {
		TEST_P(GnssHalTest, BlacklistConstellation) {
		if (!IsGnssHalVersion_1_1()) {
		ALOGI("Test BlacklistConstellation skipped. GNSS HAL version is greater than 1.1.");
		return;
		@@ -457,7 +456,7 @@ TEST_F(GnssHalTest, BlacklistConstellation) {
		*
		* Ensure successfully injecting a location.
		*/
		TEST_F(GnssHalTest, InjectBestLocation) {
		TEST_P(GnssHalTest, InjectBestLocation) {
		StartAndCheckLocations(1);
		GnssLocation gnssLocation = gnss_cb_->last_location_;
		CheckLocation(gnssLocation, true);
		@@ -476,7 +475,7 @@ TEST_F(GnssHalTest, InjectBestLocation) {
		* GnssDebugValuesSanityTest:
		* Ensures that GnssDebug values make sense.
		*/
		TEST_F(GnssHalTest, GnssDebugValuesSanityTest) {
		TEST_P(GnssHalTest, GnssDebugValuesSanityTest) {
		auto gnssDebug = gnss_hal_->getExtensionGnssDebug();
		ASSERT_TRUE(gnssDebug.isOk());
		if (gnss_cb_->info_cbq_.calledCount() > 0 && gnss_cb_->last_info_.yearOfHw >= 2017) {