Merge "Add columns to namespace for vts target base test invocation"

This commit is contained in:
Treehugger Robot
2017-02-28 20:59:11 +00:00
committed by Gerrit Code Review
5 changed files with 5 additions and 5 deletions

View File

@@ -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");

View File

@@ -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);
}

View File

@@ -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);

View File

@@ -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);

View File

@@ -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;
}