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

Commit 93d2541a authored by Yuexi Ma's avatar Yuexi Ma
Browse files

Add columns to namespace for vts target base test invocation 

Test: make vts
Change-Id: Ia0284fbc11eadef572dd510bb5847160852bd517
parent 5fd2ce66

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class BluetoothHidlTest : public ::testing::VtsHalHidlTargetBaseTest { 
 public:

  virtual void SetUp() override {

    // currently test passthrough mode only

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

    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/VtsHalIrV1_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ using ::android::sp; 
class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

 public:

  virtual void SetUp() override {

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

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

    ASSERT_NE(ir, nullptr);

  }

nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ using ::android::sp; 
class NfcHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

 public:

  virtual void SetUp() override {

    nfc_ = testing::VtsHalHidlTargetBaseTest::getService<INfc>();

    nfc_ = ::testing::VtsHalHidlTargetBaseTest::getService<INfc>();

    ASSERT_NE(nfc_, nullptr);



    nfc_cb_ = new NfcClientCallback(*this);

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include<radio_hidl_hal_utils.h>



void RadioHidlTest::SetUp() {

    radio = testing::VtsHalHidlTargetBaseTest::getService<IRadio>(hidl_string("rild"));

    radio = ::testing::VtsHalHidlTargetBaseTest::getService<IRadio>(hidl_string("rild"));

    ASSERT_NE(radio, nullptr);



    radioRsp = new RadioResponse(*this);

wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void stopFramework() { 
void startFramework() { ASSERT_EQ(std::system("svc wifi enable"), 0); }



sp<IWifi> getWifi() {

    sp<IWifi> wifi = testing::VtsHalHidlTargetBaseTest::getService<IWifi>();

    sp<IWifi> wifi = ::testing::VtsHalHidlTargetBaseTest::getService<IWifi>();

    return wifi;

}