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 /camera | |
| parent | 48c9837a556225804964bf8f754772056d207790 (diff) | |
| download | platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.gz platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.tar.bz2 platform_hardware_interfaces-50d7e27b3c13885d2bd90dc0f0f2366cd0523f77.zip | |
change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master)
Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/provider/2.4/vts/functional/Android.bp | 3 | ||||
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index defe3dcd64..f478152694 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "VtsHalCameraProviderV2_4TargetTest", - gtest: true, srcs: ["VtsHalCameraProviderV2_4TargetTest.cpp"], shared_libs: [ "liblog", @@ -29,7 +28,7 @@ cc_test { "libcamera_metadata", "libui" ], - static_libs: ["libgtest"], + static_libs: ["VtsHalHidlTargetBaseTest"], cflags: [ "-O0", "-g", diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 038e1dd239..19bc899c49 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -19,7 +19,7 @@ #include <android/hardware/camera/device/3.2/ICameraDevice.h> #include <android/log.h> #include <ui/GraphicBuffer.h> -#include <gtest/gtest.h> +#include <VtsHalHidlTargetBaseTest.h> #include <regex> #include "system/camera_metadata.h" #include <hardware/gralloc.h> @@ -131,7 +131,7 @@ private: void CameraHidlEnvironment::SetUp() { // TODO: test the binderized mode - mProvider = ICameraProvider::getService(CAMERA_PASSTHROUGH_SERVICE_NAME); + mProvider = ::testing::VtsHalHidlTargetBaseTest::getService<ICameraProvider>(CAMERA_PASSTHROUGH_SERVICE_NAME); // TODO: handle the device doesn't have any camera case ALOGI_IF(mProvider, "provider is not nullptr, %p", mProvider.get()); ASSERT_NE(mProvider, nullptr); @@ -142,7 +142,7 @@ void CameraHidlEnvironment::TearDown() { } // The main test class for camera HIDL HAL. -class CameraHidlTest : public ::testing::Test { +class CameraHidlTest : public ::testing::VtsHalHidlTargetBaseTest { public: virtual void SetUp() override {} virtual void TearDown() override {} |