Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc7409e8 authored by Gabriel Biren's avatar Gabriel Biren
Browse files

Allow VTS tests to pass on devices without Supplicant AIDL.

Bug: 212653303
Bug: 212652735
Bug: 212652340
Test: Run VTS tests on an AOSP build (since AOSP
       is still using the HIDL interface).
Change-Id: I442efb35c4c68a1337cacc952c3fdb338ef2615d
parent bf3f93bb
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -620,6 +620,7 @@ TEST_P(SupplicantP2pIfaceAidlTest, AddAndRemoveUpnpService) {
        p2p_iface_->removeUpnpService(0 /* version */, upnpServiceName).isOk());
        p2p_iface_->removeUpnpService(0 /* version */, upnpServiceName).isOk());
}
}


GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantP2pIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest,
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantP2pIfaceAidlTest,
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                             ISupplicant::descriptor)),
                             ISupplicant::descriptor)),
+1 −0
Original line number Original line Diff line number Diff line
@@ -769,6 +769,7 @@ TEST_P(SupplicantStaIfaceAidlTest, StartDppConfiguratorInitiator) {
    EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk());
    EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk());
}
}


GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaIfaceAidlTest,
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaIfaceAidlTest,
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                             ISupplicant::descriptor)),
                             ISupplicant::descriptor)),
+1 −0
Original line number Original line Diff line number Diff line
@@ -778,6 +778,7 @@ TEST_P(SupplicantStaNetworkAidlTest, GetWpsNfcConfigurationToken) {
    EXPECT_NE(retrievedToken.size(), 0);
    EXPECT_NE(retrievedToken.size(), 0);
}
}


GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaNetworkAidlTest);
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaNetworkAidlTest,
INSTANTIATE_TEST_SUITE_P(Supplicant, SupplicantStaNetworkAidlTest,
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                         testing::ValuesIn(android::getAidlHalInstanceNames(
                             ISupplicant::descriptor)),
                             ISupplicant::descriptor)),