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

[DPP R2] Update VTS test for supplicant 1.2

Browse source 
Update VTS test for supplicant 1.2 to skip the DPP tests
if the underyling HAL is 1.3. The reason is because 1.3
HAL uses different callbacks.

Bug: 139381558
Test: atest VtsHalWifiSupplicantV1_2Host
Change-Id: Ie9cd93e33bda3ca22ee2b5593d185f1918be847e
This commit is contained in:
Hai Shalom 2019-12-20 14:29:47 -08:00
parent 36768048c4
commit a94e59a387
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wifi/supplicant/1.2/vts/functional/Android.bp
View file

@ -51,6 +51,7 @@ cc_test {
"android.hardware.wifi.supplicant@1.0",
"android.hardware.wifi.supplicant@1.1",
"android.hardware.wifi.supplicant@1.2",
"android.hardware.wifi.supplicant@1.3",
"android.hardware.wifi@1.0",
"android.hardware.wifi@1.1",
"libgmock",

30
wifi/supplicant/1.2/vts/functional/supplicant_sta_iface_hidl_test.cpp
View file

@ -22,6 +22,8 @@
#include <android/hardware/wifi/supplicant/1.2/ISupplicantStaIfaceCallback.h>
#include <android/hardware/wifi/supplicant/1.2/ISupplicantStaNetwork.h>
#include <android/hardware/wifi/supplicant/1.2/types.h>
#include <android/hardware/wifi/supplicant/1.3/ISupplicantStaIface.h>
#include <android/hardware/wifi/supplicant/1.3/types.h>
#include <hidl/HidlSupport.h>
#include <hidl/Status.h>
@ -318,6 +320,19 @@ TEST_F(SupplicantStaIfaceHidlTest, StartDppEnrolleeInitiator) {
return;
}
/* Check if the underlying HAL version is 1.3 or higher and skip the test
* in this case. The 1.3 HAL uses different callbacks which are not
* supported by 1.2. This will cause this test to fail because the callbacks
* it is waiting for will never be called. Note that this test is also
* implemented in the 1.3 VTS test.
*/
sp<::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface> v1_3 =
::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface::
castFrom(sta_iface_);
if (v1_3 != nullptr) {
GTEST_SKIP() << "Test not supported with this HAL version";
}
hidl_string uri =
"DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"
"0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";
@ -369,6 +384,21 @@ TEST_F(SupplicantStaIfaceHidlTest, StartDppConfiguratorInitiator) {
return;
}
/* Check if the underlying HAL version is 1.3 or higher and skip the test
* in this case. The 1.3 HAL uses different callbacks which are not
* supported by 1.2. This will cause this test to fail because the callbacks
* it is waiting for will never be called. Note that this test is also
* implemented in the 1.3 VTS test.
*/
sp<::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface> v1_3 =
::android::hardware::wifi::supplicant::V1_3::ISupplicantStaIface::
castFrom(sta_iface_);
if (v1_3 != nullptr) {
GTEST_SKIP() << "Test not supported with this HAL version";
return;
}
hidl_string uri =
"DPP:C:81/1;M:48d6d5bd1de1;I:G1197843;K:MDkwEwYHKoZIzj0CAQYIKoZIzj"
"0DAQcDIgAD0edY4X3N//HhMFYsZfMbQJTiNFtNIWF/cIwMB/gzqOM=;;";