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

supplicant(vts): Stop adding empty instance for vendor HAL am: b9ddf021d3 am: 8a4e68b788 am: 329fe1ca18

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1438028

Change-Id: Ib32992f893ff0fc118bf11d0173e5a403b6f8a97
This commit is contained in:
Roshan Pius
2020-09-28 18:50:16 +00:00
committed by Automerger Merge Worker
parent 959fe92871 329fe1ca18
commit a8cec5d5ce
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wifi/supplicant/1.1/vts/functional/supplicant_hidl_test.cpp
View File

@@ -33,6 +33,7 @@ using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatus;
using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode; using ::android::hardware::wifi::supplicant::V1_0::SupplicantStatusCode;
using ::android::hardware::wifi::supplicant::V1_0::IfaceType; using ::android::hardware::wifi::supplicant::V1_0::IfaceType;
using ::android::hardware::wifi::supplicant::V1_1::ISupplicant; using ::android::hardware::wifi::supplicant::V1_1::ISupplicant;
using ::android::hardware::wifi::V1_0::IWifi;
using ::android::sp; using ::android::sp;
class SupplicantHidlTest : public SupplicantHidlTestBase { class SupplicantHidlTest : public SupplicantHidlTestBase {
@@ -139,21 +140,12 @@ TEST_P(SupplicantHidlTest, RemoveP2pInterface) {
*/ */
TEST_P(SupplicantHidlTest, Terminate) { supplicant_->terminate(); } TEST_P(SupplicantHidlTest, Terminate) { supplicant_->terminate(); }
static std::vector<std::string> get_wifi_instances() {
std::vector<std::string> instances =
android::hardware::getAllHalInstanceNames(
android::hardware::wifi::V1_0::IWifi::descriptor);
// Also test when wifi instance is not set.
instances.push_back("");
return instances;
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantHidlTest);
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
PerInstance, SupplicantHidlTest, PerInstance, SupplicantHidlTest,
testing::Combine( testing::Combine(
testing::ValuesIn(get_wifi_instances()), testing::ValuesIn(
android::hardware::getAllHalInstanceNames(IWifi::descriptor)),
testing::ValuesIn(android::hardware::getAllHalInstanceNames( testing::ValuesIn(android::hardware::getAllHalInstanceNames(
android::hardware::wifi::supplicant::V1_1::ISupplicant:: android::hardware::wifi::supplicant::V1_1::ISupplicant::
descriptor))), descriptor))),