tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Change vts target base test class name"

Browse source
This commit is contained in:
Yuexi Ma 2017-03-10 20:58:03 +00:00 committed by Gerrit Code Review
commit 4f4fdaf664
27 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bluetooth/1.0/vts/functional/Android.bp
View file

@ -28,7 +28,7 @@ cc_test {
"libutils",
"android.hardware.bluetooth@1.0",
],
static_libs: ["VtsHalHidlTargetBaseTest"],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",

6
bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
View file

@ -23,7 +23,7 @@
#include <hardware/bluetooth.h>
#include <utils/Log.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.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::VtsHalHidlTargetBaseTest {
class BluetoothHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
// currently test passthrough mode only
bluetooth = ::testing::VtsHalHidlTargetBaseTest::getService<IBluetoothHci>();
bluetooth = ::testing::VtsHalHidlTargetTestBase::getService<IBluetoothHci>();
ASSERT_NE(bluetooth, nullptr);
ALOGI("%s: getService() for bluetooth is %s", __func__,
bluetooth->isRemote() ? "remote" : "local");

2
ir/1.0/vts/functional/Android.bp
View file

@ -27,7 +27,7 @@ cc_test {
"libutils",
"android.hardware.ir@1.0",
],
static_libs: ["VtsHalHidlTargetBaseTest"],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",

6
ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp
View file

@ -21,7 +21,7 @@
#include <android/hardware/ir/1.0/IConsumerIr.h>
#include <android/hardware/ir/1.0/types.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.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::VtsHalHidlTargetBaseTest {
class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
ir = ::testing::VtsHalHidlTargetBaseTest::getService<IConsumerIr>();
ir = ::testing::VtsHalHidlTargetTestBase::getService<IConsumerIr>();
ASSERT_NE(ir, nullptr);
}

2
nfc/1.0/vts/functional/Android.bp
View file

@ -28,7 +28,7 @@ cc_test {
"libutils",
"android.hardware.nfc@1.0",
],
static_libs: ["VtsHalHidlTargetBaseTest"],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",

6
nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp
View file

@ -22,7 +22,7 @@
#include <android/hardware/nfc/1.0/types.h>
#include <hardware/nfc.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include <chrono>
#include <condition_variable>
#include <mutex>
@ -56,10 +56,10 @@ using ::android::sp;
#define TIMEOUT_PERIOD 5
// The main test class for NFC HIDL HAL.
class NfcHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class NfcHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
nfc_ = ::testing::VtsHalHidlTargetBaseTest::getService<INfc>();
nfc_ = ::testing::VtsHalHidlTargetTestBase::getService<INfc>();
ASSERT_NE(nfc_, nullptr);
nfc_cb_ = new NfcClientCallback(*this);

2
radio/1.0/vts/functional/Android.bp
View file

@ -33,7 +33,7 @@ cc_test {
"libutils",
"android.hardware.radio@1.0",
],
static_libs: ["VtsHalHidlTargetBaseTest"],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",

2
radio/1.0/vts/functional/radio_hidl_hal_test.cpp
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::VtsHalHidlTargetTestBase::getService<IRadio>(hidl_string("rild"));
ASSERT_NE(radio, nullptr);
radioRsp = new RadioResponse(*this);

4
radio/1.0/vts/functional/radio_hidl_hal_utils.h
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include <chrono>
#include <condition_variable>
#include <mutex>
@ -435,7 +435,7 @@ public:
};
// The main test class for Radio HIDL.
class RadioHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase {
private:
std::mutex mtx;
std::condition_variable cv;

2
wifi/1.0/vts/functional/Android.bp
View file

@ -38,7 +38,7 @@ cc_test {
"libutils",
"android.hardware.wifi@1.0",
],
static_libs: ["VtsHalHidlTargetBaseTest"],
static_libs: ["VtsHalHidlTargetTestBase"],
cflags: [
"-O0",
"-g",

2
wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_test_utils.h"

4
wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifiApIface.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_test_utils.h"
@ -28,7 +28,7 @@ using ::android::sp;
/**
* Fixture to use for all AP Iface HIDL interface tests.
*/
class WifiApIfaceHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiApIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {}

4
wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifiChip.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_call_util.h"
#include "wifi_hidl_test_utils.h"
@ -63,7 +63,7 @@ bool hasAnyRingBufferCapabilities(uint32_t caps) {
/**
* Fixture to use for all Wifi chip HIDL interface tests.
*/
class WifiChipHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiChipHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
wifi_chip_ = getWifiChip();

2
wifi/1.0/vts/functional/wifi_hidl_call_util.h
View file

@ -21,7 +21,7 @@
#include <type_traits>
#include <utility>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
namespace {
namespace detail {

4
wifi/1.0/vts/functional/wifi_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifi.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_test_utils.h"
@ -28,7 +28,7 @@ using ::android::sp;
/**
* Fixture to use for all root Wifi HIDL interface tests.
*/
class WifiHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {}

4
wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_call_util.h"
#include "wifi_hidl_test_utils.h"
@ -91,7 +91,7 @@ void stopFramework() {
void startFramework() { ASSERT_EQ(std::system("start"), 0); }
sp<IWifi> getWifi() {
sp<IWifi> wifi = ::testing::VtsHalHidlTargetBaseTest::getService<IWifi>();
sp<IWifi> wifi = ::testing::VtsHalHidlTargetTestBase::getService<IWifi>();
return wifi;
}

4
wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp
View file

@ -19,7 +19,7 @@
#include <android/hardware/wifi/1.0/IWifiNanIface.h>
#include <android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include <chrono>
#include <condition_variable>
#include <mutex>
@ -38,7 +38,7 @@ using ::android::sp;
/**
* Fixture to use for all NAN Iface HIDL interface tests.
*/
class WifiNanIfaceHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiNanIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
iwifiNanIface = getWifiNanIface();

4
wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifiP2pIface.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_test_utils.h"
@ -28,7 +28,7 @@ using ::android::sp;
/**
* Fixture to use for all P2P Iface HIDL interface tests.
*/
class WifiP2pIfaceHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiP2pIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {}

4
wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifiRttController.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_test_utils.h"
@ -28,7 +28,7 @@ using ::android::sp;
/**
* Fixture to use for all RTT controller HIDL interface tests.
*/
class WifiRttControllerHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiRttControllerHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {}

4
wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
View file

@ -18,7 +18,7 @@
#include <android/hardware/wifi/1.0/IWifiStaIface.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "wifi_hidl_call_util.h"
#include "wifi_hidl_test_utils.h"
@ -31,7 +31,7 @@ using ::android::hardware::wifi::V1_0::WifiStatusCode;
/**
* Fixture to use for all STA Iface HIDL interface tests.
*/
class WifiStaIfaceHidlTest : public ::testing::VtsHalHidlTargetBaseTest {
class WifiStaIfaceHidlTest : public ::testing::VtsHalHidlTargetTestBase {
public:
virtual void SetUp() override {
wifi_sta_iface_ = getWifiStaIface();

2
wifi/supplicant/1.0/vts/functional/Android.mk
View file

@ -37,6 +37,6 @@ LOCAL_SHARED_LIBRARIES := \
libwifi-system
LOCAL_STATIC_LIBRARIES := \
libgmock \
VtsHalHidlTargetBaseTest
VtsHalHidlTargetTestBase
include $(BUILD_NATIVE_TEST)

2
wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "supplicant_hidl_test_utils.h"

2
wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "supplicant_hidl_test_utils.h"

2
wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
View file

@ -15,7 +15,7 @@
*/
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include <hidl/HidlTransportSupport.h>
#include <android/hidl/manager/1.0/IServiceManager.h>

2
wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "supplicant_hidl_test_utils.h"

2
wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "supplicant_hidl_test_utils.h"

2
wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp
View file

@ -16,7 +16,7 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetBaseTest.h>
#include <VtsHalHidlTargetTestBase.h>
#include "supplicant_hidl_test_utils.h"