From aecd479de9df4822ba103e00eaac26aca1815394 Mon Sep 17 00:00:00 2001 From: sunjingqiang <17319862417@163.com> Date: Wed, 6 Dec 2023 17:21:58 +0800 Subject: [PATCH] tdd Signed-off-by: sunjingqiang <17319862417@163.com> --- .../wifi_manage/unittest/wifi_country_code_policy_test.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 1 + .../wifi_manage/wifi_scan/Mock/mock_wifi_settings.h | 5 ----- .../wifi_manage/wifi_scan/scan_service_test.cpp | 5 ----- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_country_code_policy_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_country_code_policy_test.cpp index 2187356ac..d2617801c 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_country_code_policy_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/wifi_country_code_policy_test.cpp @@ -168,7 +168,7 @@ HWTEST_F(WifiCountryCodePolicyTest, GetWifiCountryCodeByRegionTest, TestSize.Lev { WIFI_LOGI("GetWifiCountryCodeByRegionTest enter"); std::string code; - EXPECT_EQ(ErrCode::WIFI_OPT_SUCCESS, m_wifiCountryCodePolicy->GetWifiCountryCodeByRegion(code)); + EXPECT_EQ(ErrCode::WIFI_OPT_FAILED, m_wifiCountryCodePolicy->GetWifiCountryCodeByRegion(code)); } HWTEST_F(WifiCountryCodePolicyTest, GetWifiCountryCodeByDefaultZZTest, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index ac859f7fd..7127cfc42 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("wifi_scan_unittest") { "scan_interface_test.cpp", "scan_monitor_test.cpp", "scan_service_test.cpp", + "scan_state_machine_test.cpp", ] include_dirs = [ diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h index 4d8321105..e5cfd2e16 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/Mock/mock_wifi_settings.h @@ -49,13 +49,11 @@ public: virtual void SetThermalLevel(const int &level) = 0; virtual void SetAppRunningState(ScanMode appRunMode) = 0; virtual int SetWhetherToAllowNetworkSwitchover(bool bSwitch, int instId = 0) = 0; - virtual int GetValidChannels(ChannelsTable &channelsInfo) = 0; virtual int ClearScanInfoList() = 0; virtual void SetAppPackageName(const std::string &name) = 0; virtual int SetP2pBusinessType(const P2pBusinessType &type) = 0; virtual int GetHid2dUpperScene(Hid2dUpperScene &scene) = 0; virtual int GetP2pBusinessType(P2pBusinessType &type) = 0; - virtual int GetP2pInfo(WifiP2pLinkedInfo &LinkedInfo) = 0; }; class WifiSettings : public MockWifiSettings { @@ -84,15 +82,12 @@ public: MOCK_METHOD1(SetThermalLevel, void(const int &level)); MOCK_METHOD1(SetAppRunningState, void(ScanMode appRunMode)); MOCK_METHOD2(SetWhetherToAllowNetworkSwitchover, int(bool bSwitch, int)); - MOCK_METHOD1(GetValidChannels, int(ChannelsTable &channelsInfo)); MOCK_METHOD0(ClearScanInfoList, int()); MOCK_METHOD1(SetAppPackageName, void(const std::string &name)); MOCK_METHOD1(SetP2pBusinessType, int(const P2pBusinessType &type)); MOCK_METHOD1(GetHid2dUpperScene, int(Hid2dUpperScene &scene)); MOCK_METHOD1(GetP2pBusinessType, int(P2pBusinessType &type)); - MOCK_METHOD1(GetP2pInfo, int(WifiP2pLinkedInfo &LinkedInfo)); }; } // namespace Wifi } // namespace OHOS - #endif diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp index 51bf93184..2ecacc270 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_service_test.cpp @@ -53,7 +53,6 @@ public: { EXPECT_CALL(WifiSettings::GetInstance(), GetHid2dUpperScene(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetP2pBusinessType(_)).Times(AtLeast(0)); - EXPECT_CALL(WifiSettings::GetInstance(), GetP2pInfo(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSettings::GetInstance(), GetAppPackageName()).WillRepeatedly(Return("")); EXPECT_CALL(WifiStaHalInterface::GetInstance(), StopPnoScan()).Times(AtLeast(0)); pScanService = std::make_unique(); @@ -78,8 +77,6 @@ public: EXPECT_CALL(WifiSettings::GetInstance(), GetSupportHwPnoFlag(_)).Times(AtLeast(1)); EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), RegisterSupplicantEventCallback(_)).Times(AtLeast(1)); EXPECT_CALL(WifiStaHalInterface::GetInstance(), GetSupportFrequencies(_, _)).Times(AtLeast(1)); - EXPECT_CALL(WifiSettings::GetInstance(), GetValidChannels(_)) - .WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); EXPECT_CALL(WifiSettings::GetInstance(), GetScanControlInfo(_, _)).Times(AtLeast(1)); EXPECT_CALL(WifiManager::GetInstance(), DealScanOpenRes(_)).Times(AtLeast(0)); EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), UnRegisterSupplicantEventCallback()).Times(AtLeast(1)); @@ -97,8 +94,6 @@ public: ChannelsTable temp = { { BandType::BAND_2GHZ, band_2G_channel }, { BandType::BAND_5GHZ, band_5G_channel } }; EXPECT_CALL(WifiStaHalInterface::GetInstance(), GetSupportFrequencies(_, _)) .WillRepeatedly(Return(WIFI_IDL_OPT_FAILED)); - EXPECT_CALL(WifiSettings::GetInstance(), GetValidChannels(_)) - .WillOnce(DoAll(SetArgReferee<0>(temp), Return(0))); EXPECT_CALL(WifiSettings::GetInstance(), GetSupportHwPnoFlag(_)).Times(AtLeast(1)); EXPECT_CALL(WifiSupplicantHalInterface::GetInstance(), RegisterSupplicantEventCallback(_)).Times(AtLeast(1)); EXPECT_CALL(WifiSettings::GetInstance(), GetScanControlInfo(_, _)).Times(AtLeast(1));