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

Commit ed2bb4e8 authored by Yuexi Ma's avatar Yuexi Ma
Browse files

Change vts target base test class name 

Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I95f10ad7a66f261c9030357edd411fe6d94150e8
parent 5e1e202b

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

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_test { 
        "libutils",

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

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    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 <VtsHalHidlTargetBaseTest.h>

#include <VtsHalHidlTargetTestBase.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::VtsHalHidlTargetBaseTest {

class AudioEffectHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 public:

  virtual void SetUp() override {

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

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

    ASSERT_NE(effectsFactory, nullptr);

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ cc_test { 
        "libutils",

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

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

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

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

#include <hidl/HidlSupport.h>

#include <hidl/HidlTransportSupport.h>

#include <VtsHalHidlTargetBaseTest.h>

#include <VtsHalHidlTargetTestBase.h>



using android::Condition;

using android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprint;
@@ -35,7 +35,7 @@ using android::hardware::Return; 
using android::Mutex;

using android::sp;



class FingerprintHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

class FingerprintHidlTest : public ::testing::VtsHalHidlTargetTestBase {



protected:

    class MyCallback : public IBiometricsFingerprintClientCallback {
@@ -123,7 +123,7 @@ public: 
    FingerprintHidlTest (): mCallbackCalled(false) {}



    virtual void SetUp() override {

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

        mService = ::testing::VtsHalHidlTargetTestBase::getService<IBiometricsFingerprint>(SERVICE_NAME);



        ASSERT_NE(mService, nullptr);

        clearErr();

boot/1.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ cc_test { 
        "libutils",

        "android.hardware.boot@1.0",

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",