Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50d7e27b authored by Yuexi Ma's avatar Yuexi Ma
Browse files

change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master) 

Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
parent 48c9837a

audio/effect/2.0/vts/functional/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


cc_test {

    name: "VtsHalAudioEffectV2_0TargetTest",

    gtest: true,

    srcs: ["VtsHalAudioEffectV2_0TargetTest.cpp"],

    shared_libs: [

        "libbase",
@@ -28,7 +27,7 @@ cc_test { 
        "libutils",

        "android.hardware.audio.effect@2.0",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",

audio/effect/2.0/vts/functional/VtsHalAudioEffectV2_0TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/2.0/types.h>



#include <gtest/gtest.h>

#include <VtsHalHidlTargetBaseTest.h>



using ::android::hardware::audio::common::V2_0::Uuid;

using ::android::hardware::audio::effect::V2_0::EffectDescriptor;
@@ -35,10 +35,10 @@ using ::android::hardware::hidl_vec; 
using ::android::sp;



// The main test class for Audio Effect HIDL HAL.

class AudioEffectHidlTest : public ::testing::Test {

class AudioEffectHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

 public:

  virtual void SetUp() override {

    effectsFactory = IEffectsFactory::getService();

    effectsFactory = ::testing::VtsHalHidlTargetBaseTest::getService<IEffectsFactory>();

    ASSERT_NE(effectsFactory, nullptr);

  }

biometrics/fingerprint/2.1/vts/functional/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


cc_test {

    name: "VtsHalBiometricsFingerprintV2_1TargetTest",

    gtest: true,

    srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"],

    shared_libs: [

        "libbase",
@@ -27,7 +26,7 @@ cc_test { 
        "libutils",

        "android.hardware.biometrics.fingerprint@2.1",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",

biometrics/fingerprint/2.1/vts/functional/VtsHalBiometricsFingerprintV2_1TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>

#include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprintClientCallback.h>

#include <chrono>

#include <gtest/gtest.h>

#include <VtsHalHidlTargetBaseTest.h>

#include <hidl/HidlSupport.h>

#include <hidl/HidlTransportSupport.h>
@@ -34,7 +34,7 @@ using android::hardware::Return; 


#define SERVICE_NAME "fingerprint_hal"



class FingerprintHidlTest : public ::testing::Test,

class FingerprintHidlTest : public ::testing::VtsHalHidlTargetBaseTest,

    public IBiometricsFingerprintClientCallback {



protected:
@@ -49,7 +49,7 @@ public: 
        err(FingerprintError::ERROR_NO_ERROR), threshold(1) {}



    virtual void SetUp() override {

        service = IBiometricsFingerprint::getService(SERVICE_NAME);

        service = ::testing::VtsHalHidlTargetBaseTest::getService<IBiometricsFingerprint>(SERVICE_NAME);



        ASSERT_NE(service, nullptr);

        clearErr();

boot/1.0/vts/functional/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


cc_test {

    name: "VtsHalBootV1_0TargetTest",

    gtest: true,

    srcs: ["VtsHalBootV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",
@@ -27,7 +26,7 @@ cc_test { 
        "libutils",

        "android.hardware.boot@1.0",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",