From 291e1cc2ae16a38dcce53cc6a7c09a4170d128c7 Mon Sep 17 00:00:00 2001 From: yangpengfei Date: Tue, 19 Nov 2024 13:35:08 +0000 Subject: [PATCH] update Signed-off-by: yangpengfei --- .../wifi_toolkit/libwifi_toolkit.map | 2 +- .../unittest/Mock/mock_wifi_settings.h | 6 ++- .../wifi_manage/wifi_sta/BUILD.gn | 2 +- .../Mock/mock_block_connect_service.cpp | 25 +++++++++ .../Mock/mock_block_connect_service.h | 54 +++++++++++++++++++ 5 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.cpp create mode 100644 wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.h diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/libwifi_toolkit.map b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/libwifi_toolkit.map index 799608069..6a78d3d94 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/libwifi_toolkit.map +++ b/wifi/services/wifi_standard/wifi_framework/wifi_toolkit/libwifi_toolkit.map @@ -250,11 +250,11 @@ "OHOS::Wifi::WifiSettings::AddDeviceConfig(OHOS::Wifi::WifiDeviceConfig const&)"; "OHOS::Wifi::WifiSettings::RemoveDevice(int)"; "OHOS::Wifi::WifiSettings::ClearDeviceConfig()"; + "OHOS::Wifi::WifiSettings::GetCandidateConfigWithoutUid(std::__h::basic_string, std::__h::allocator> const&, std::__h::basic_string, std::__h::allocator> const&, OHOS::Wifi::WifiDeviceConfig&)"; "OHOS::Wifi::WifiSettings::GetDeviceConfig(std::__h::vector>&, int)"; "OHOS::Wifi::WifiSettings::GetDeviceConfig(int const&, OHOS::Wifi::WifiDeviceConfig&, int)"; "OHOS::Wifi::WifiSettings::GetDeviceConfig(std::__h::basic_string, std::__h::allocator> const&, int const&, OHOS::Wifi::WifiDeviceConfig&, int)"; "OHOS::Wifi::WifiSettings::GetDeviceConfig(std::__h::basic_string, std::__h::allocator> const&, std::__h::basic_string, std::__h::allocator> const&, OHOS::Wifi::WifiDeviceConfig&, int)"; - "OHOS::Wifi::WifiSettings::SetDeviceState(int, int, bool)"; "OHOS::Wifi::WifiSettings::SetDeviceEphemeral(int, bool)"; "OHOS::Wifi::WifiSettings::SetDeviceAfterConnect(int)"; "OHOS::Wifi::WifiSettings::SetDeviceRandomizedMacSuccessEver(int)"; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/Mock/mock_wifi_settings.h index 5c36d06d8..b0ee8621a 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/Mock/mock_wifi_settings.h @@ -46,7 +46,8 @@ public: const std::string &ssid, const std::string &keymgmt, WifiDeviceConfig &config, int instId = 0) = 0; virtual int GetDeviceConfig( const std::string &index, const int &indexType, WifiDeviceConfig &config, int instId = 0) = 0; - virtual int SetDeviceState(int networkId, int state, bool bSetOther = false) = 0; + virtual int GetCandidateConfigWithoutUid(const std::string &ssid, const std::string &keymgmt, + WifiDeviceConfig &config) = 0; virtual int SyncDeviceConfig() = 0; virtual int ReloadDeviceConfig() = 0; virtual int GetIpInfo(IpInfo &info, int instId = 0) = 0; @@ -219,7 +220,8 @@ public: GetDeviceConfig, int(const std::string &ssid, const std::string &keymgmt, WifiDeviceConfig &config, int)); MOCK_METHOD4( GetDeviceConfig, int(const std::string &index, const int &indexType, WifiDeviceConfig &config, int)); - MOCK_METHOD3(SetDeviceState, int(int networkId, int state, bool bSetOther)); + MOCK_METHOD3(GetCandidateConfigWithoutUid, int(const std::string &ssid, const std::string &keymgmt, + WifiDeviceConfig &config)); MOCK_METHOD0(SyncDeviceConfig, int()); MOCK_METHOD0(ReloadDeviceConfig, int()); MOCK_METHOD2(GetIpInfo, int(IpInfo &info, int)); diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn index 799d0ed87..84da95fca 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/BUILD.gn @@ -42,7 +42,6 @@ local_base_sources = [ "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/network_select/wifi_scorer_impl.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/app_network_speed_limit/app_network_speed_limit_service.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/app_network_speed_limit/speed_limit_configs_writer.cpp", - "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/block_connect_service.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/network_black_list/network_black_list_manager.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/network_status_history/network_status_history_manager.cpp", "$WIFI_ROOT_DIR/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/wifi_app_state_aware.cpp", @@ -78,6 +77,7 @@ local_base_sources = [ "Mock/mock_state_machine.cpp", "Mock/mock_wifi_chip_hal_interface.cpp", "Mock/mock_wifi_settings.cpp", + "Mock/mock_block_connect_service.cpp", ] local_base_include_dirs = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.cpp new file mode 100644 index 000000000..b19d9ddf4 --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.cpp @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "mock_block_connect_service.h" + +namespace OHOS { +namespace Wifi { +BlockConnectService &BlockConnectService::GetInstance(void) +{ + static BlockConnectService inst; + return inst; +} +} // namespace Wifi +} // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.h new file mode 100644 index 000000000..a6e962cc5 --- /dev/null +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_sta/Mock/mock_block_connect_service.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef OHOS_MOCK_BLOCKCONNECTSERVICE_H +#define OHOS_MOCK_BLOCKCONNECTSERVICE_H + +#include "wifi_ap_msg.h" +#include "wifi_msg.h" +#include +#include "wifi_internal_msg.h" + +namespace OHOS { +namespace Wifi { +class MockBlockConnectService { +public: + virtual ~MockBlockConnectService() = default; + virtual bool ShouldAutoConnect(const WifiDeviceConfig &config) = 0; + virtual bool UpdateAllNetworkSelectStatus() = 0; + virtual bool UpdateNetworkSelectStatus(int targetNetworkId, DisabledReason disableReason, int wpaReason) = 0; + virtual bool UpdateNetworkSelectStatus(int targetNetworkId, DisabledReason disableReason) = 0; + virtual bool EnableNetworkSelectStatus(int targetNetworkId) = 0; + virtual bool IsFrequentDisconnect(std::string bssid, int wpaReason) = 0; + virtual bool IsWrongPassword(int targetNetworkId) = 0; +}; + +class BlockConnectService : public MockBlockConnectService { +public: + BlockConnectService() = default; + ~BlockConnectService() = default; + static BlockConnectService &GetInstance(void); + + + MOCK_METHOD1(ShouldAutoConnect, bool(const WifiDeviceConfig &config)); + MOCK_METHOD0(UpdateAllNetworkSelectStatus, bool()); + MOCK_METHOD3(UpdateNetworkSelectStatus, bool(int targetNetworkId, DisabledReason disableReason, int wpaReason)); + MOCK_METHOD2(UpdateNetworkSelectStatus, bool(int targetNetworkId, DisabledReason disableReason)); + MOCK_METHOD1(EnableNetworkSelectStatus, bool(int targetNetworkId)); + MOCK_METHOD2(IsFrequentDisconnect, bool(std::string bssid, int wpaReason)); + MOCK_METHOD1(IsWrongPassword, bool(int targetNetworkId)); +}; +} // namespace OHOS +} // namespace Wifi +#endif \ No newline at end of file