Merge "[VTS] Seperate Nan and Rtt from Sap test" into rvc-dev
This commit is contained in:
commit
7f304d738b
2 changed files with 44 additions and 22 deletions
|
@ -21,7 +21,51 @@ cc_test {
|
||||||
srcs: [
|
srcs: [
|
||||||
"wifi_ap_iface_hidl_test.cpp",
|
"wifi_ap_iface_hidl_test.cpp",
|
||||||
"wifi_chip_hidl_test.cpp",
|
"wifi_chip_hidl_test.cpp",
|
||||||
|
],
|
||||||
|
static_libs: [
|
||||||
|
"VtsHalWifiV1_0TargetTestUtil",
|
||||||
|
"android.hardware.wifi@1.0",
|
||||||
|
"android.hardware.wifi@1.1",
|
||||||
|
"android.hardware.wifi@1.2",
|
||||||
|
"android.hardware.wifi@1.3",
|
||||||
|
"android.hardware.wifi@1.4",
|
||||||
|
"libwifi-system-iface",
|
||||||
|
],
|
||||||
|
test_suites: [
|
||||||
|
"general-tests",
|
||||||
|
"vts",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
// These tests are split out so that they can be conditioned on presence of the
|
||||||
|
// "android.hardware.wifi.aware" feature.
|
||||||
|
cc_test {
|
||||||
|
name: "VtsHalWifiNanV1_4TargetTest",
|
||||||
|
defaults: ["VtsHalTargetTestDefaults"],
|
||||||
|
srcs: [
|
||||||
"wifi_nan_iface_hidl_test.cpp",
|
"wifi_nan_iface_hidl_test.cpp",
|
||||||
|
],
|
||||||
|
static_libs: [
|
||||||
|
"VtsHalWifiV1_0TargetTestUtil",
|
||||||
|
"android.hardware.wifi@1.0",
|
||||||
|
"android.hardware.wifi@1.1",
|
||||||
|
"android.hardware.wifi@1.2",
|
||||||
|
"android.hardware.wifi@1.3",
|
||||||
|
"android.hardware.wifi@1.4",
|
||||||
|
"libwifi-system-iface",
|
||||||
|
],
|
||||||
|
test_suites: [
|
||||||
|
"general-tests",
|
||||||
|
"vts",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
// These tests are split out so that they can be conditioned on presence of the
|
||||||
|
// "android.hardware.wifi.rtt" feature.
|
||||||
|
cc_test {
|
||||||
|
name: "VtsHalWifiRttV1_4TargetTest",
|
||||||
|
defaults: ["VtsHalTargetTestDefaults"],
|
||||||
|
srcs: [
|
||||||
"wifi_rtt_controller_hidl_test.cpp",
|
"wifi_rtt_controller_hidl_test.cpp",
|
||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
|
|
|
@ -150,28 +150,6 @@ TEST_P(WifiChipHidlTest, registerEventCallback_1_4) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* createRttController_1_4
|
|
||||||
* Ensures that an instance of the IWifiRttController proxy object is
|
|
||||||
* successfully created.
|
|
||||||
*/
|
|
||||||
TEST_P(WifiChipHidlTest, createRttController_1_4) {
|
|
||||||
configureChipForIfaceType(IfaceType::STA, true);
|
|
||||||
|
|
||||||
const auto& status_and_iface = HIDL_INVOKE(wifi_chip_, createStaIface);
|
|
||||||
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_iface.first.code);
|
|
||||||
sp<IWifiStaIface> iface = IWifiStaIface::castFrom(status_and_iface.second);
|
|
||||||
EXPECT_NE(nullptr, iface.get());
|
|
||||||
|
|
||||||
const auto& status_and_controller =
|
|
||||||
HIDL_INVOKE(wifi_chip_, createRttController_1_4, iface);
|
|
||||||
if (status_and_controller.first.code !=
|
|
||||||
WifiStatusCode::ERROR_NOT_SUPPORTED) {
|
|
||||||
EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_controller.first.code);
|
|
||||||
EXPECT_NE(nullptr, status_and_controller.second.get());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
INSTANTIATE_TEST_SUITE_P(
|
INSTANTIATE_TEST_SUITE_P(
|
||||||
PerInstance, WifiChipHidlTest,
|
PerInstance, WifiChipHidlTest,
|
||||||
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
|
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
|
||||||
|
|
Loading…
Reference in a new issue