commit 161b564b350c6038d9b49edc48ae2a220cc6326c
author Yuexi Ma <yuexima@google.com> Fri Mar 10 13:44:22 2017 -0800
committer Yuexi Ma <yuexima@google.com> Fri Mar 10 21:53:53 2017 +0000
tree c8866589eff4951ef2219d1bf178b7b455aad42b
parent ed2bb4e8f851688c09f7639a9183b1285aa0967c

audio: use vts target test base class

Test: make vts succeed
Change-Id: I8008392e016e0604f8aa9a292f1ec6c6e7c3b384

audio/2.0/vts/functional/Android.bp

diff --git a/audio/2.0/vts/functional/Android.bp b/audio/2.0/vts/functional/Android.bp
index cee69ef..02f9330 100644
--- a/audio/2.0/vts/functional/Android.bp
+++ b/audio/2.0/vts/functional/Android.bp
@@ -17,7 +17,6 @@
 cc_test {
     name: "VtsHalAudioV2_0TargetTest",
     defaults: ["hidl_defaults"],
-    gtest: true,
     srcs: ["AudioPrimaryHidlHalTest.cpp"],
     shared_libs: [
         "libbase",
@@ -28,7 +27,7 @@
         "android.hardware.audio@2.0",
         "android.hardware.audio.common@2.0",
     ],
-    static_libs: ["libgtest"],
+    static_libs: ["VtsHalHidlTargetTestBase"],
     cflags: [
         "-O0",
         "-g",

audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp

diff --git a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp
index a3f0d27..a339f99 100644
--- a/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp
+++ b/audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp
@@ -26,7 +26,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <gtest/gtest.h>
+#include <VtsHalHidlTargetTestBase.h>
 
 #include <android-base/logging.h>
 
@@ -113,7 +113,7 @@
 // Instance to register global tearDown
 static Environment* environment;
 
-class HidlTest : public ::testing::Test {
+class HidlTest : public ::testing::VtsHalHidlTargetTestBase {
 protected:
     // Convenient member to store results
     Result res;
@@ -131,7 +131,7 @@
 
         if (devicesFactory == nullptr) {
             environment->registerTearDown([]{ devicesFactory.clear(); });
-            devicesFactory = IDevicesFactory::getService();
+            devicesFactory = ::testing::VtsHalHidlTargetTestBase::getService<IDevicesFactory>();
         }
         ASSERT_TRUE(devicesFactory != nullptr);
     }