diff options
| author | Yuexi Ma <yuexima@google.com> | 2017-02-28 01:46:51 -0800 |
|---|---|---|
| committer | Yuexi Ma <yuexima@google.com> | 2017-02-28 22:27:28 +0000 |
| commit | 50d7e27b3c13885d2bd90dc0f0f2366cd0523f77 (patch) | |
| tree | ee9fc44d39d7fa78dabeac43118ccebdd251fb91 /gatekeeper | |
| parent | 48c9837a556225804964bf8f754772056d207790 (diff) | |
| download | android_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.gz android_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.bz2 android_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.zip | |
change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master)
Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
Diffstat (limited to 'gatekeeper')
| -rw-r--r-- | gatekeeper/1.0/vts/functional/Android.bp | 3 | ||||
| -rw-r--r-- | gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp index 080152d46..c2c32a679 100644 --- a/gatekeeper/1.0/vts/functional/Android.bp +++ b/gatekeeper/1.0/vts/functional/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "VtsHalGatekeeperV1_0TargetTest", - gtest: true, srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], shared_libs: [ "libbase", @@ -28,7 +27,7 @@ cc_test { "libutils", "android.hardware.gatekeeper@1.0", ], - static_libs: ["libgtest"], + static_libs: ["VtsHalHidlTargetBaseTest"], cflags: [ "-O0", "-g", diff --git a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp index bdc39561c..8d6f72633 100644 --- a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp +++ b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp @@ -30,7 +30,7 @@ #include <android/hardware/gatekeeper/1.0/IGatekeeper.h> #include <android/hardware/gatekeeper/1.0/types.h> -#include <gtest/gtest.h> +#include <VtsHalHidlTargetBaseTest.h> using ::android::hardware::hidl_string; using ::android::hardware::hidl_vec; @@ -76,7 +76,7 @@ static const hw_auth_token_t *toAuthToken(GatekeeperResponse &rsp) { } // The main test class for Gatekeeper HIDL HAL. -class GatekeeperHidlTest : public ::testing::Test { +class GatekeeperHidlTest : public ::testing::VtsHalHidlTargetBaseTest { protected: void setUid(uint32_t uid) { uid_ = uid; } @@ -187,7 +187,7 @@ class GatekeeperHidlTest : public ::testing::Test { GatekeeperHidlTest() : uid_(0) {} virtual void SetUp() override { GatekeeperResponse rsp; - gatekeeper_ = IGatekeeper::getService(); + gatekeeper_ = ::testing::VtsHalHidlTargetBaseTest::getService<IGatekeeper>(); ASSERT_NE(nullptr, gatekeeper_.get()); doDeleteAllUsers(rsp); } |