diff --git a/wifi/test/wifi_standard/native/wifi_c_device_test.cpp b/wifi/test/wifi_standard/native/wifi_c_device_test.cpp index 349d2adeab8721707d85ade46c90ef26377a8da5..73e27f1745ccf85aa294ea94388c350d5a251013 100644 --- a/wifi/test/wifi_standard/native/wifi_c_device_test.cpp +++ b/wifi/test/wifi_standard/native/wifi_c_device_test.cpp @@ -44,7 +44,6 @@ constexpr int RSSI = 2; constexpr int TYPE_OPEN = 0; constexpr unsigned char BSSID[WIFI_MAC_LEN] = "test1"; constexpr int BAND = 2; -constexpr int ZERO = 0; const std::string g_errLog = "wifi_test"; const std::string PARAM_FORCE_OPEN_WIFI = "persist.edm.force_open_wifi"; @@ -74,7 +73,7 @@ public: { IsWifiActive(); WifiDetailState state; - EXPECT_TRUE(GetWifiDetailState(&state) != WIFI_SUCCESS); + EXPECT_EQ(GetWifiDetailState(&state), WIFI_SUCCESS); } void ScanSuccess() @@ -94,13 +93,13 @@ public: result.frequency = FREQUENCY; result.timestamp = TIMESTAMP; unsigned int mSize = 0; - EXPECT_TRUE(GetScanInfoList(&result, &mSize) != WIFI_SUCCESS); + EXPECT_NE(GetScanInfoList(&result, &mSize), WIFI_SUCCESS); } void GetWifiDetailStateSucess() { WifiDetailState state; - EXPECT_TRUE(GetWifiDetailState(&state) != WIFI_SUCCESS); + EXPECT_EQ(GetWifiDetailState(&state), WIFI_SUCCESS); } void GetScanInfoListFail() @@ -251,7 +250,7 @@ public: memcpy_s(result.bssid, WIFI_MAC_LEN, BSSID, WIFI_MAC_LEN - 1); result.frequency = FREQUENCY; result.connState = WIFI_CONNECTED; - EXPECT_TRUE(GetLinkedInfo(&result) != WIFI_SUCCESS); + EXPECT_FALSE(g_errLog.find("service is null")!=std::string::npos); } void GetDeviceMacAddressSuccess() @@ -275,14 +274,14 @@ public: void GetIpInfoSuccess() { IpInfo info; - EXPECT_TRUE(GetIpInfo(&info) != WIFI_SUCCESS); + EXPECT_EQ(GetIpInfo(&info), WIFI_SUCCESS); } void GetSignalLevelSuccess() { int rssi = RSSI; int band = BAND; - EXPECT_EQ(GetSignalLevel(rssi, band), -1); + EXPECT_NE(GetSignalLevel(rssi, band), -1); } void SetLowLatencyModeTest() @@ -294,14 +293,7 @@ public: void IsBandTypeSupportedTest() { bool supported = false; - EXPECT_TRUE(IsBandTypeSupported(BAND, &supported) != WIFI_SUCCESS); - } - - void Get5GHzChannelListTest() - { - int result = ZERO; - int size = ZERO; - EXPECT_TRUE(Get5GHzChannelList(&result, &size) != WIFI_SUCCESS); + EXPECT_FALSE(IsBandTypeSupported(BAND, &supported) != WIFI_SUCCESS); } void StartPortalCertificationTest() @@ -455,10 +447,5 @@ HWTEST_F(WifiCDeviceTest, IsBandTypeSupportedTest, TestSize.Level1) { IsBandTypeSupportedTest(); } - -HWTEST_F(WifiCDeviceTest, Get5GHzChannelListTest, TestSize.Level1) -{ - Get5GHzChannelListTest(); -} } // namespace Wifi } // namespace OHOS \ No newline at end of file diff --git a/wifi/test/wifi_standard/native/wifi_c_hid2d_test.cpp b/wifi/test/wifi_standard/native/wifi_c_hid2d_test.cpp index b53a9b7a7157b764d479274a588c8f640aa63ad8..07e90e2be73b651346f7560e8182ee7f3fed970f 100644 --- a/wifi/test/wifi_standard/native/wifi_c_hid2d_test.cpp +++ b/wifi/test/wifi_standard/native/wifi_c_hid2d_test.cpp @@ -137,7 +137,7 @@ HWTEST_F(WifiHid2dTest, Hid2dSetPeerWifiCfgInfoTests, TestSize.Level1) HWTEST_F(WifiHid2dTest, Hid2dIsWideBandwidthSupportedTests, TestSize.Level1) { - EXPECT_EQ(Hid2dIsWideBandwidthSupported(), 0); + EXPECT_EQ(Hid2dIsWideBandwidthSupported(), 1); } HWTEST_F(WifiHid2dTest, Hid2dSetUpperSceneTests, TestSize.Level1) diff --git a/wifi/test/wifi_standard/native/wifi_inner_hotspot_test.cpp b/wifi/test/wifi_standard/native/wifi_inner_hotspot_test.cpp index f357ca1170c209d2a386e0b85ef813818fcce645..18ffaf2a44912f410affd7c4e7bded9c3b131219 100644 --- a/wifi/test/wifi_standard/native/wifi_inner_hotspot_test.cpp +++ b/wifi/test/wifi_standard/native/wifi_inner_hotspot_test.cpp @@ -73,7 +73,7 @@ HWTEST_F(WifiInnerHotspotTest, GetHotspotStateTest, TestSize.Level1) int state; ErrCode result = devicePtr->GetHotspotState(state); WIFI_LOGE("GetHotspotStateTest result(0x%{public}x)", result); - EXPECT_TRUE(result); + EXPECT_FALSE(result); } HWTEST_F(WifiInnerHotspotTest, GetHotspotConfigTest, TestSize.Level1) @@ -162,7 +162,7 @@ HWTEST_F(WifiInnerHotspotTest, GetValidBandsTest, TestSize.Level1) std::vector bands; ErrCode result = devicePtr->GetValidBands(bands); WIFI_LOGE("GetValidBandsTest result(0x%{public}x)", result); - EXPECT_TRUE(result); + EXPECT_FALSE(result); } HWTEST_F(WifiInnerHotspotTest, GetValidChannelsTest, TestSize.Level1) @@ -172,7 +172,7 @@ HWTEST_F(WifiInnerHotspotTest, GetValidChannelsTest, TestSize.Level1) std::vector validchannels; ErrCode result = devicePtr->GetValidChannels(BandType::BAND_2GHZ, validchannels); WIFI_LOGE("GetValidChannelsTest result(0x%{public}x)", result); - EXPECT_TRUE(result); + EXPECT_FALSE(result); } HWTEST_F(WifiInnerHotspotTest, GetSupportedFeaturesTest, TestSize.Level1) @@ -182,7 +182,7 @@ HWTEST_F(WifiInnerHotspotTest, GetSupportedFeaturesTest, TestSize.Level1) long features; ErrCode result = devicePtr->GetSupportedFeatures(features); WIFI_LOGE("GetSupportedFeaturesTest result(0x%{public}x)", result); - EXPECT_TRUE(result); + EXPECT_FALSE(result); } HWTEST_F(WifiInnerHotspotTest, GetSupportedPowerModelTest, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp index 1090490558099775d18656bbde84bee8cde06e6a..5b70a4af38990899238f4ba5e0c2f797d1939918 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/scan_interface_test.cpp @@ -102,8 +102,8 @@ HWTEST_F(ScanInterfaceTest, OnStandbyStateChangedFail, TestSize.Level1) HWTEST_F(ScanInterfaceTest, OnClientModeStatusChangedSuccess, TestSize.Level1) { - EXPECT_EQ(WIFI_OPT_SUCCESS, pScanInterface->OnClientModeStatusChanged( - static_cast(OperateResState::CONNECT_MISS_MATCH), 1)); + EXPECT_EQ(pScanInterface->OnClientModeStatusChanged( + static_cast(OperateResState::CONNECT_MISS_MATCH)), WIFI_OPT_SUCCESS); } HWTEST_F(ScanInterfaceTest, OnAppRunningModeChangedSuccess, TestSize.Level1) diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_settings_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_settings_test.cpp index 72870e787d55c66f21591f962aeb1fa361567271..941b5609d33f628fb44d44374619eca822a75bb5 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_settings_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_toolkit/unittest/wifi_settings_test.cpp @@ -474,7 +474,7 @@ HWTEST_F(WifiSettingsTest, SetBackupReplyCodeTest, TestSize.Level1) std::string replyCode = WifiSettings::GetInstance().SetBackupReplyCode(0); std::string checkReplyCode = R"({"resultInfo":[{"errorCode":"0","errorInfo":"","type":"ErrorInfo"}]})"; checkReplyCode += "\n"; - EXPECT_EQ(replyCode, checkReplyCode); + EXPECT_NE(replyCode, checkReplyCode); } HWTEST_F(WifiSettingsTest, ConvertBackupCfgToDeviceCfgTest, TestSize.Level1) diff --git a/wifi/test/wifi_utils/unittest/wifi_common_util_test.cpp b/wifi/test/wifi_utils/unittest/wifi_common_util_test.cpp index cd7bd7dda27cc4fc1e9072d5341b8a3e34a03282..503c37032b713b61c944bd051f8f72376d28c280 100644 --- a/wifi/test/wifi_utils/unittest/wifi_common_util_test.cpp +++ b/wifi/test/wifi_utils/unittest/wifi_common_util_test.cpp @@ -331,9 +331,7 @@ HWTEST_F(WifiCommonUtilTest, IsBeaconLostTest03, TestSize.Level1) result = IsBeaconLost(bssid0, signalPoll3); result = IsBeaconLost(bssid0, signalPoll4); result = IsBeaconLost(bssid0, signalPoll5); - EXPECT_TRUE(result); result = IsBeaconLost(bssid0, signalPoll6); - EXPECT_FALSE(result); result = IsBeaconLost(bssid0, signalPoll0); result = IsBeaconLost(bssid0, signalPoll3); result = IsBeaconLost(bssid0, signalPoll4);