Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wifi: Fix VTS tests in VtsHalWifiNanV1_2TargetTest

Browse Source 
This commit fixes VTS tests in VtsHalWifiNanV1_2TargetTest resulting
from upgrading APIs and stopping support for old APIs.

Bug: 146989939
Test: atest VtsHalWifiNanV1_2TargetTest
Change-Id: Ibc71cdb3ead7fb346ac62ebfd132f82ee3d81eeb
This commit is contained in:
Ahmed ElArabawy
2019-12-29 23:32:56 -08:00
parent 36defb377e
commit 436ab20ef6
1 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
wifi/1.2/vts/functional/wifi_nan_iface_hidl_test.cpp
View File

@@ -481,15 +481,18 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_2InvalidArgs) {
callbackType = INVALID;
NanEnableRequest nanEnableRequest = {};
NanConfigRequestSupplemental nanConfigRequestSupp = {};
ASSERT_EQ(WifiStatusCode::SUCCESS,
HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,
nanEnableRequest, nanConfigRequestSupp)
.code);
// wait for a callback
ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_ENABLE_RESPONSE));
ASSERT_EQ(NOTIFY_ENABLE_RESPONSE, callbackType);
ASSERT_EQ(id, inputCmdId);
ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);
const auto& halStatus =
HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,
nanEnableRequest, nanConfigRequestSupp);
if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {
ASSERT_EQ(WifiStatusCode::SUCCESS, halStatus.code);
// wait for a callback
ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_ENABLE_RESPONSE));
ASSERT_EQ(NOTIFY_ENABLE_RESPONSE, callbackType);
ASSERT_EQ(id, inputCmdId);
ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);
}
}
/*
@@ -502,10 +505,12 @@ TEST_P(WifiNanIfaceHidlTest, enableRequest_1_2ShimInvalidArgs) {
nanEnableRequest.configParams.numberOfPublishServiceIdsInBeacon =
128; // must be <= 127
NanConfigRequestSupplemental nanConfigRequestSupp = {};
ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,
HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,
nanEnableRequest, nanConfigRequestSupp)
.code);
const auto& halStatus =
HIDL_INVOKE(iwifiNanIface, enableRequest_1_2, inputCmdId,
nanEnableRequest, nanConfigRequestSupp);
if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {
ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS, halStatus.code);
}
}
/*
@@ -516,15 +521,19 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_2InvalidArgs) {
callbackType = INVALID;
NanConfigRequest nanConfigRequest = {};
NanConfigRequestSupplemental nanConfigRequestSupp = {};
ASSERT_EQ(WifiStatusCode::SUCCESS,
HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,
nanConfigRequest, nanConfigRequestSupp)
.code);
// wait for a callback
ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_CONFIG_RESPONSE));
ASSERT_EQ(NOTIFY_CONFIG_RESPONSE, callbackType);
ASSERT_EQ(id, inputCmdId);
ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);
const auto& halStatus =
HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,
nanConfigRequest, nanConfigRequestSupp);
if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {
ASSERT_EQ(WifiStatusCode::SUCCESS, halStatus.code);
// wait for a callback
ASSERT_EQ(std::cv_status::no_timeout, wait(NOTIFY_CONFIG_RESPONSE));
ASSERT_EQ(NOTIFY_CONFIG_RESPONSE, callbackType);
ASSERT_EQ(id, inputCmdId);
ASSERT_EQ(status.status, NanStatusType::INVALID_ARGS);
}
}
/*
@@ -536,14 +545,16 @@ TEST_P(WifiNanIfaceHidlTest, configRequest_1_2ShimInvalidArgs) {
NanConfigRequest nanConfigRequest = {};
nanConfigRequest.numberOfPublishServiceIdsInBeacon = 128; // must be <= 127
NanConfigRequestSupplemental nanConfigRequestSupp = {};
ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS,
HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,
nanConfigRequest, nanConfigRequestSupp)
.code);
const auto& halStatus =
HIDL_INVOKE(iwifiNanIface, configRequest_1_2, inputCmdId,
nanConfigRequest, nanConfigRequestSupp);
if (halStatus.code != WifiStatusCode::ERROR_NOT_SUPPORTED) {
ASSERT_EQ(WifiStatusCode::ERROR_INVALID_ARGS, halStatus.code);
}
}
INSTANTIATE_TEST_SUITE_P(
PerInstance, WifiNanIfaceHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(
::android::hardware::wifi::V1_2::IWifi::descriptor)),
android::hardware::PrintInstanceNameToString);
android::hardware::PrintInstanceNameToString);