From d459e4eecde81e8b2fc21d16fd6db019f8d22c50 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Wed, 7 Oct 2020 11:28:31 +0800 Subject: [PATCH] wifi: check all possible returning codes for connect/cancelConnect Before R, those two calls are not going to work with fake values. After enabling auto-join, it will success always. Bug: 169890122 Test: atest VtsHalWifiSupplicantP2pV1_0TargetTest Change-Id: I7d94e797e140520a5df33bba854d5cb2b015eacf --- .../supplicant_p2p_iface_hidl_test.cpp | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp index e74fd590ab..325f355f4a 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -282,8 +282,17 @@ TEST_P(SupplicantP2pIfaceHidlTest, Connect) { mac_addr_, ISupplicantP2pIface::WpsProvisionMethod::PBC, kTestConnectPin, false, false, kTestConnectGoIntent, [](const SupplicantStatus& status, const hidl_string& /* pin */) { - // After enabling auto-join, it will succeed always. - EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code); + /* + * Before R, auto-join is not enabled and it is not going to work + * with fake values. After enabling auto-join, it will succeed + * always. + */ + LOG(INFO) << "ISupplicantP2pIface::connect() ret: " + << toString(status); + if (SupplicantStatusCode::FAILURE_UNKNOWN != status.code && + SupplicantStatusCode::SUCCESS != status.code) { + FAIL(); + } }); } @@ -295,12 +304,26 @@ TEST_P(SupplicantP2pIfaceHidlTest, CancelConnect) { mac_addr_, ISupplicantP2pIface::WpsProvisionMethod::PBC, kTestConnectPin, false, false, kTestConnectGoIntent, [](const SupplicantStatus& status, const hidl_string& /* pin */) { - // After enabling auto-join, it will succeed always. - EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code); + /* + * Before R, auto-join is not enabled and it is not going to work + * with fake values. After enabling auto-join, it will succeed + * always. + */ + LOG(INFO) << "ISupplicantP2pIface::connect() ret: " + << toString(status); + if (SupplicantStatusCode::FAILURE_UNKNOWN != status.code && + SupplicantStatusCode::SUCCESS != status.code) { + FAIL(); + } }); p2p_iface_->cancelConnect([](const SupplicantStatus& status) { - EXPECT_EQ(SupplicantStatusCode::SUCCESS, status.code); + LOG(INFO) << "ISupplicantP2pIface::cancelConnect() ret: " + << toString(status); + if (SupplicantStatusCode::FAILURE_UNKNOWN != status.code && + SupplicantStatusCode::SUCCESS != status.code) { + FAIL(); + } }); }