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

Commit 5fd2ce66 authored by Yuexi Ma's avatar Yuexi Ma Committed by Gerrit Code Review
Browse files

Merge "change all vts hidl tests to use VtsHalHidlTargetBaseTest"

parents 4ba6a7d3 178dfd5e

bluetooth/1.0/vts/functional/Android.bp

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


cc_test {

    name: "VtsHalBluetoothV1_0TargetTest",

    gtest: true,

    srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"],

    shared_libs: [

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

        "android.hardware.bluetooth@1.0",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bluetooth.h>

#include <utils/Log.h>



#include <gtest/gtest.h>

#include <VtsHalHidlTargetBaseTest.h>

#include <condition_variable>

#include <mutex>

#include <queue>
@@ -117,11 +117,11 @@ class ThroughputLogger { 
};



// The main test class for Bluetooth HIDL HAL.

class BluetoothHidlTest : public ::testing::Test {

class BluetoothHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

 public:

  virtual void SetUp() override {

    // currently test passthrough mode only

    bluetooth = IBluetoothHci::getService();

    bluetooth = testing::VtsHalHidlTargetBaseTest::getService<IBluetoothHci>();

    ASSERT_NE(bluetooth, nullptr);

    ALOGI("%s: getService() for bluetooth is %s", __func__,

          bluetooth->isRemote() ? "remote" : "local");

ir/1.0/vts/functional/Android.bp

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


cc_test {

    name: "VtsHalIrV1_0TargetTest",

    gtest: true,

    srcs: ["VtsHalIrV1_0TargetTest.cpp"],

    shared_libs: [

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

        "android.hardware.ir@1.0",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",

ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android/hardware/ir/1.0/IConsumerIr.h>

#include <android/hardware/ir/1.0/types.h>



#include <gtest/gtest.h>

#include <VtsHalHidlTargetBaseTest.h>

#include <algorithm>



using ::android::hardware::ir::V1_0::IConsumerIr;
@@ -31,10 +31,10 @@ using ::android::hardware::Return; 
using ::android::sp;



// The main test class for IR HIDL HAL.

class ConsumerIrHidlTest : public ::testing::Test {

class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

 public:

  virtual void SetUp() override {

    ir = IConsumerIr::getService();

    ir = testing::VtsHalHidlTargetBaseTest::getService<IConsumerIr>();

    ASSERT_NE(ir, nullptr);

  }

nfc/1.0/vts/functional/Android.bp

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


cc_test {

    name: "VtsHalNfcV1_0TargetTest",

    gtest: true,

    srcs: ["VtsHalNfcV1_0TargetTest.cpp"],

    shared_libs: [

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

        "android.hardware.nfc@1.0",

    ],

    static_libs: ["libgtest"],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    cflags: [

        "-O0",

        "-g",