summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Ankner <johan.ankner@volvocars.com>2019-12-17 10:30:30 +0100
committerJohan Ankner <johan.ankner@volvocars.com>2020-01-23 09:01:14 +0100
commit2fd5c7cdf9d8b7b28b375c53827170f0d74d3c6b (patch)
treefbed4fb4d64b23f604be31c04ef7157030e67b6a
parent356c36b96d0851c24b3f02a9496051f027eff916 (diff)
downloadandroid_hardware_interfaces-2fd5c7cdf9d8b7b28b375c53827170f0d74d3c6b.tar.gz
android_hardware_interfaces-2fd5c7cdf9d8b7b28b375c53827170f0d74d3c6b.tar.bz2
android_hardware_interfaces-2fd5c7cdf9d8b7b28b375c53827170f0d74d3c6b.zip
VTS: only assert that IGnssDebug present for non-automotive
VTS test VtsHalGnssV1_0Target#GnssHalTest.GetAllExtensions tests that IGnss::getEnxtensionGnssDebug returns an actual extension. Make an exception for automotive devices. Bug: 143966170 Test: ran VtsHalGnssV1_0Target on Volvo IHU Change-Id: I1588099a5be704c7869d6d5e8c0312d8b498bb95
-rw-r--r--gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp14
-rw-r--r--gnss/1.1/vts/functional/gnss_hal_test_cases.cpp9
2 files changed, 19 insertions, 4 deletions
diff --git a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
index c26f60a70..0541c9038 100644
--- a/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
+++ b/gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
@@ -25,6 +25,8 @@
#include <condition_variable>
#include <mutex>
+#include <cutils/properties.h>
+
using android::hardware::Return;
using android::hardware::Void;
@@ -36,6 +38,12 @@ using android::hardware::gnss::V1_0::IGnssDebug;
using android::hardware::gnss::V1_0::IGnssMeasurement;
using android::sp;
+static bool IsAutomotiveDevice() {
+ char buffer[PROPERTY_VALUE_MAX] = {0};
+ property_get("ro.hardware.type", buffer, "");
+ return strncmp(buffer, "automotive", PROPERTY_VALUE_MAX) == 0;
+}
+
#define TIMEOUT_SEC 2 // for basic commands/responses
// for command line argument on how strictly to run the test
@@ -460,9 +468,9 @@ TEST_F(GnssHalTest, GetAllExtensions) {
auto gnssDebug = gnss_hal_->getExtensionGnssDebug();
ASSERT_TRUE(gnssDebug.isOk());
- if (info_called_count_ > 0 && last_info_.yearOfHw >= 2017) {
- sp<IGnssDebug> iGnssDebug = gnssDebug;
- EXPECT_NE(iGnssDebug, nullptr);
+ if (!IsAutomotiveDevice() && info_called_count_ > 0 && last_info_.yearOfHw >= 2017) {
+ sp<IGnssDebug> iGnssDebug = gnssDebug;
+ EXPECT_NE(iGnssDebug, nullptr);
}
}
diff --git a/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp b/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp
index 2d901f330..051e51420 100644
--- a/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp
+++ b/gnss/1.1/vts/functional/gnss_hal_test_cases.cpp
@@ -21,6 +21,7 @@
#include <VtsHalHidlTargetTestBase.h>
#include <android/hardware/gnss/1.1/IGnssConfiguration.h>
+#include <cutils/properties.h>
using android::hardware::hidl_vec;
@@ -30,6 +31,12 @@ using android::hardware::gnss::V1_0::IGnssDebug;
using android::hardware::gnss::V1_1::IGnssConfiguration;
using android::hardware::gnss::V1_1::IGnssMeasurement;
+static bool IsAutomotiveDevice() {
+ char buffer[PROPERTY_VALUE_MAX] = {0};
+ property_get("ro.hardware.type", buffer, "");
+ return strncmp(buffer, "automotive", PROPERTY_VALUE_MAX) == 0;
+}
+
/*
* SetupTeardownCreateCleanup:
* Requests the gnss HAL then calls cleanup
@@ -425,7 +432,7 @@ TEST_F(GnssHalTest, InjectBestLocation) {
TEST_F(GnssHalTest, GnssDebugValuesSanityTest) {
auto gnssDebug = gnss_hal_->getExtensionGnssDebug();
ASSERT_TRUE(gnssDebug.isOk());
- if (info_called_count_ > 0 && last_info_.yearOfHw >= 2017) {
+ if (!IsAutomotiveDevice() && info_called_count_ > 0 && last_info_.yearOfHw >= 2017) {
sp<IGnssDebug> iGnssDebug = gnssDebug;
EXPECT_NE(iGnssDebug, nullptr);