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

Commit 727690c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: use vts target test base class"

parents dfeb5973 161b564b
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
cc_test {
    name: "VtsHalAudioV2_0TargetTest",
    defaults: ["hidl_defaults"],
    gtest: true,
    srcs: ["AudioPrimaryHidlHalTest.cpp"],
    shared_libs: [
        "libbase",
@@ -28,7 +27,7 @@ cc_test {
        "android.hardware.audio@2.0",
        "android.hardware.audio.common@2.0",
    ],
    static_libs: ["libgtest"],
    static_libs: ["VtsHalHidlTargetTestBase"],
    cflags: [
        "-O0",
        "-g",
+3 −3
Original line number Diff line number Diff line
@@ -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 @@ private:
// 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 @@ public:

        if (devicesFactory == nullptr) {
            environment->registerTearDown([]{ devicesFactory.clear(); });
            devicesFactory = IDevicesFactory::getService();
            devicesFactory = ::testing::VtsHalHidlTargetTestBase::getService<IDevicesFactory>();
        }
        ASSERT_TRUE(devicesFactory != nullptr);
    }