Merge "Add VTS test for the enable and disable MSCS methods." into main

This commit is contained in:
Gabriel Biren 2024-02-21 16:48:43 +00:00 committed by Android (Google) Code Review
commit 9f446c11f4

View file

@ -43,6 +43,7 @@ using aidl::android::hardware::wifi::supplicant::ISupplicant;
using aidl::android::hardware::wifi::supplicant::ISupplicantStaIface; using aidl::android::hardware::wifi::supplicant::ISupplicantStaIface;
using aidl::android::hardware::wifi::supplicant::ISupplicantStaNetwork; using aidl::android::hardware::wifi::supplicant::ISupplicantStaNetwork;
using aidl::android::hardware::wifi::supplicant::KeyMgmtMask; using aidl::android::hardware::wifi::supplicant::KeyMgmtMask;
using aidl::android::hardware::wifi::supplicant::MscsParams;
using aidl::android::hardware::wifi::supplicant::WpaDriverCapabilitiesMask; using aidl::android::hardware::wifi::supplicant::WpaDriverCapabilitiesMask;
using aidl::android::hardware::wifi::supplicant::WpsConfigMethods; using aidl::android::hardware::wifi::supplicant::WpsConfigMethods;
using android::ProcessState; using android::ProcessState;
@ -252,6 +253,7 @@ class SupplicantStaIfaceAidlTest : public testing::TestWithParam<std::string> {
true, // show timestamps true, // show timestamps
true) true)
.isOk()); .isOk());
ASSERT_TRUE(supplicant_->getInterfaceVersion(&interface_version_).isOk());
EXPECT_TRUE(supplicant_->getStaInterface(getStaIfaceName(), &sta_iface_) EXPECT_TRUE(supplicant_->getStaInterface(getStaIfaceName(), &sta_iface_)
.isOk()); .isOk());
ASSERT_NE(sta_iface_, nullptr); ASSERT_NE(sta_iface_, nullptr);
@ -293,6 +295,7 @@ class SupplicantStaIfaceAidlTest : public testing::TestWithParam<std::string> {
protected: protected:
std::shared_ptr<ISupplicant> supplicant_; std::shared_ptr<ISupplicant> supplicant_;
std::shared_ptr<ISupplicantStaIface> sta_iface_; std::shared_ptr<ISupplicantStaIface> sta_iface_;
int interface_version_;
private: private:
// synchronization objects // synchronization objects
@ -788,6 +791,22 @@ TEST_P(SupplicantStaIfaceAidlTest, StartDppConfiguratorInitiator) {
EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk()); EXPECT_TRUE(sta_iface_->removeDppUri(peer_id).isOk());
} }
/*
* Configure and Disable MSCS
*/
TEST_P(SupplicantStaIfaceAidlTest, ConfigureAndDisableMscs) {
if (interface_version_ < 3) {
GTEST_SKIP() << "MSCS configure/disable is available as of Supplicant V3";
}
MscsParams params;
params.upBitmap = 0;
params.upLimit = 7;
params.streamTimeoutUs = 1000; // 1 ms
params.frameClassifierMask = 0;
EXPECT_TRUE(sta_iface_->configureMscs(params).isOk());
EXPECT_TRUE(sta_iface_->disableMscs().isOk());
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SupplicantStaIfaceAidlTest); 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(