diff options
27 files changed, 42 insertions, 42 deletions
diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index cb1abe81c2..d2e655369f 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "libutils", "android.hardware.bluetooth@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp index c8c7cb5832..9a4efae0ba 100644 --- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp +++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp @@ -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"); diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index 807612658a..4aac2979b1 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -27,7 +27,7 @@ cc_test { "libutils", "android.hardware.ir@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp b/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp index ead41c8bd6..3dad3c10b8 100644 --- a/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp +++ b/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp @@ -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); } diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index f0359dc5d3..d9ba7021fc 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "libutils", "android.hardware.nfc@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp index 4aa6d7eef5..aa3bc9c484 100644 --- a/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp +++ b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp @@ -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); diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 67309ca328..7f161635b8 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -33,7 +33,7 @@ cc_test { "libutils", "android.hardware.radio@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp index 50b27e956c..db7356f7b9 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_test.cpp @@ -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); diff --git a/radio/1.0/vts/functional/radio_hidl_hal_utils.h b/radio/1.0/vts/functional/radio_hidl_hal_utils.h index 04d4563d2a..bb693ac747 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_utils.h +++ b/radio/1.0/vts/functional/radio_hidl_hal_utils.h @@ -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; diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 11d0619ced..eab338ba3a 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -38,7 +38,7 @@ cc_test { "libutils", "android.hardware.wifi@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp b/wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp index 51512a1f2c..b56ed2bcf5 100644 --- a/wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp +++ b/wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "wifi_hidl_test_utils.h" diff --git a/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp index dd3df56659..42d9a96c87 100644 --- a/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_ap_iface_hidl_test.cpp @@ -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 {} diff --git a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp index 465ab64b79..084067cd7b 100644 --- a/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_chip_hidl_test.cpp @@ -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(); diff --git a/wifi/1.0/vts/functional/wifi_hidl_call_util.h b/wifi/1.0/vts/functional/wifi_hidl_call_util.h index 4797423bf2..f3ca517fe6 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_call_util.h +++ b/wifi/1.0/vts/functional/wifi_hidl_call_util.h @@ -21,7 +21,7 @@ #include <type_traits> #include <utility> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> namespace { namespace detail { diff --git a/wifi/1.0/vts/functional/wifi_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_hidl_test.cpp index 2f4e01e62e..b8e501c0a5 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test.cpp @@ -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 {} diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index 0e10e42b65..2d0b081d17 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp @@ -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; } diff --git a/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp index 95c0e5daa5..85bcccd230 100644 --- a/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_nan_iface_hidl_test.cpp @@ -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(); diff --git a/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp index d53096c999..269eb6c62e 100644 --- a/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_p2p_iface_hidl_test.cpp @@ -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 {} diff --git a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp index 4d08919cf6..e13086d2ec 100644 --- a/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_rtt_controller_hidl_test.cpp @@ -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 {} diff --git a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp index 0984241299..95add615ad 100644 --- a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp +++ b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp @@ -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(); diff --git a/wifi/supplicant/1.0/vts/functional/Android.mk b/wifi/supplicant/1.0/vts/functional/Android.mk index 93e52506de..cfcd4f8005 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.mk +++ b/wifi/supplicant/1.0/vts/functional/Android.mk @@ -37,6 +37,6 @@ LOCAL_SHARED_LIBRARIES := \ libwifi-system LOCAL_STATIC_LIBRARIES := \ libgmock \ - VtsHalHidlTargetBaseTest + VtsHalHidlTargetTestBase include $(BUILD_NATIVE_TEST) diff --git a/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp index 802d11c79b..a69d14d1f0 100644 --- a/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp +++ b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "supplicant_hidl_test_utils.h" diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp index eb02445e81..ab1b6a3e55 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "supplicant_hidl_test_utils.h" diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp index 3f7ee1a545..fdee0c6bff 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp @@ -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> diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp index 200845bdc1..332b57bd04 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "supplicant_hidl_test_utils.h" diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp index a1f5513328..c50539b0b7 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_iface_hidl_test.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "supplicant_hidl_test_utils.h" diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp index e2572c23ce..cde75faed0 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_sta_network_hidl_test.cpp @@ -16,7 +16,7 @@ #include <android-base/logging.h> -#include <VtsHalHidlTargetBaseTest.h> +#include <VtsHalHidlTargetTestBase.h> #include "supplicant_hidl_test_utils.h" |