From 8c68d0d466e86cd1f0581d7d28e8722eb2e9d48e Mon Sep 17 00:00:00 2001 From: l00635678 Date: Mon, 8 Sep 2025 13:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8F=8A=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00635678 --- .../napi/netpolicy/src/net_conn_service.cpp | 37 +- .../netconnclient/src/net_conn_client.cpp | 22 - .../native/netconnclient/src/net_handle.cpp | 18 - .../src/proxy/net_conn_service_proxy.cpp | 105 -- interfaces/innerkits/include/inet_addr.h | 3 +- .../netconnclient/include/http_proxy.h | 3 +- .../include/net_all_capabilities.h | 3 +- .../netconnclient/include/net_conn_client.h | 24 - .../netconnclient/include/net_handle.h | 2 - .../include/net_interface_config.h | 3 +- .../netconnclient/include/net_link_info.h | 3 +- .../netconnclient/include/net_specifier.h | 3 +- .../netconnclient/include/net_supplier_info.h | 4 +- .../include/proxy/conn_ipc_interface_code.h | 3 - .../include/proxy/i_net_conn_service.h | 3 - .../include/proxy/net_conn_service_proxy.h | 3 - .../innerkits/netconnclient/include/route.h | 3 +- .../netconnclient/libnetconn_kits.map | 4 - .../include/net_dns_result_callback_stub.h | 4 +- .../include/netfirewall_callback_stub.h | 2 +- .../include/netsys_native_service_proxy.h | 3 +- .../include/netsys_net_dns_result_data.h | 8 +- .../include/netsys_traffic_callback_proxy.h | 4 +- .../include/netsys_traffic_callback_stub.h | 3 +- .../include/notify_callback_stub.h | 3 +- .../netmanagernative/include/uid_range.h | 2 +- .../include/net_quota_policy.h | 3 +- .../include/net_push_stats_info.h | 3 +- .../netstatsclient/include/net_stats_info.h | 3 +- .../include/net_stats_info_sequence.h | 3 +- .../include/net_stats_network.h | 3 +- sa_profile/1155.json | 2 +- services/common/include/broadcast_manager.h | 5 + services/common/include/dns_base_service.h | 33 - services/common/include/net_manager_center.h | 5 - services/common/src/broadcast_manager.cpp | 31 +- services/common/src/net_manager_center.cpp | 14 - services/netconnmanager/BUILD.gn | 24 +- .../netconnmanager/include/net_conn_service.h | 5 - .../netconnmanager/include/net_pac_manager.h | 2 - .../include/stub/net_conn_service_stub.h | 3 - .../netconnmanager/src/net_pac_manager.cpp | 5 +- services/netconnmanager/src/network.cpp | 8 +- .../src/stub/net_conn_service_stub.cpp | 88 -- .../include/netsys/wrapper/data_receiver.h | 3 +- .../include/netsys/wrapper/netlink_manager.h | 3 +- .../netsys/wrapper/netsys_event_message.h | 3 +- .../include/netsys/wrapper/wrapper_decoder.h | 3 +- .../netsys/wrapper/wrapper_distributor.h | 3 +- .../include/netsys/wrapper/wrapper_listener.h | 3 +- .../include/net_access_policy_dialog.h | 2 +- .../include/net_access_policy_dialog_impl.h | 2 +- .../include/net_policy_service.h | 3 +- .../include/i_netsys_controller_service.h | 9 - .../include/mock_netsys_native_client.h | 10 - .../include/netsys_controller.h | 9 - .../include/netsys_controller_service_impl.h | 9 - .../include/netsys_native_client.h | 9 - .../netsyscontroller/netsys_controller.map | 1 - .../src/mock_netsys_native_client.cpp | 7 - .../src/netsys_controller.cpp | 12 - .../src/netsys_controller_service_impl.cpp | 9 - .../src/netsys_native_client.cpp | 11 - .../common_mock_net_conn_service.h | 132 ++ .../common_mock_netmanager_permission.cpp} | 6 +- test/fuzztest/common_fuzzer/common_fuzzer.cpp | 22 - test/fuzztest/netconnclient_fuzzer/BUILD.gn | 2 +- .../net_conn_client_fuzzer.cpp | 84 -- test/fuzztest/netpolicyclient_fuzzer/BUILD.gn | 2 +- .../mock_net_policy_permission.cpp | 39 - test/fuzztest/netstatsclient_fuzzer/BUILD.gn | 2 +- .../mock_net_permission.cpp | 33 - .../net_common/net_manager_center_test.cpp | 30 - .../net_manager_center_test.cpp | 30 - .../mock/net_conn_service_stub_test.h | 15 - .../unittest/net_conn_manager_test/BUILD.gn | 2 + .../net_conn_manager_test.cpp | 406 +++--- .../net_conn_service_test.cpp | 52 +- .../net_conn_service_xtra_test.cpp | 4 +- .../net_conn_manager_test/network_test.cpp | 6 +- .../net_conn_client_test.cpp | 30 - .../net_conn_multi_test/net_handle_test.cpp | 44 - .../unittest/net_conn_service_test/BUILD.gn | 1 + .../net_conn_service_proxy_test.cpp | 44 - .../net_conn_service_stub_test.cpp | 769 +++------- .../netsys_controller_regional_test.cpp | 263 ---- .../netsys_native_client_regional_test.cpp | 211 --- .../netsys_controller_test.cpp | 131 -- .../netsys_native_service_proxy_test.cpp | 138 -- .../mock_netsys_native_client_test.cpp | 3 - .../mock_netsys_native_service_stub.h | 643 +++++++++ .../netsys_controller_service_impl_test.cpp | 14 +- .../netsys_controller_test.cpp | 8 +- .../netsys_native_client_test.cpp | 3 - .../netsys_native_service_stub_test.cpp | 1277 +++-------------- .../unittest/net_stats_manager_test/BUILD.gn | 1 + utils/bundle_utils/include/net_bundle.h | 4 +- utils/bundle_utils/include/net_bundle_impl.h | 4 +- 98 files changed, 1437 insertions(+), 3644 deletions(-) delete mode 100644 services/common/include/dns_base_service.h create mode 100644 test/commonduplicatedcode/common_mock_net_conn_service.h rename test/{fuzztest/netconnclient_fuzzer/mock_net_conn_permission.cpp => commonduplicatedcode/common_mock_netmanager_permission.cpp} (81%) delete mode 100644 test/fuzztest/netpolicyclient_fuzzer/mock_net_policy_permission.cpp delete mode 100644 test/fuzztest/netstatsclient_fuzzer/mock_net_permission.cpp delete mode 100644 test/netmanagernative/unittest/netsys_controller_test/netsys_controller_regional_test.cpp delete mode 100644 test/netmanagernative/unittest/netsys_controller_test/netsys_native_client_regional_test.cpp delete mode 100644 test/netmanagernative/unittest/netsys_distributed_test/netsys_controller_test.cpp delete mode 100644 test/netmanagernative/unittest/netsys_distributed_test/netsys_native_service_proxy_test.cpp create mode 100644 test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_service_stub.h diff --git a/frameworks/js/napi/netpolicy/src/net_conn_service.cpp b/frameworks/js/napi/netpolicy/src/net_conn_service.cpp index 59e141908..82794ec0d 100644 --- a/frameworks/js/napi/netpolicy/src/net_conn_service.cpp +++ b/frameworks/js/napi/netpolicy/src/net_conn_service.cpp @@ -1420,16 +1420,10 @@ std::shared_ptr NetConnService::CreateNetActivateRequest(const sptr std::weak_ptr timeoutCb = shared_from_this(); std::shared_ptr request = nullptr; #ifdef ENABLE_SET_APP_FROZENED - sptr callbakWrapper = new (std::nothrow) NetConnCallbackProxyWrapper(callback); - if (callbakWrapper == nullptr) { - NETMGR_LOG_E("NetConnCallbackProxyWrapper ptr is null"); - request = std::make_shared( - netSpecifier, callback, timeoutCb, timeoutMS, netConnEventHandler_, callingUid, registerType); - } else { - request = std::make_shared( + sptr callbakWrapper = sptr::MakeSptr(callback); + request = std::make_shared( netSpecifier, callbakWrapper, timeoutCb, timeoutMS, netConnEventHandler_, callingUid, registerType); - callbakWrapper->SetNetActivate(request); - } + callbakWrapper->SetNetActivate(request); #else request = std::make_shared( netSpecifier, callback, timeoutCb, timeoutMS, netConnEventHandler_, callingUid, registerType); @@ -2068,25 +2062,6 @@ int32_t NetConnService::GetDefaultNet(int32_t &netId) return NETMANAGER_SUCCESS; } -int32_t NetConnService::GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) -{ - return NetManagerCenter::GetInstance().GetAddressesByName(host, static_cast(netId), addrList); -} - -int32_t NetConnService::GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) -{ - std::vector addrList; - int ret = GetAddressesByName(host, netId, addrList); - if (ret == NETMANAGER_SUCCESS) { - if (!addrList.empty()) { - addr = addrList[0]; - return ret; - } - return NET_CONN_ERR_NO_ADDRESS; - } - return ret; -} - int32_t NetConnService::GetSpecificNet(NetBearType bearerType, std::list &netIdList) { if (bearerType < BEARER_CELLULAR || bearerType >= BEARER_DEFAULT) { @@ -2488,12 +2463,6 @@ int32_t NetConnService::IsDefaultNetMetered(bool &isMetered) return NETMANAGER_SUCCESS; } -int32_t NetConnService::BindSocket(int32_t socketFd, int32_t netId) -{ - NETMGR_LOG_D("Enter BindSocket."); - return NetsysController::GetInstance().BindSocket(socketFd, netId); -} - int32_t NetConnService::Dump(int32_t fd, const std::vector &args) { NETMGR_LOG_D("Start Dump, fd: %{public}d", fd); diff --git a/frameworks/native/netconnclient/src/net_conn_client.cpp b/frameworks/native/netconnclient/src/net_conn_client.cpp index 5bb27d911..09e832954 100755 --- a/frameworks/native/netconnclient/src/net_conn_client.cpp +++ b/frameworks/native/netconnclient/src/net_conn_client.cpp @@ -484,28 +484,6 @@ int32_t NetConnClient::GetNetCapabilities(const NetHandle &netHandle, NetAllCapa return proxy->GetNetCapabilities(netHandle.GetNetId(), netAllCap); } -int32_t NetConnClient::GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) -{ - sptr proxy = GetProxy(); - if (proxy == nullptr) { - NETMGR_LOG_E("proxy is nullptr"); - return NETMANAGER_ERR_GET_PROXY_FAIL; - } - - return proxy->GetAddressesByName(host, netId, addrList); -} - -int32_t NetConnClient::GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) -{ - sptr proxy = GetProxy(); - if (proxy == nullptr) { - NETMGR_LOG_E("proxy is nullptr"); - return NETMANAGER_ERR_GET_PROXY_FAIL; - } - - return proxy->GetAddressByName(host, netId, addr); -} - int32_t NetConnClient::GetIfaceNameIdentMaps(NetBearType bearerType, SafeMap &ifaceNameIdentMaps) { diff --git a/frameworks/native/netconnclient/src/net_handle.cpp b/frameworks/native/netconnclient/src/net_handle.cpp index fa7f511a3..bdcd91e1a 100644 --- a/frameworks/native/netconnclient/src/net_handle.cpp +++ b/frameworks/native/netconnclient/src/net_handle.cpp @@ -25,24 +25,6 @@ namespace OHOS { namespace NetManagerStandard { -int32_t NetHandle::GetAddressesByName(const std::string &host, std::vector &addrList) -{ - if (host.empty()) { - NETMGR_LOG_E("host is empty"); - return NETMANAGER_ERR_PARAMETER_ERROR; - } - return NetConnClient::GetInstance().GetAddressesByName(host, netId_, addrList); -} - -int32_t NetHandle::GetAddressByName(const std::string &host, INetAddr &addr) -{ - if (host.empty()) { - NETMGR_LOG_E("host is empty"); - return NETMANAGER_ERR_PARAMETER_ERROR; - } - return NetConnClient::GetInstance().GetAddressByName(host, netId_, addr); -} - int32_t NetHandle::BindSocket(int32_t socketFd) { if (socketFd < 0) { diff --git a/frameworks/native/netconnclient/src/proxy/net_conn_service_proxy.cpp b/frameworks/native/netconnclient/src/proxy/net_conn_service_proxy.cpp index c0f8eb9fb..491e0d4d1 100644 --- a/frameworks/native/netconnclient/src/proxy/net_conn_service_proxy.cpp +++ b/frameworks/native/netconnclient/src/proxy/net_conn_service_proxy.cpp @@ -1055,111 +1055,6 @@ int32_t NetConnServiceProxy::GetNetCapData(MessageParcel &reply, NetAllCapabilit return NETMANAGER_SUCCESS; } -int32_t NetConnServiceProxy::GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) -{ - MessageParcel data; - if (!WriteInterfaceToken(data)) { - NETMGR_LOG_E("WriteInterfaceToken failed"); - return NETMANAGER_ERR_WRITE_DESCRIPTOR_TOKEN_FAIL; - } - if (!data.WriteString(host)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - if (!data.WriteInt32(netId)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - - MessageParcel reply; - int32_t error = RemoteSendRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME), - data, reply); - if (error != NETMANAGER_SUCCESS) { - return error; - } - - int32_t ret = NETMANAGER_SUCCESS; - if (!reply.ReadInt32(ret)) { - return NETMANAGER_ERR_READ_REPLY_FAIL; - } - - if (ret == NETMANAGER_SUCCESS) { - uint32_t size; - if (!reply.ReadUint32(size)) { - return NETMANAGER_ERR_READ_REPLY_FAIL; - } - size = size > MAX_IFACE_NUM ? MAX_IFACE_NUM : size; - for (uint32_t i = 0; i < size; ++i) { - sptr netaddr_ptr = INetAddr::Unmarshalling(reply); - if (netaddr_ptr != nullptr) { - addrList.push_back(*netaddr_ptr); - } - } - } - return ret; -} - -int32_t NetConnServiceProxy::GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) -{ - MessageParcel data; - if (!WriteInterfaceToken(data)) { - NETMGR_LOG_E("WriteInterfaceToken failed"); - return NETMANAGER_ERR_WRITE_DESCRIPTOR_TOKEN_FAIL; - } - - if (!data.WriteString(host)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - if (!data.WriteInt32(netId)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - - MessageParcel reply; - int32_t error = RemoteSendRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME), - data, reply); - if (error != NETMANAGER_SUCCESS) { - return error; - } - int32_t ret = NETMANAGER_SUCCESS; - if (!reply.ReadInt32(ret)) { - return NETMANAGER_ERR_READ_REPLY_FAIL; - } - if (ret == NETMANAGER_SUCCESS) { - sptr netaddr_ptr = INetAddr::Unmarshalling(reply); - if (netaddr_ptr != nullptr) { - addr = *netaddr_ptr; - } - } - return ret; -} - -int32_t NetConnServiceProxy::BindSocket(int32_t socketFd, int32_t netId) -{ - MessageParcel data; - if (!WriteInterfaceToken(data)) { - NETMGR_LOG_E("WriteInterfaceToken failed"); - return NETMANAGER_ERR_WRITE_DESCRIPTOR_TOKEN_FAIL; - } - - if (!data.WriteInt32(socketFd)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - if (!data.WriteInt32(netId)) { - return NETMANAGER_ERR_WRITE_DATA_FAIL; - } - - MessageParcel reply; - int32_t error = RemoteSendRequest(static_cast(ConnInterfaceCode::CMD_NM_BIND_SOCKET), - data, reply); - if (error != NETMANAGER_SUCCESS) { - return error; - } - - int32_t ret = NETMANAGER_SUCCESS; - if (!reply.ReadInt32(ret)) { - return NETMANAGER_ERR_READ_REPLY_FAIL; - } - return ret; -} - int32_t NetConnServiceProxy::SetAirplaneMode(bool state) { MessageParcel data; diff --git a/interfaces/innerkits/include/inet_addr.h b/interfaces/innerkits/include/inet_addr.h index 0f4263709..eea1b488e 100644 --- a/interfaces/innerkits/include/inet_addr.h +++ b/interfaces/innerkits/include/inet_addr.h @@ -22,8 +22,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE INetAddr final : public Parcelable { +struct INetAddr final : public Parcelable { typedef enum { UNKNOWN = 0x00, IPV4 = 0x01, diff --git a/interfaces/innerkits/netconnclient/include/http_proxy.h b/interfaces/innerkits/netconnclient/include/http_proxy.h index 7a0fbce0f..cb0683866 100644 --- a/interfaces/innerkits/netconnclient/include/http_proxy.h +++ b/interfaces/innerkits/netconnclient/include/http_proxy.h @@ -27,8 +27,7 @@ namespace OHOS { namespace NetManagerStandard { class NetConnService; -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -class NET_SYMBOL_VISIBLE HttpProxy final : public Parcelable { +class HttpProxy final : public Parcelable { public: friend class NetConnService; HttpProxy(); diff --git a/interfaces/innerkits/netconnclient/include/net_all_capabilities.h b/interfaces/innerkits/netconnclient/include/net_all_capabilities.h index a94989ab0..4587b881b 100644 --- a/interfaces/innerkits/netconnclient/include/net_all_capabilities.h +++ b/interfaces/innerkits/netconnclient/include/net_all_capabilities.h @@ -60,8 +60,7 @@ enum NetBearType { BEARER_DEFAULT // The maximum value of NetBearType. Do not exceed the limit. No actual meaning. }; -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetAllCapabilities final : public Parcelable { +struct NetAllCapabilities final : public Parcelable { uint32_t linkUpBandwidthKbps_ = 0; uint32_t linkDownBandwidthKbps_ = 0; std::set netCaps_; diff --git a/interfaces/innerkits/netconnclient/include/net_conn_client.h b/interfaces/innerkits/netconnclient/include/net_conn_client.h index 1d2b569f4..585056753 100644 --- a/interfaces/innerkits/netconnclient/include/net_conn_client.h +++ b/interfaces/innerkits/netconnclient/include/net_conn_client.h @@ -266,30 +266,6 @@ public: */ int32_t GetNetCapabilities(const NetHandle &netHandle, NetAllCapabilities &netAllCap); - /** - * The interface is to get addresses by network name - * - * @param host domain name - * @param netId network id - * @param addrList list of network addresses - * @return Returns 0 success. Otherwise fail. - * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @systemapi Hide this for inner system use. - */ - int32_t GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList); - - /** - * The interface is to get address by network name - * - * @param host domain name - * @param netId network - * @param addr network address - * @return Returns 0 success. Otherwise fail. - * @permission ohos.permission.CONNECTIVITY_INTERNAL - * @systemapi Hide this for inner system use. - */ - int32_t GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr); - /** * The interface is to get all iface and ident maps * diff --git a/interfaces/innerkits/netconnclient/include/net_handle.h b/interfaces/innerkits/netconnclient/include/net_handle.h index d0c23e4fc..89c2a4aa0 100644 --- a/interfaces/innerkits/netconnclient/include/net_handle.h +++ b/interfaces/innerkits/netconnclient/include/net_handle.h @@ -33,8 +33,6 @@ public: ~NetHandle() override = default; int32_t BindSocket(int32_t socketFd); - int32_t GetAddressesByName(const std::string &host, std::vector &addrList); - int32_t GetAddressByName(const std::string &host, INetAddr &addr); void SetNetId(int32_t netId) { diff --git a/interfaces/innerkits/netconnclient/include/net_interface_config.h b/interfaces/innerkits/netconnclient/include/net_interface_config.h index 80e4a7ca2..43a5b165d 100644 --- a/interfaces/innerkits/netconnclient/include/net_interface_config.h +++ b/interfaces/innerkits/netconnclient/include/net_interface_config.h @@ -23,8 +23,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetInterfaceConfiguration : public Parcelable { +struct NetInterfaceConfiguration : public Parcelable { std::string ifName_; std::string hwAddr_; std::string ipv4Addr_; diff --git a/interfaces/innerkits/netconnclient/include/net_link_info.h b/interfaces/innerkits/netconnclient/include/net_link_info.h index b7efc8890..9f0387c2c 100644 --- a/interfaces/innerkits/netconnclient/include/net_link_info.h +++ b/interfaces/innerkits/netconnclient/include/net_link_info.h @@ -25,8 +25,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetLinkInfo final : public Parcelable { +struct NetLinkInfo final : public Parcelable { std::string ifaceName_; std::string domain_; std::list netAddrList_; diff --git a/interfaces/innerkits/netconnclient/include/net_specifier.h b/interfaces/innerkits/netconnclient/include/net_specifier.h index 37a2a6e21..d457faca5 100644 --- a/interfaces/innerkits/netconnclient/include/net_specifier.h +++ b/interfaces/innerkits/netconnclient/include/net_specifier.h @@ -24,8 +24,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetSpecifier final : public Parcelable { +struct NetSpecifier final : public Parcelable { std::string ident_; NetAllCapabilities netCapabilities_; diff --git a/interfaces/innerkits/netconnclient/include/net_supplier_info.h b/interfaces/innerkits/netconnclient/include/net_supplier_info.h index 9590c40fe..a73fe55c3 100644 --- a/interfaces/innerkits/netconnclient/include/net_supplier_info.h +++ b/interfaces/innerkits/netconnclient/include/net_supplier_info.h @@ -30,8 +30,8 @@ enum NetConnState { NET_CONN_STATE_DISCONNECTING = 4, NET_CONN_STATE_DISCONNECTED = 5, }; -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetSupplierInfo final : public Parcelable { + +struct NetSupplierInfo final : public Parcelable { bool isAvailable_ = false; bool isRoaming_ = false; int8_t strength_ = 0x00; diff --git a/interfaces/innerkits/netconnclient/include/proxy/conn_ipc_interface_code.h b/interfaces/innerkits/netconnclient/include/proxy/conn_ipc_interface_code.h index 2d3f7b72a..8d70fdc3f 100644 --- a/interfaces/innerkits/netconnclient/include/proxy/conn_ipc_interface_code.h +++ b/interfaces/innerkits/netconnclient/include/proxy/conn_ipc_interface_code.h @@ -36,14 +36,11 @@ enum class ConnInterfaceCode { CMD_NM_NET_DETECTION, CMD_NM_GET_IFACE_NAMES, CMD_NM_GET_IFACENAME_BY_TYPE, - CMD_NM_GET_ADDRESSES_BY_NAME, - CMD_NM_GET_ADDRESS_BY_NAME, CMD_NM_GET_SPECIFIC_NET, CMD_NM_GET_ALL_NETS, CMD_NM_GET_SPECIFIC_UID_NET, CMD_NM_GET_CONNECTION_PROPERTIES, CMD_NM_GET_NET_CAPABILITIES, - CMD_NM_BIND_SOCKET, CMD_NM_REGISTER_NET_DETECTION_RET_CALLBACK, CMD_NM_UNREGISTER_NET_DETECTION_RET_CALLBACK, CMD_NM_UPDATE_NET_STATE_FOR_TEST, diff --git a/interfaces/innerkits/netconnclient/include/proxy/i_net_conn_service.h b/interfaces/innerkits/netconnclient/include/proxy/i_net_conn_service.h index b4428a35b..657ffda16 100644 --- a/interfaces/innerkits/netconnclient/include/proxy/i_net_conn_service.h +++ b/interfaces/innerkits/netconnclient/include/proxy/i_net_conn_service.h @@ -67,8 +67,6 @@ public: virtual int32_t NetDetection(int32_t netId) = 0; virtual int32_t GetDefaultNet(int32_t &netId) = 0; virtual int32_t HasDefaultNet(bool &flag) = 0; - virtual int32_t GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) = 0; - virtual int32_t GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) = 0; virtual int32_t GetSpecificNet(NetBearType bearerType, std::list &netIdList) = 0; virtual int32_t GetSpecificNetByIdent(NetBearType bearerType, const std::string &ident, std::list &netIdList) = 0; @@ -76,7 +74,6 @@ public: virtual int32_t GetSpecificUidNet(int32_t uid, int32_t &netId) = 0; virtual int32_t GetConnectionProperties(int32_t netId, NetLinkInfo &info) = 0; virtual int32_t GetNetCapabilities(int32_t netId, NetAllCapabilities &netAllCap) = 0; - virtual int32_t BindSocket(int32_t socketFd, int32_t netId) = 0; virtual int32_t SetAirplaneMode(bool state) = 0; virtual int32_t IsDefaultNetMetered(bool &isMetered) = 0; virtual int32_t SetGlobalHttpProxy(const HttpProxy &httpProxy) = 0; diff --git a/interfaces/innerkits/netconnclient/include/proxy/net_conn_service_proxy.h b/interfaces/innerkits/netconnclient/include/proxy/net_conn_service_proxy.h index a07087645..2b02710c7 100644 --- a/interfaces/innerkits/netconnclient/include/proxy/net_conn_service_proxy.h +++ b/interfaces/innerkits/netconnclient/include/proxy/net_conn_service_proxy.h @@ -57,8 +57,6 @@ public: int32_t RegisterNetDetectionCallback(int32_t netId, const sptr &callback) override; int32_t UnRegisterNetDetectionCallback(int32_t netId, const sptr &callback) override; int32_t NetDetection(int32_t netId) override; - int32_t GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) override; - int32_t GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) override; int32_t GetSpecificNet(NetBearType bearerType, std::list &netIdList) override; int32_t GetSpecificNetByIdent(NetBearType bearerType, const std::string &ident, std::list &netIdList) override; @@ -66,7 +64,6 @@ public: int32_t GetSpecificUidNet(int32_t uid, int32_t &netId) override; int32_t GetConnectionProperties(int32_t netId, NetLinkInfo &info) override; int32_t GetNetCapabilities(int32_t netId, NetAllCapabilities &netAllCap) override; - int32_t BindSocket(int32_t socketFd, int32_t netId) override; int32_t SetAirplaneMode(bool state) override; int32_t IsDefaultNetMetered(bool &isMetered) override; int32_t SetGlobalHttpProxy(const HttpProxy &httpProxy) override; diff --git a/interfaces/innerkits/netconnclient/include/route.h b/interfaces/innerkits/netconnclient/include/route.h index 86a05ece8..6f231dad7 100644 --- a/interfaces/innerkits/netconnclient/include/route.h +++ b/interfaces/innerkits/netconnclient/include/route.h @@ -33,8 +33,7 @@ enum { RTN_THROW = 9 }; -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE Route final : public Parcelable { +struct Route final : public Parcelable { std::string iface_; INetAddr destination_; INetAddr gateway_; diff --git a/interfaces/innerkits/netconnclient/libnetconn_kits.map b/interfaces/innerkits/netconnclient/libnetconn_kits.map index 92dca7b9c..b31174774 100644 --- a/interfaces/innerkits/netconnclient/libnetconn_kits.map +++ b/interfaces/innerkits/netconnclient/libnetconn_kits.map @@ -55,8 +55,6 @@ "OHOS::NetManagerStandard::NetConnClient::GetSlotType(std::__h::basic_string, std::__h::allocator>&)"; "OHOS::NetManagerStandard::NetConnClient::GetDefaultNet(OHOS::NetManagerStandard::NetHandle&)"; "OHOS::NetManagerStandard::NetConnClient::GetNetCapabilities(OHOS::NetManagerStandard::NetHandle const&, OHOS::NetManagerStandard::NetAllCapabilities&)"; - "OHOS::NetManagerStandard::NetConnClient::GetAddressesByName(std::__h::basic_string, std::__h::allocator> const&, int, std::__h::vector>&)"; - "OHOS::NetManagerStandard::NetConnClient::GetAddressByName(std::__h::basic_string, std::__h::allocator> const&, int, OHOS::NetManagerStandard::INetAddr&)"; "OHOS::NetManagerStandard::NetConnClient::BindSocket(int, int)"; "OHOS::NetManagerStandard::NetConnClient::OnRemoteDied(OHOS::wptr const&)"; "OHOS::NetManagerStandard::NetConnClient::NetConnClient()"; @@ -166,8 +164,6 @@ "non-virtual thunk to OHOS::NetManagerStandard::NetDetectionCallbackStub::OnNetDetectionResultChanged(OHOS::NetManagerStandard::NetDetectionResultCode, std::__h::basic_string, std::__h::allocator> const&)"; "non-virtual thunk to OHOS::NetManagerStandard::NetDetectionCallbackStub::~NetDetectionCallbackStub()"; "virtual thunk to OHOS::NetManagerStandard::NetDetectionCallbackStub::~NetDetectionCallbackStub()"; - "OHOS::NetManagerStandard::NetHandle::GetAddressesByName(std::__h::basic_string, std::__h::allocator> const&, std::__h::vector>&)"; - "OHOS::NetManagerStandard::NetHandle::GetAddressByName(std::__h::basic_string, std::__h::allocator> const&, OHOS::NetManagerStandard::INetAddr&)"; "OHOS::NetManagerStandard::NetSupplierCallbackStub::RegisterSupplierCallbackImpl(OHOS::sptr const&)"; "OHOS::NetManagerStandard::HttpProxy::GetHost() const"; "OHOS::NetManagerStandard::HttpProxy::GetPort() const"; diff --git a/interfaces/innerkits/netmanagernative/include/net_dns_result_callback_stub.h b/interfaces/innerkits/netmanagernative/include/net_dns_result_callback_stub.h index a62b2285a..3e96ee35b 100644 --- a/interfaces/innerkits/netmanagernative/include/net_dns_result_callback_stub.h +++ b/interfaces/innerkits/netmanagernative/include/net_dns_result_callback_stub.h @@ -22,11 +22,9 @@ #include "iremote_stub.h" #include "netsys_net_dns_result_data.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) - namespace OHOS { namespace NetsysNative { -class NET_SYMBOL_VISIBLE NetDnsResultCallbackStub : public IRemoteStub { +class NetDnsResultCallbackStub : public IRemoteStub { public: NetDnsResultCallbackStub(); virtual ~NetDnsResultCallbackStub() = default; diff --git a/interfaces/innerkits/netmanagernative/include/netfirewall_callback_stub.h b/interfaces/innerkits/netmanagernative/include/netfirewall_callback_stub.h index fe9f5d09d..0745fddea 100755 --- a/interfaces/innerkits/netmanagernative/include/netfirewall_callback_stub.h +++ b/interfaces/innerkits/netmanagernative/include/netfirewall_callback_stub.h @@ -22,7 +22,7 @@ namespace OHOS { namespace NetsysNative { -class __attribute__((visibility("default"))) NetFirewallCallbackStub : public IRemoteStub { +class NetFirewallCallbackStub : public IRemoteStub { public: NetFirewallCallbackStub(); virtual ~NetFirewallCallbackStub() = default; diff --git a/interfaces/innerkits/netmanagernative/include/netsys_native_service_proxy.h b/interfaces/innerkits/netmanagernative/include/netsys_native_service_proxy.h index d03c0add3..970ee3078 100644 --- a/interfaces/innerkits/netmanagernative/include/netsys_native_service_proxy.h +++ b/interfaces/innerkits/netmanagernative/include/netsys_native_service_proxy.h @@ -19,10 +19,9 @@ #include "i_netsys_service.h" #include "iremote_proxy.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace NetsysNative { -class NET_SYMBOL_VISIBLE NetsysNativeServiceProxy : public IRemoteProxy { +class NetsysNativeServiceProxy : public IRemoteProxy { public: explicit NetsysNativeServiceProxy(const sptr &impl) : IRemoteProxy(impl) {} ~NetsysNativeServiceProxy() override {} diff --git a/interfaces/innerkits/netmanagernative/include/netsys_net_dns_result_data.h b/interfaces/innerkits/netmanagernative/include/netsys_net_dns_result_data.h index 59c07e11e..d6aa20baa 100644 --- a/interfaces/innerkits/netmanagernative/include/netsys_net_dns_result_data.h +++ b/interfaces/innerkits/netmanagernative/include/netsys_net_dns_result_data.h @@ -33,7 +33,7 @@ enum NetDnsResultAddrType : uint32_t { }; #define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetDnsResultAddrInfo final : public Parcelable { +struct NetDnsResultAddrInfo final : public Parcelable { uint32_t type_; std::string addr_; @@ -41,7 +41,7 @@ struct NET_SYMBOL_VISIBLE NetDnsResultAddrInfo final : public Parcelable { static bool Unmarshalling(Parcel &parcel, NetDnsResultAddrInfo &addrinfo); }; -struct NET_SYMBOL_VISIBLE NetDnsResultReport final : public Parcelable { +struct NetDnsResultReport final : public Parcelable { uint32_t netid_; uint32_t uid_; uint32_t pid_; @@ -54,7 +54,7 @@ struct NET_SYMBOL_VISIBLE NetDnsResultReport final : public Parcelable { static bool Unmarshalling(Parcel &parcel, NetDnsResultReport &result); }; -struct NET_SYMBOL_VISIBLE NetDnsQueryResultAddrInfo final : public Parcelable { +struct NetDnsQueryResultAddrInfo final : public Parcelable { uint16_t type_; std::string addr_; @@ -62,7 +62,7 @@ struct NET_SYMBOL_VISIBLE NetDnsQueryResultAddrInfo final : public Parcelable { static bool Unmarshalling(Parcel &parcel, NetDnsQueryResultAddrInfo &addrinfo); }; -struct NET_SYMBOL_VISIBLE NetDnsQueryResultReport final : public Parcelable { +struct NetDnsQueryResultReport final : public Parcelable { uint32_t uid_; uint32_t pid_; std::string srcAddr_; diff --git a/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_proxy.h b/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_proxy.h index a7aedd7ef..af1c2c4e5 100644 --- a/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_proxy.h +++ b/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_proxy.h @@ -17,11 +17,9 @@ #include "iremote_proxy.h" #include "i_netsys_traffic_callback.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) - namespace OHOS { namespace NetsysNative { -class __attribute__((visibility("default"))) NetsysTrafficCallbackProxy : public IRemoteProxy { +class NetsysTrafficCallbackProxy : public IRemoteProxy { public: explicit NetsysTrafficCallbackProxy(const sptr &impl); virtual ~NetsysTrafficCallbackProxy() = default; diff --git a/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_stub.h b/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_stub.h index 4acd6470a..2701634ae 100644 --- a/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_stub.h +++ b/interfaces/innerkits/netmanagernative/include/netsys_traffic_callback_stub.h @@ -22,10 +22,9 @@ #include "iremote_stub.h" #include "netsys_net_dns_result_data.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace NetsysNative { -class NET_SYMBOL_VISIBLE NetsysTrafficCallbackStub : public IRemoteStub { +class NetsysTrafficCallbackStub : public IRemoteStub { public: NetsysTrafficCallbackStub(); virtual ~NetsysTrafficCallbackStub() = default; diff --git a/interfaces/innerkits/netmanagernative/include/notify_callback_stub.h b/interfaces/innerkits/netmanagernative/include/notify_callback_stub.h index b6e359f78..df7d81100 100644 --- a/interfaces/innerkits/netmanagernative/include/notify_callback_stub.h +++ b/interfaces/innerkits/netmanagernative/include/notify_callback_stub.h @@ -20,10 +20,9 @@ #include "i_notify_callback.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace NetsysNative { -class NET_SYMBOL_VISIBLE NotifyCallbackStub : public IRemoteStub { +class NotifyCallbackStub : public IRemoteStub { public: NotifyCallbackStub(); virtual ~NotifyCallbackStub(); diff --git a/interfaces/innerkits/netmanagernative/include/uid_range.h b/interfaces/innerkits/netmanagernative/include/uid_range.h index e06c8c1cc..4f6c8e4db 100644 --- a/interfaces/innerkits/netmanagernative/include/uid_range.h +++ b/interfaces/innerkits/netmanagernative/include/uid_range.h @@ -22,7 +22,7 @@ namespace OHOS { namespace NetManagerStandard { -struct __attribute__ ((visibility("default"))) UidRange : public Parcelable { +struct UidRange : public Parcelable { UidRange(int32_t begin, int32_t end); UidRange() = default; virtual ~UidRange(){}; diff --git a/interfaces/innerkits/netpolicyclient/include/net_quota_policy.h b/interfaces/innerkits/netpolicyclient/include/net_quota_policy.h index c68cc453a..f9b716d31 100644 --- a/interfaces/innerkits/netpolicyclient/include/net_quota_policy.h +++ b/interfaces/innerkits/netpolicyclient/include/net_quota_policy.h @@ -35,8 +35,7 @@ static constexpr int32_t YEAR_MAX = 366; static constexpr int32_t PERIOD_DURATION_SIZE = 2; static constexpr int32_t QUOTA_POLICY_MAX_SIZE = 100; -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetQuotaPolicy final : public Parcelable { +struct NetQuotaPolicy final : public Parcelable { struct NetLogotype { /* See {@link NetBearType} */ int32_t netType = BEARER_DEFAULT; diff --git a/interfaces/innerkits/netstatsclient/include/net_push_stats_info.h b/interfaces/innerkits/netstatsclient/include/net_push_stats_info.h index b9424bddf..cdf3512bb 100644 --- a/interfaces/innerkits/netstatsclient/include/net_push_stats_info.h +++ b/interfaces/innerkits/netstatsclient/include/net_push_stats_info.h @@ -19,8 +19,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE_PUSH __attribute__((visibility("default"))) -struct NET_SYMBOL_VISIBLE_PUSH PushStatsInfo final : public Parcelable { +struct PushStatsInfo final : public Parcelable { uint32_t uid_ = 0; std::string iface_ = "rmnet_push"; uint32_t simId_ = 0; diff --git a/interfaces/innerkits/netstatsclient/include/net_stats_info.h b/interfaces/innerkits/netstatsclient/include/net_stats_info.h index 22ef08616..09c0d943c 100644 --- a/interfaces/innerkits/netstatsclient/include/net_stats_info.h +++ b/interfaces/innerkits/netstatsclient/include/net_stats_info.h @@ -20,8 +20,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE NetStatsInfo final : public Parcelable { +struct NetStatsInfo final : public Parcelable { uint32_t uid_ = 0; std::string iface_; std::string ident_; diff --git a/interfaces/innerkits/netstatsclient/include/net_stats_info_sequence.h b/interfaces/innerkits/netstatsclient/include/net_stats_info_sequence.h index 81893937b..7c0815d49 100644 --- a/interfaces/innerkits/netstatsclient/include/net_stats_info_sequence.h +++ b/interfaces/innerkits/netstatsclient/include/net_stats_info_sequence.h @@ -21,8 +21,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE_SEQ __attribute__ ((visibility("default"))) -struct NET_SYMBOL_VISIBLE_SEQ NetStatsInfoSequence final : public Parcelable { +struct NetStatsInfoSequence final : public Parcelable { uint64_t startTime_ = 0; uint64_t endTime_ = 0; NetStatsInfo info_; diff --git a/interfaces/innerkits/netstatsclient/include/net_stats_network.h b/interfaces/innerkits/netstatsclient/include/net_stats_network.h index a1ae566f8..49c9b8719 100644 --- a/interfaces/innerkits/netstatsclient/include/net_stats_network.h +++ b/interfaces/innerkits/netstatsclient/include/net_stats_network.h @@ -20,8 +20,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE_NETWORK __attribute__((visibility("default"))) -struct NET_SYMBOL_VISIBLE_NETWORK NetStatsNetwork final : public Parcelable { +struct NetStatsNetwork final : public Parcelable { uint32_t type_ = 0; uint64_t startTime_ = 0; uint64_t endTime_ = 0; diff --git a/sa_profile/1155.json b/sa_profile/1155.json index 5a5d6c45b..f77bc3123 100644 --- a/sa_profile/1155.json +++ b/sa_profile/1155.json @@ -4,7 +4,7 @@ { "name": 1155, "libpath": "libnet_vpn_manager.z.so", - "run-on-create": true, + "run-on-create": false, "distributed": false, "dump_level": 1 } diff --git a/services/common/include/broadcast_manager.h b/services/common/include/broadcast_manager.h index 7543cddcf..01bf7dd85 100755 --- a/services/common/include/broadcast_manager.h +++ b/services/common/include/broadcast_manager.h @@ -20,6 +20,10 @@ #include namespace OHOS { +namespace AAFwk { +class Want; +} + namespace NetManagerStandard { struct BroadcastInfo { std::string action; @@ -51,6 +55,7 @@ public: bool SendBroadcast(const BroadcastInfo &info, const std::map ¶m); private: + bool DoSendBroadcast(const BroadcastInfo &info, AAFwk::Want &want); template bool SendBroadcastEx(const BroadcastInfo &info, const std::map ¶m); }; diff --git a/services/common/include/dns_base_service.h b/services/common/include/dns_base_service.h deleted file mode 100644 index 16ced5163..000000000 --- a/services/common/include/dns_base_service.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2021-2022 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 DNS_BASE_SERVICE_H -#define DNS_BASE_SERVICE_H - -#include - -#include "refbase.h" - -#include "inet_addr.h" - -namespace OHOS { -namespace NetManagerStandard { -class DnsBaseService : public virtual RefBase { -public: - virtual int32_t GetAddressesByName(const std::string &hostName, int32_t netId, - std::vector &addrInfo) = 0; -}; -} // namespace NetManagerStandard -} // namespace OHOS -#endif // DNS_BASE_SERVICE_H \ No newline at end of file diff --git a/services/common/include/net_manager_center.h b/services/common/include/net_manager_center.h index fc4e98529..41ce8420f 100644 --- a/services/common/include/net_manager_center.h +++ b/services/common/include/net_manager_center.h @@ -18,7 +18,6 @@ #include -#include "dns_base_service.h" #include "net_all_capabilities.h" #include "net_conn_base_service.h" #include "net_ethernet_base_service.h" @@ -51,9 +50,6 @@ public: int32_t ResetEthernetFactory(); void RegisterEthernetService(const sptr &service); - int32_t GetAddressesByName(const std::string &hostName, int32_t netId, std::vector &addrInfo); - void RegisterDnsService(const sptr &service); - int32_t RestrictBackgroundChanged(bool isRestrictBackground); bool IsUidNetAccess(uint32_t uid, bool metered); bool IsUidNetAllowed(uint32_t uid, bool metered); @@ -67,7 +63,6 @@ private: sptr statsService_ = nullptr; sptr policyService_ = nullptr; sptr ethernetService_ = nullptr; - sptr dnsService_ = nullptr; }; } // namespace NetManagerStandard } // namespace OHOS diff --git a/services/common/src/broadcast_manager.cpp b/services/common/src/broadcast_manager.cpp index 19a7f6618..b3947af65 100644 --- a/services/common/src/broadcast_manager.cpp +++ b/services/common/src/broadcast_manager.cpp @@ -46,20 +46,8 @@ bool BroadcastManager::SendBroadcast(const BroadcastInfo &info, const std::map -bool BroadcastManager::SendBroadcastEx(const BroadcastInfo &info, const std::map ¶m) +bool BroadcastManager::DoSendBroadcast(const BroadcastInfo &info, AAFwk::Want &want) { - if (info.action.empty()) { - NETMGR_LOG_E("The parameter of action is empty"); - return false; - } - NETMGR_LOG_I("Net Send broadcast: %{public}s", info.action.c_str()); - AAFwk::Want want; - want.SetAction(info.action); - for (const auto &x : param) { - want.SetParam(x.first, x.second); - } - EventFwk::CommonEventData eventData; eventData.SetWant(want); eventData.SetCode(info.code); @@ -83,5 +71,22 @@ bool BroadcastManager::SendBroadcastEx(const BroadcastInfo &info, const std::map return publishResult; } + +template +bool BroadcastManager::SendBroadcastEx(const BroadcastInfo &info, const std::map ¶m) +{ + if (info.action.empty()) { + NETMGR_LOG_E("The parameter of action is empty"); + return false; + } + NETMGR_LOG_I("Net Send broadcast: %{public}s", info.action.c_str()); + AAFwk::Want want; + want.SetAction(info.action); + for (const auto &x : param) { + want.SetParam(x.first, x.second); + } + + return DoSendBroadcast(info, want); +} } // namespace NetManagerStandard } // namespace OHOS diff --git a/services/common/src/net_manager_center.cpp b/services/common/src/net_manager_center.cpp index 7fbc80ded..4292ad405 100644 --- a/services/common/src/net_manager_center.cpp +++ b/services/common/src/net_manager_center.cpp @@ -144,20 +144,6 @@ void NetManagerCenter::RegisterEthernetService(const sptr &addrInfo) -{ - if (dnsService_ == nullptr) { - return NETMANAGER_ERROR; - } - return dnsService_->GetAddressesByName(hostName, netId, addrInfo); -} - -void NetManagerCenter::RegisterDnsService(const sptr &service) -{ - dnsService_ = service; -} - int32_t NetManagerCenter::RestrictBackgroundChanged(bool isRestrictBackground) { if (connService_ == nullptr) { diff --git a/services/netconnmanager/BUILD.gn b/services/netconnmanager/BUILD.gn index 4f6db7ce6..f1f2e81a2 100644 --- a/services/netconnmanager/BUILD.gn +++ b/services/netconnmanager/BUILD.gn @@ -124,11 +124,13 @@ ohos_shared_library("net_conn_manager") { ] if(netmanager_base_enable_pac_proxy){ - defines += [ "NETMANAGER_ENABLE_PAC_PROXY" ] - external_deps += [ "jerryscript:jerryscript_shared_not_lite" ] - sources += [ "src/pac_functions.cpp" ] - sources += [ "src/net_pac_local_proxy_server.cpp" ] - sources += [ "src/net_pac_manager.cpp" ] + defines += [ "NETMANAGER_ENABLE_PAC_PROXY" ] + external_deps += [ "jerryscript:jerryscript_shared_not_lite" ] + sources += [ + "src/net_pac_local_proxy_server.cpp", + "src/net_pac_manager.cpp", + "src/pac_functions.cpp", + ] } if (enable_netmgr_debug) { @@ -237,11 +239,13 @@ ohos_static_library("net_conn_manager_static") { ] if(netmanager_base_enable_pac_proxy){ - defines += [ "NETMANAGER_ENABLE_PAC_PROXY" ] - external_deps += [ "jerryscript:jerryscript_shared_not_lite" ] - sources += [ "src/pac_functions.cpp" ] - sources += [ "src/net_pac_local_proxy_server.cpp" ] - sources += [ "src/net_pac_manager.cpp" ] + defines += [ "NETMANAGER_ENABLE_PAC_PROXY" ] + external_deps += [ "jerryscript:jerryscript_shared_not_lite" ] + sources += [ + "src/net_pac_local_proxy_server.cpp", + "src/net_pac_manager.cpp", + "src/pac_functions.cpp", + ] } if (enable_netmgr_debug) { diff --git a/services/netconnmanager/include/net_conn_service.h b/services/netconnmanager/include/net_conn_service.h index 934a410f3..f6aac6030 100644 --- a/services/netconnmanager/include/net_conn_service.h +++ b/services/netconnmanager/include/net_conn_service.h @@ -284,8 +284,6 @@ public: int32_t NetDetection(int32_t netId) override; int32_t GetDefaultNet(int32_t &netId) override; int32_t HasDefaultNet(bool &flag) override; - int32_t GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) override; - int32_t GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) override; int32_t GetSpecificNet(NetBearType bearerType, std::list &netIdList) override; int32_t GetSpecificNetByIdent(NetBearType bearerType, const std::string &ident, std::list &netIdList) override; @@ -294,7 +292,6 @@ public: int32_t GetSpecificUidNet(int32_t uid, int32_t &netId) override; int32_t GetConnectionProperties(int32_t netId, NetLinkInfo &info) override; int32_t GetNetCapabilities(int32_t netId, NetAllCapabilities &netAllCap) override; - int32_t BindSocket(int32_t socketFd, int32_t netId) override; void HandleDetectionResult(uint32_t supplierId, NetDetectionStatus netState); int32_t RestrictBackgroundChanged(bool isRestrictBackground); /** @@ -654,8 +651,6 @@ private: static constexpr uint32_t HTTP_PROXY_ACTIVE_PERIOD_IN_SLEEP_S = 240; std::map> preAirplaneCallbacks_; std::mutex preAirplaneCbsMutex_; - std::mutex pacFileUrlCbsMutex_; - std::shared_ptr subscriber_ = nullptr; bool hasSARemoved_ = false; std::atomic isInSleep_ = false; diff --git a/services/netconnmanager/include/net_pac_manager.h b/services/netconnmanager/include/net_pac_manager.h index 1140e04ab..dcd20de26 100644 --- a/services/netconnmanager/include/net_pac_manager.h +++ b/services/netconnmanager/include/net_pac_manager.h @@ -15,7 +15,6 @@ #ifndef JERRY_NET_PAC_MANAGER_H #define JERRY_NET_PAC_MANAGER_H -#ifdef NETMANAGER_ENABLE_PAC_PROXY #include #include #include "mutex" @@ -78,4 +77,3 @@ private: } // namespace NetManagerStandard } // namespace OHOS #endif -#endif // JERRY_NET_PAC_MANAGER_H diff --git a/services/netconnmanager/include/stub/net_conn_service_stub.h b/services/netconnmanager/include/stub/net_conn_service_stub.h index 91c5d56d6..46a742b04 100644 --- a/services/netconnmanager/include/stub/net_conn_service_stub.h +++ b/services/netconnmanager/include/stub/net_conn_service_stub.h @@ -83,9 +83,6 @@ private: int32_t OnGetSpecificUidNet(MessageParcel &data, MessageParcel &reply); int32_t OnGetConnectionProperties(MessageParcel &data, MessageParcel &reply); int32_t OnGetNetCapabilities(MessageParcel &data, MessageParcel &reply); - int32_t OnGetAddressesByName(MessageParcel &data, MessageParcel &reply); - int32_t OnGetAddressByName(MessageParcel &data, MessageParcel &reply); - int32_t OnBindSocket(MessageParcel &data, MessageParcel &reply); int32_t OnSetAirplaneMode(MessageParcel &data, MessageParcel &reply); int32_t OnIsDefaultNetMetered(MessageParcel &data, MessageParcel &reply); int32_t OnSetGlobalHttpProxy(MessageParcel &data, MessageParcel &reply); diff --git a/services/netconnmanager/src/net_pac_manager.cpp b/services/netconnmanager/src/net_pac_manager.cpp index 0b520ae24..45148de21 100644 --- a/services/netconnmanager/src/net_pac_manager.cpp +++ b/services/netconnmanager/src/net_pac_manager.cpp @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifdef NETMANAGER_ENABLE_PAC_PROXY + #include #include #include @@ -273,5 +273,4 @@ std::string NetPACManager::ParseHost(const std::string &url) return result; } } // namespace NetManagerStandard -} // namespace OHOS -#endif \ No newline at end of file +} // namespace OHOS \ No newline at end of file diff --git a/services/netconnmanager/src/network.cpp b/services/netconnmanager/src/network.cpp index 43b1e76b1..2c466c004 100644 --- a/services/netconnmanager/src/network.cpp +++ b/services/netconnmanager/src/network.cpp @@ -298,9 +298,13 @@ bool Network::DelayStartDetectionForIpUpdate(bool hasSameIpAddr) NETMGR_LOG_I("UpdateNetLinkInfo: delay start detection"); if (eventHandler_) { eventHandler_->RemoveTask(taskName); + std::weak_ptr wp = shared_from_this(); eventHandler_->PostAsyncTask( - [self = shared_from_this()] { - self->StartNetDetection(true); + [wp] { + auto sp = wp.lock(); + if (sp != nullptr) { + sp->StartNetDetection(true); + } }, taskName, DETECTION_RESULT_WAIT_MS); } return true; diff --git a/services/netconnmanager/src/stub/net_conn_service_stub.cpp b/services/netconnmanager/src/stub/net_conn_service_stub.cpp index 00bc56bf1..2c8f2ca27 100644 --- a/services/netconnmanager/src/stub/net_conn_service_stub.cpp +++ b/services/netconnmanager/src/stub/net_conn_service_stub.cpp @@ -72,8 +72,6 @@ NetConnServiceStub::NetConnServiceStub() &NetConnServiceStub::OnUnRegisterNetDetectionCallback, {}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_NET_DETECTION)] = { &NetConnServiceStub::OnNetDetection, {Permission::GET_NETWORK_INFO, Permission::INTERNET}}; - memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_BIND_SOCKET)] = {&NetConnServiceStub::OnBindSocket, - {}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_REGISTER_NET_SUPPLIER_CALLBACK)] = { &NetConnServiceStub::OnRegisterNetSupplierCallback, {Permission::CONNECTIVITY_INTERNAL}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_SET_AIRPLANE_MODE)] = { @@ -198,10 +196,6 @@ void NetConnServiceStub::InitQueryFuncToInterfaceMap() &NetConnServiceStub::OnGetConnectionProperties, {Permission::GET_NETWORK_INFO}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_GET_NET_CAPABILITIES)] = { &NetConnServiceStub::OnGetNetCapabilities, {Permission::GET_NETWORK_INFO}}; - memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME)] = { - &NetConnServiceStub::OnGetAddressesByName, {Permission::INTERNET}}; - memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME)] = { - &NetConnServiceStub::OnGetAddressByName, {Permission::INTERNET}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_IS_DEFAULT_NET_METERED)] = { &NetConnServiceStub::OnIsDefaultNetMetered, {Permission::GET_NETWORK_INFO}}; memberFuncMap_[static_cast(ConnInterfaceCode::CMD_NM_GET_GLOBAL_HTTP_PROXY)] = { @@ -1182,88 +1176,6 @@ int32_t NetConnServiceStub::OnGetNetCapabilities(MessageParcel &data, MessagePar return NETMANAGER_SUCCESS; } -int32_t NetConnServiceStub::OnGetAddressesByName(MessageParcel &data, MessageParcel &reply) -{ - std::string host; - if (!data.ReadString(host)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - int32_t netId; - if (!data.ReadInt32(netId)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - NETMGR_LOG_D("stub execute GetAddressesByName"); - std::vector addrList; - int32_t ret = GetAddressesByName(host, netId, addrList); - if (!reply.WriteInt32(ret)) { - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - if (ret == NETMANAGER_SUCCESS) { - uint32_t size = static_cast(addrList.size()); - size = size > MAX_IFACE_NUM ? MAX_IFACE_NUM : size; - if (!reply.WriteUint32(size)) { - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - uint32_t index = 0; - for (auto p = addrList.begin(); p != addrList.end(); ++p) { - if (++index > MAX_IFACE_NUM) { - break; - } - sptr netaddr_ptr = (std::make_unique(*p)).release(); - if (!INetAddr::Marshalling(reply, netaddr_ptr)) { - NETMGR_LOG_E("proxy Marshalling failed"); - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - } - } - return NETMANAGER_SUCCESS; -} - -int32_t NetConnServiceStub::OnGetAddressByName(MessageParcel &data, MessageParcel &reply) -{ - std::string host; - if (!data.ReadString(host)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - int32_t netId; - if (!data.ReadInt32(netId)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - NETMGR_LOG_D("stub execute GetAddressByName"); - INetAddr addr; - int32_t ret = GetAddressByName(host, netId, addr); - if (!reply.WriteInt32(ret)) { - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - if (ret == NETMANAGER_SUCCESS) { - sptr netaddr_ptr = (std::make_unique(addr)).release(); - if (!INetAddr::Marshalling(reply, netaddr_ptr)) { - NETMGR_LOG_E("proxy Marshalling failed"); - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - } - return NETMANAGER_SUCCESS; -} - -int32_t NetConnServiceStub::OnBindSocket(MessageParcel &data, MessageParcel &reply) -{ - int32_t socketFd; - if (!data.ReadInt32(socketFd)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - int32_t netId; - if (!data.ReadInt32(netId)) { - return NETMANAGER_ERR_READ_DATA_FAIL; - } - NETMGR_LOG_D("stub execute BindSocket"); - - int32_t ret = BindSocket(socketFd, netId); - if (!reply.WriteInt32(ret)) { - return NETMANAGER_ERR_WRITE_REPLY_FAIL; - } - return NETMANAGER_SUCCESS; -} - int32_t NetConnServiceStub::OnSetAirplaneMode(MessageParcel &data, MessageParcel &reply) { bool state = false; diff --git a/services/netmanagernative/include/netsys/wrapper/data_receiver.h b/services/netmanagernative/include/netsys/wrapper/data_receiver.h index 0a36117e0..55599f34b 100644 --- a/services/netmanagernative/include/netsys/wrapper/data_receiver.h +++ b/services/netmanagernative/include/netsys/wrapper/data_receiver.h @@ -22,11 +22,10 @@ #include "netsys_event_message.h" #include "wrapper_listener.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { class WrapperListener; -class NET_SYMBOL_VISIBLE DataReceiver { +class DataReceiver { public: using EventCallback = std::function)>; DataReceiver(int32_t socketFd, int32_t format); diff --git a/services/netmanagernative/include/netsys/wrapper/netlink_manager.h b/services/netmanagernative/include/netsys/wrapper/netlink_manager.h index 82f762484..e73ed2e66 100644 --- a/services/netmanagernative/include/netsys/wrapper/netlink_manager.h +++ b/services/netmanagernative/include/netsys/wrapper/netlink_manager.h @@ -22,10 +22,9 @@ #include "i_notify_callback.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { -class NET_SYMBOL_VISIBLE NetlinkManager { +class NetlinkManager { public: static constexpr uint32_t NFLOG_QUOTA_GROUP = 1; static constexpr uint32_t NETFILTER_STRICT_GROUP = 2; diff --git a/services/netmanagernative/include/netsys/wrapper/netsys_event_message.h b/services/netmanagernative/include/netsys/wrapper/netsys_event_message.h index 160fe274b..2c230e1fd 100644 --- a/services/netmanagernative/include/netsys/wrapper/netsys_event_message.h +++ b/services/netmanagernative/include/netsys/wrapper/netsys_event_message.h @@ -20,10 +20,9 @@ #include #include -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { -class NET_SYMBOL_VISIBLE NetsysEventMessage { +class NetsysEventMessage { public: NetsysEventMessage() = default; ~NetsysEventMessage() = default; diff --git a/services/netmanagernative/include/netsys/wrapper/wrapper_decoder.h b/services/netmanagernative/include/netsys/wrapper/wrapper_decoder.h index 8b0250f12..c4b8d37ff 100644 --- a/services/netmanagernative/include/netsys/wrapper/wrapper_decoder.h +++ b/services/netmanagernative/include/netsys/wrapper/wrapper_decoder.h @@ -22,10 +22,9 @@ #include #include -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { -class NET_SYMBOL_VISIBLE WrapperDecoder { +class WrapperDecoder { public: WrapperDecoder(std::shared_ptr message); WrapperDecoder() = delete; diff --git a/services/netmanagernative/include/netsys/wrapper/wrapper_distributor.h b/services/netmanagernative/include/netsys/wrapper/wrapper_distributor.h index 02aab3774..b50a057a3 100644 --- a/services/netmanagernative/include/netsys/wrapper/wrapper_distributor.h +++ b/services/netmanagernative/include/netsys/wrapper/wrapper_distributor.h @@ -21,10 +21,9 @@ #include "netsys_event_message.h" #include -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { -class NET_SYMBOL_VISIBLE WrapperDistributor { +class WrapperDistributor { public: WrapperDistributor(int32_t socket, const int32_t format, std::mutex& externMutex); ~WrapperDistributor() = default; diff --git a/services/netmanagernative/include/netsys/wrapper/wrapper_listener.h b/services/netmanagernative/include/netsys/wrapper/wrapper_listener.h index 6f00bbb32..972a3d5ad 100644 --- a/services/netmanagernative/include/netsys/wrapper/wrapper_listener.h +++ b/services/netmanagernative/include/netsys/wrapper/wrapper_listener.h @@ -17,11 +17,10 @@ #define WRAPPER_LISTENER_H #include "ffrt.h" -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) namespace OHOS { namespace nmd { -class NET_SYMBOL_VISIBLE WrapperListener { +class WrapperListener { public: using RecvFunc = std::function; WrapperListener(int32_t socketFd, RecvFunc recvFunc); diff --git a/services/netpolicymanager/include/net_access_policy_dialog.h b/services/netpolicymanager/include/net_access_policy_dialog.h index bfb8c1a74..eefb97ec7 100644 --- a/services/netpolicymanager/include/net_access_policy_dialog.h +++ b/services/netpolicymanager/include/net_access_policy_dialog.h @@ -26,7 +26,7 @@ public: virtual bool ConnectSystemUi(uint32_t uid) = 0; }; -extern "C" __attribute__((visibility("default"))) INetAccessPolicyDialog *GetNetAccessPolicyDialog(); +extern "C" INetAccessPolicyDialog *GetNetAccessPolicyDialog(); } // namespace NetManagerStandard } // namespace OHOS diff --git a/services/netpolicymanager/include/net_access_policy_dialog_impl.h b/services/netpolicymanager/include/net_access_policy_dialog_impl.h index 6891071d3..031c7e284 100644 --- a/services/netpolicymanager/include/net_access_policy_dialog_impl.h +++ b/services/netpolicymanager/include/net_access_policy_dialog_impl.h @@ -63,7 +63,7 @@ private: static std::string uiExtensionType_; }; -extern "C" __attribute__((visibility("default"))) INetAccessPolicyDialog *GetNetAccessPolicyDialog(); +extern "C" INetAccessPolicyDialog *GetNetAccessPolicyDialog(); } // namespace NetManagerStandard } // namespace OHOS diff --git a/services/netpolicymanager/include/net_policy_service.h b/services/netpolicymanager/include/net_policy_service.h index b3eb10a8a..d160abbeb 100755 --- a/services/netpolicymanager/include/net_policy_service.h +++ b/services/netpolicymanager/include/net_policy_service.h @@ -39,8 +39,7 @@ namespace OHOS { namespace NetManagerStandard { -#define NET_SYMBOL_VISIBLE __attribute__ ((visibility("default"))) -class NET_SYMBOL_VISIBLE NetPolicyService : public SystemAbility, +class NetPolicyService : public SystemAbility, public NetPolicyServiceStub, public std::enable_shared_from_this { DECLARE_DELAYED_SINGLETON(NetPolicyService) diff --git a/services/netsyscontroller/include/i_netsys_controller_service.h b/services/netsyscontroller/include/i_netsys_controller_service.h index dd9240192..3c779530b 100644 --- a/services/netsyscontroller/include/i_netsys_controller_service.h +++ b/services/netsyscontroller/include/i_netsys_controller_service.h @@ -440,15 +440,6 @@ public: */ virtual int32_t ClearDefaultNetWorkNetId() = 0; - /** - * Obtains the NIC list. - * - * @param socketFd Socket fd - * @param netId Net id - * @return Return the return value of the netsys interface call - */ - virtual int32_t BindSocket(int32_t socketFd, uint32_t netId) = 0; - /** * Enable ip forwarding. * diff --git a/services/netsyscontroller/include/mock_netsys_native_client.h b/services/netsyscontroller/include/mock_netsys_native_client.h index c91ae2ca2..2d20d5613 100644 --- a/services/netsyscontroller/include/mock_netsys_native_client.h +++ b/services/netsyscontroller/include/mock_netsys_native_client.h @@ -62,7 +62,6 @@ constexpr const char *MOCK_GETIFACERXPACKETS_API = "GetIfaceRxPackets"; constexpr const char *MOCK_GETIFACETXPACKETS_API = "GetIfaceTxPackets"; constexpr const char *MOCK_SETDEFAULTNETWORK_API = "SetDefaultNetWork"; constexpr const char *MOCK_CLEARDEFAULTNETWORK_API = "ClearDefaultNetWorkNetId"; -constexpr const char *MOCK_BINDSOCKET_API = "BindSocket"; constexpr const char *MOCK_SHAREDNSSET_API = "ShareDnsSet"; constexpr const char *MOCK_REGISTERNETSYSNOTIFYCALLBACK_API = "RegisterNetsysNotifyCallback"; constexpr const char *MOCK_BINDNETWORKSERVICEVPN_API = "BindNetworkServiceVpn"; @@ -368,15 +367,6 @@ public: */ int32_t ClearDefaultNetWorkNetId(); - /** - * @brief Obtains the NIC list. - * - * @param socketFd - * @param netId - * @return Return the return value of the netsys interface call - */ - int32_t BindSocket(int32_t socketFd, uint32_t netId); - /** * Set tether dns. * diff --git a/services/netsyscontroller/include/netsys_controller.h b/services/netsyscontroller/include/netsys_controller.h index 8b7b33293..a2d1dcf82 100644 --- a/services/netsyscontroller/include/netsys_controller.h +++ b/services/netsyscontroller/include/netsys_controller.h @@ -427,15 +427,6 @@ public: */ int32_t ClearDefaultNetWorkNetId(); - /** - * Obtains the NIC list. - * - * @param socketFd - * @param netId - * @return Return the return value of the netsys interface call - */ - int32_t BindSocket(int32_t socketFd, uint32_t netId); - /** * Enable ip forwarding. * diff --git a/services/netsyscontroller/include/netsys_controller_service_impl.h b/services/netsyscontroller/include/netsys_controller_service_impl.h index 37e1b7c7f..2eaa4ce75 100644 --- a/services/netsyscontroller/include/netsys_controller_service_impl.h +++ b/services/netsyscontroller/include/netsys_controller_service_impl.h @@ -414,15 +414,6 @@ public: */ int32_t ClearDefaultNetWorkNetId() override; - /** - * Obtains the NIC list. - * - * @param socketFd - * @param netId - * @return Return the return value of the netsys interface call - */ - int32_t BindSocket(int32_t socketFd, uint32_t netId) override; - /** * Enable ip forwarding. * diff --git a/services/netsyscontroller/include/netsys_native_client.h b/services/netsyscontroller/include/netsys_native_client.h index 24997920a..5242504be 100644 --- a/services/netsyscontroller/include/netsys_native_client.h +++ b/services/netsyscontroller/include/netsys_native_client.h @@ -458,15 +458,6 @@ public: */ int32_t ClearDefaultNetWorkNetId(); - /** - * Obtains the NIC list. - * - * @param socketFd - * @param netId - * @return Return the return value of the netsys interface call - */ - int32_t BindSocket(int32_t socketFd, uint32_t netId); - /** * Enable ip forwarding. * diff --git a/services/netsyscontroller/netsys_controller.map b/services/netsyscontroller/netsys_controller.map index a6e03f405..53b2b620c 100644 --- a/services/netsyscontroller/netsys_controller.map +++ b/services/netsyscontroller/netsys_controller.map @@ -25,7 +25,6 @@ "OHOS::NetManagerStandard::NetsysController::BandwidthRemoveIfaceQuota(std::__h::basic_string, std::__h::allocator> const&)"; "OHOS::NetManagerStandard::NetsysController::BandwidthSetIfaceQuota(std::__h::basic_string, std::__h::allocator> const&, long)"; "OHOS::NetManagerStandard::NetsysController::BandwidthSetIfaceQuota(std::__h::basic_string, std::__h::allocator> const&, long long)"; - "OHOS::NetManagerStandard::NetsysController::BindSocket(int, unsigned int)"; "OHOS::NetManagerStandard::NetsysController::ClearDefaultNetWorkNetId()"; "OHOS::NetManagerStandard::NetsysController::ClearFirewallAllRules()"; "OHOS::NetManagerStandard::NetsysController::ClearFirewallRules(OHOS::NetManagerStandard::NetFirewallRuleType)"; diff --git a/services/netsyscontroller/src/mock_netsys_native_client.cpp b/services/netsyscontroller/src/mock_netsys_native_client.cpp index 8f38782a1..96d77b1a3 100644 --- a/services/netsyscontroller/src/mock_netsys_native_client.cpp +++ b/services/netsyscontroller/src/mock_netsys_native_client.cpp @@ -98,7 +98,6 @@ void MockNetsysNativeClient::RegisterMockApi() mockApi_.insert(MOCK_UIDGETLIST_API); mockApi_.insert(MOCK_GETIFACERXPACKETS_API); mockApi_.insert(MOCK_GETIFACETXPACKETS_API); - mockApi_.insert(MOCK_BINDSOCKET_API); mockApi_.insert(MOCK_SHAREDNSSET_API); mockApi_.insert(MOCK_REGISTERNETSYSNOTIFYCALLBACK_API); mockApi_.insert(MOCK_BINDNETWORKSERVICEVPN_API); @@ -528,12 +527,6 @@ int32_t MockNetsysNativeClient::ClearDefaultNetWorkNetId() return 0; } -int32_t MockNetsysNativeClient::BindSocket(int32_t socketFd, uint32_t netId) -{ - NETMGR_LOG_D("BindSocket: netId = [%{public}u]", netId); - return NETMANAGER_SUCCESS; -} - int32_t MockNetsysNativeClient::ShareDnsSet(uint16_t netId) { NETMGR_LOG_D("ShareDnsSet: netId[%{public}d]", netId); diff --git a/services/netsyscontroller/src/netsys_controller.cpp b/services/netsyscontroller/src/netsys_controller.cpp index e7d9677f3..cc2cce01b 100644 --- a/services/netsyscontroller/src/netsys_controller.cpp +++ b/services/netsyscontroller/src/netsys_controller.cpp @@ -680,18 +680,6 @@ int32_t NetsysController::ClearDefaultNetWorkNetId() return netsysService_->ClearDefaultNetWorkNetId(); } -int32_t NetsysController::BindSocket(int32_t socketFd, uint32_t netId) -{ - NETMGR_LOG_D("NetsysController::BindSocket: netId = [%{public}u]", netId); - // LCOV_EXCL_START This will never happen. - if (netsysService_ == nullptr) { - NETMGR_LOG_E("netsysService_ is null"); - return NETSYS_NETSYSSERVICE_NULL; - } - // LCOV_EXCL_STOP - return netsysService_->BindSocket(socketFd, netId); -} - int32_t NetsysController::IpEnableForwarding(const std::string &requestor) { NETMGR_LOG_I("IpEnableForwarding: requestor[%{public}s]", requestor.c_str()); diff --git a/services/netsyscontroller/src/netsys_controller_service_impl.cpp b/services/netsyscontroller/src/netsys_controller_service_impl.cpp index 10a8ab3a1..2fcd9d0f4 100644 --- a/services/netsyscontroller/src/netsys_controller_service_impl.cpp +++ b/services/netsyscontroller/src/netsys_controller_service_impl.cpp @@ -454,15 +454,6 @@ int32_t NetsysControllerServiceImpl::ClearDefaultNetWorkNetId() return netsysClient_->ClearDefaultNetWorkNetId(); } -int32_t NetsysControllerServiceImpl::BindSocket(int32_t socketFd, uint32_t netId) -{ - NETMGR_LOG_D("BindSocket"); - if (mockNetsysClient_.CheckMockApi(MOCK_BINDSOCKET_API)) { - return mockNetsysClient_.BindSocket(socketFd, netId); - } - return netsysClient_->BindSocket(socketFd, netId); -} - int32_t NetsysControllerServiceImpl::IpEnableForwarding(const std::string &requestor) { NETMGR_LOG_D("IpEnableForwarding"); diff --git a/services/netsyscontroller/src/netsys_native_client.cpp b/services/netsyscontroller/src/netsys_native_client.cpp index ec4409d7a..2b5dce376 100644 --- a/services/netsyscontroller/src/netsys_native_client.cpp +++ b/services/netsyscontroller/src/netsys_native_client.cpp @@ -896,17 +896,6 @@ int32_t NetsysNativeClient::ClearDefaultNetWorkNetId() return NETMANAGER_SUCCESS; } -int32_t NetsysNativeClient::BindSocket(int32_t socketFd, uint32_t netId) -{ - NETMGR_LOG_D("NetsysNativeClient::BindSocket: netId = [%{public}u]", netId); - auto proxy = GetProxy(); - if (proxy == nullptr) { - NETMGR_LOG_E("proxy is nullptr"); - return NETMANAGER_ERR_GET_PROXY_FAIL; - } - return NETMANAGER_SUCCESS; -} - int32_t NetsysNativeClient::IpEnableForwarding(const std::string &requestor) { NETMGR_LOG_D("NetsysNativeClient IpEnableForwarding: requestor[%{public}s]", requestor.c_str()); diff --git a/test/commonduplicatedcode/common_mock_net_conn_service.h b/test/commonduplicatedcode/common_mock_net_conn_service.h new file mode 100644 index 000000000..5413e576a --- /dev/null +++ b/test/commonduplicatedcode/common_mock_net_conn_service.h @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2025 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 COMMON_MOCK_NET_CONN_SERVICE_H +#define COMMON_MOCK_NET_CONN_SERVICE_H + +#include +#include "i_net_conn_service.h" +#include "net_all_capabilities.h" + +namespace OHOS { +namespace NetManagerStandard { + +class MockINetConnService : public INetConnService { +public: + MockINetConnService() = default; + ~MockINetConnService() = default; + + MOCK_METHOD(sptr, AsObject, ()); + MOCK_METHOD(int32_t, SystemReady, ()); + MOCK_METHOD(int32_t, SetInternetPermission, (uint32_t uid, uint8_t allow)); + MOCK_METHOD(int32_t, RegisterNetSupplier, + (NetBearType bearerType, const std::string &ident, const std::set &netCaps, uint32_t &supplierId)); + MOCK_METHOD(int32_t, UnregisterNetSupplier, (uint32_t supplierId)); + MOCK_METHOD( + int32_t, RegisterNetSupplierCallback, (uint32_t supplierId, const sptr &callback)); + MOCK_METHOD(int32_t, RegisterNetConnCallback, (const sptr callback)); + MOCK_METHOD(int32_t, RegisterNetConnCallback, + (const sptr &netSpecifier, const sptr callback, const uint32_t &timeoutMS)); + MOCK_METHOD(int32_t, RequestNetConnection, + (const sptr netSpecifier, const sptr callback, const uint32_t timeoutMS)); + MOCK_METHOD(int32_t, UnregisterNetConnCallback, (const sptr &callback)); + MOCK_METHOD(int32_t, UpdateNetCaps, (const std::set &netCaps, const uint32_t supplierId)); + MOCK_METHOD(int32_t, UpdateNetStateForTest, (const sptr &netSpecifier, int32_t netState)); + MOCK_METHOD(int32_t, UpdateNetSupplierInfo, (uint32_t supplierId, const sptr &netSupplierInfo)); + MOCK_METHOD(int32_t, UpdateNetLinkInfo, (uint32_t supplierId, const sptr &netLinkInfo)); + MOCK_METHOD(int32_t, GetIfaceNames, (NetBearType bearerType, std::list &ifaceNames)); + MOCK_METHOD( + int32_t, GetIfaceNameByType, (NetBearType bearerType, const std::string &ident, std::string &ifaceName)); + MOCK_METHOD(int32_t, GetIfaceNameIdentMaps, + (NetBearType bearerType, (SafeMap & ifaceNameIdentMaps))); + MOCK_METHOD(int32_t, RegisterNetDetectionCallback, (int32_t netId, const sptr &callback)); + MOCK_METHOD(int32_t, UnRegisterNetDetectionCallback, (int32_t netId, const sptr &callback)); + MOCK_METHOD(int32_t, NetDetection, (int32_t netId)); + MOCK_METHOD(int32_t, GetDefaultNet, (int32_t & netId)); + MOCK_METHOD(int32_t, HasDefaultNet, (bool &flag)); + MOCK_METHOD(int32_t, GetSpecificNet, (NetBearType bearerType, std::list &netIdList)); + MOCK_METHOD(int32_t, GetSpecificNetByIdent, + (NetBearType bearerType, const std::string &ident, std::list &netIdList)); + MOCK_METHOD(int32_t, GetAllNets, (std::list & netIdList)); + MOCK_METHOD(int32_t, GetSpecificUidNet, (int32_t uid, int32_t &netId)); + MOCK_METHOD(int32_t, GetConnectionProperties, (int32_t netId, NetLinkInfo &info)); + MOCK_METHOD(int32_t, GetNetCapabilities, (int32_t netId, NetManagerStandard::NetAllCapabilities &netAllCap)); + MOCK_METHOD(int32_t, SetAirplaneMode, (bool state)); + MOCK_METHOD(int32_t, IsDefaultNetMetered, (bool &isMetered)); + MOCK_METHOD(int32_t, SetGlobalHttpProxy, (const HttpProxy &httpProxy)); + MOCK_METHOD(int32_t, GetGlobalHttpProxy, (HttpProxy & httpProxy)); + MOCK_METHOD(int32_t, GetDefaultHttpProxy, (int32_t bindNetId, HttpProxy &httpProxy)); + MOCK_METHOD(int32_t, GetNetIdByIdentifier, (const std::string &ident, std::list &netIdList)); + MOCK_METHOD(int32_t, SetAppNet, (int32_t netId)); + MOCK_METHOD(int32_t, RegisterNetInterfaceCallback, (const sptr &callback)); + MOCK_METHOD(int32_t, UnregisterNetInterfaceCallback, (const sptr &callback)); + MOCK_METHOD(int32_t, GetNetInterfaceConfiguration, + (const std::string &iface, NetManagerStandard::NetInterfaceConfiguration &config)); + MOCK_METHOD(int32_t, SetNetInterfaceIpAddress, (const std::string &iface, const std::string &ipAddress)); + MOCK_METHOD(int32_t, SetInterfaceUp, (const std::string &iface)); + MOCK_METHOD(int32_t, SetInterfaceDown, (const std::string &iface)); + MOCK_METHOD(int32_t, AddNetworkRoute, + (int32_t netId, const std::string &ifName, const std::string &destination, const std::string &nextHop)); + MOCK_METHOD(int32_t, RemoveNetworkRoute, + (int32_t netId, const std::string &ifName, const std::string &destination, const std::string &nextHop)); + MOCK_METHOD( + int32_t, AddInterfaceAddress, (const std::string &ifName, const std::string &ipAddr, int32_t prefixLength)); + MOCK_METHOD( + int32_t, DelInterfaceAddress, (const std::string &ifName, const std::string &ipAddr, int32_t prefixLength)); + MOCK_METHOD( + int32_t, AddStaticArp, (const std::string &ipAddr, const std::string &macAddr, const std::string &ifName)); + MOCK_METHOD( + int32_t, DelStaticArp, (const std::string &ipAddr, const std::string &macAddr, const std::string &ifName)); + MOCK_METHOD(int32_t, RegisterSlotType, (uint32_t supplierId, int32_t type)); + MOCK_METHOD(int32_t, GetSlotType, (std::string & type)); + MOCK_METHOD(int32_t, FactoryResetNetwork, ()); + MOCK_METHOD(int32_t, RegisterNetFactoryResetCallback, (const sptr &callback)); + MOCK_METHOD(int32_t, IsPreferCellularUrl, (const std::string &url, bool &preferCellular)); + MOCK_METHOD(int32_t, RegisterPreAirplaneCallback, (const sptr callback)); + MOCK_METHOD(int32_t, UnregisterPreAirplaneCallback, (const sptr callback)); + MOCK_METHOD( + int32_t, GetDefaultSupplierId, (NetBearType bearerType, const std::string &ident, uint32_t &supplierId)); + MOCK_METHOD(int32_t, UpdateSupplierScore, (uint32_t supplierId, uint32_t detectionStatus)); + MOCK_METHOD(int32_t, EnableVnicNetwork, (const sptr &netLinkInfo, const std::set &uids)); + MOCK_METHOD(int32_t, DisableVnicNetwork, ()); + MOCK_METHOD(int32_t, EnableDistributedClientNet, (const std::string &virnicAddr, const std::string &iif)); + MOCK_METHOD(int32_t, EnableDistributedServerNet, + (const std::string &iif, const std::string &devIface, const std::string &dstAddr)); + MOCK_METHOD(int32_t, DisableDistributedNet, (bool isServer)); + MOCK_METHOD(int32_t, CloseSocketsUid, (int32_t netId, uint32_t uid)); + MOCK_METHOD(int32_t, SetPacUrl, (const std::string &pacUrl)); + MOCK_METHOD(int32_t, GetPacUrl, (std::string &pacUrl)); + MOCK_METHOD(int32_t, SetPacFileUrl, (const std::string &pacUrl)); + MOCK_METHOD(int32_t, SetProxyMode, (const OHOS::NetManagerStandard::ProxyModeType mode)); + MOCK_METHOD(int32_t, GetProxyMode, (OHOS::NetManagerStandard::ProxyModeType &mode)); + MOCK_METHOD(int32_t, GetPacFileUrl, (std::string &pacUrl)); + MOCK_METHOD(int32_t, FindProxyForURL, (const std::string &url, const std::string &host, std::string &proxy)); + MOCK_METHOD(int32_t, QueryTraceRoute, (const std::string &destination, int32_t maxJumpNumber, int32_t packetsType, + std::string &traceRouteInfo)); + MOCK_METHOD(int32_t, SetAppIsFrozened, (uint32_t uid, bool isFrozened)); + MOCK_METHOD(int32_t, EnableAppFrozenedCallbackLimitation, (bool flag)); + MOCK_METHOD(int32_t, SetReuseSupplierId, (uint32_t supplierId, uint32_t reuseSupplierId, bool isReused)); + MOCK_METHOD(int32_t, SetNetExtAttribute, (int32_t netId, const std::string &netExtAttribute)); + MOCK_METHOD(int32_t, GetNetExtAttribute, (int32_t netId, std::string &netExtAttribute)); + MOCK_METHOD(int32_t, AddStaticIpv6Addr, (const std::string &ipAddr, const std::string &macAddr, + const std::string &ifName)); + MOCK_METHOD(int32_t, DelStaticIpv6Addr, (const std::string &ipAddr, const std::string &macAddr, + const std::string &ifName)); +}; + +} // namespace NetManagerStandard +} // namespace OHOS + +#endif \ No newline at end of file diff --git a/test/fuzztest/netconnclient_fuzzer/mock_net_conn_permission.cpp b/test/commonduplicatedcode/common_mock_netmanager_permission.cpp similarity index 81% rename from test/fuzztest/netconnclient_fuzzer/mock_net_conn_permission.cpp rename to test/commonduplicatedcode/common_mock_netmanager_permission.cpp index 6d2029c4a..e3f6e2e37 100644 --- a/test/fuzztest/netconnclient_fuzzer/mock_net_conn_permission.cpp +++ b/test/commonduplicatedcode/common_mock_netmanager_permission.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Huawei Device Co., Ltd. + * Copyright (C) 2025 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 @@ -20,13 +20,13 @@ namespace OHOS { namespace NetManagerStandard { bool NetManagerPermission::CheckPermissionWithCache(const std::string &permissionName) { - NETMGR_LOG_D("Net conn client fuzzer permissionName: %{public}s", permissionName.c_str()); + NETMGR_LOG_D("permissionName: %{public}s", permissionName.c_str()); return true; } bool NetManagerPermission::CheckPermission(const std::string &permissionName) { - NETMGR_LOG_D("Net conn client fuzzer permissionName: %{public}s", permissionName.c_str()); + NETMGR_LOG_D("permissionName: %{public}s", permissionName.c_str()); return true; } diff --git a/test/fuzztest/common_fuzzer/common_fuzzer.cpp b/test/fuzztest/common_fuzzer/common_fuzzer.cpp index deee1d816..4fd8b42a1 100644 --- a/test/fuzztest/common_fuzzer/common_fuzzer.cpp +++ b/test/fuzztest/common_fuzzer/common_fuzzer.cpp @@ -229,26 +229,6 @@ void RegisterEthernetServiceFuzzTest(const uint8_t *data, size_t size) g_netManagerCenter->RegisterEthernetService(service); } -void GetAddressesByNameFuzzTest(const uint8_t *data, size_t size) -{ - if (!IsCommonFuzzValidData(data, size)) { - return; - } - std::string hostName = NetCommonGetString(STR_LEN); - int32_t netId = NetCommonGetData(); - std::vector addrInfo; - g_netManagerCenter->GetAddressesByName(hostName, netId, addrInfo); -} - -void RegisterDnsServiceFuzzTest(const uint8_t *data, size_t size) -{ - if (!IsCommonFuzzValidData(data, size)) { - return; - } - sptr service = nullptr; - g_netManagerCenter->RegisterDnsService(service); -} - void RestrictBackgroundChangedFuzzTest(const uint8_t *data, size_t size) { if (!IsCommonFuzzValidData(data, size)) { @@ -286,7 +266,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) /* Run your code on data */ OHOS::NetManagerStandard::RegisterConnServiceFuzzTest(data, size); OHOS::NetManagerStandard::RegisterStatsServiceFuzzTest(data, size); - OHOS::NetManagerStandard::RegisterDnsServiceFuzzTest(data, size); OHOS::NetManagerStandard::RegisterEthernetServiceFuzzTest(data, size); OHOS::NetManagerStandard::RegisterPolicyServiceFuzzTest(data, size); OHOS::NetManagerStandard::GetIfaceNamesFuzzTest(data, size); @@ -298,7 +277,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::NetManagerStandard::ResetPolicyFactoryFuzzTest(data, size); OHOS::NetManagerStandard::ResetPoliciesFuzzTest(data, size); OHOS::NetManagerStandard::ResetEthernetFactoryFuzzTest(data, size); - OHOS::NetManagerStandard::GetAddressesByNameFuzzTest(data, size); OHOS::NetManagerStandard::RestrictBackgroundChangedFuzzTest(data, size); OHOS::NetManagerStandard::IsUidNetAccessFuzzTest(data, size); OHOS::NetManagerStandard::IsUidNetAllowedFuzzTest(data, size); diff --git a/test/fuzztest/netconnclient_fuzzer/BUILD.gn b/test/fuzztest/netconnclient_fuzzer/BUILD.gn index d12c9acbe..a7bc72b48 100644 --- a/test/fuzztest/netconnclient_fuzzer/BUILD.gn +++ b/test/fuzztest/netconnclient_fuzzer/BUILD.gn @@ -54,7 +54,7 @@ ohos_fuzztest("NetConnClientFuzzTest") { sources = [ "$NETMANAGER_BASE_ROOT/test/security/netmanager_base_test_security.cpp", - "mock_net_conn_permission.cpp", + "$NETMANAGER_BASE_ROOT/test/commonduplicatedcode/common_mock_netmanager_permission.cpp", "net_conn_client_fuzzer.cpp", ] diff --git a/test/fuzztest/netconnclient_fuzzer/net_conn_client_fuzzer.cpp b/test/fuzztest/netconnclient_fuzzer/net_conn_client_fuzzer.cpp index ea6fc1919..083749541 100644 --- a/test/fuzztest/netconnclient_fuzzer/net_conn_client_fuzzer.cpp +++ b/test/fuzztest/netconnclient_fuzzer/net_conn_client_fuzzer.cpp @@ -220,20 +220,6 @@ void GetAllNetsFuzzTest(const uint8_t *data, size_t size) OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ALL_NETS), dataParcel); } -void BindSocketFuzzTest(const uint8_t *data, size_t size) -{ - NetManagerBaseAccessToken token; - int32_t socketFd = NetConnGetData(); - int32_t netId = NetConnGetData(); - MessageParcel dataParcel; - if (!IsConnClientDataAndSizeValid(data, size, dataParcel)) { - return; - } - dataParcel.WriteInt32(socketFd); - dataParcel.WriteInt32(netId); - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_BIND_SOCKET), dataParcel); -} - void SetAirplaneModeFuzzTest(const uint8_t *data, size_t size) { NetManagerBaseAccessToken token; @@ -274,73 +260,6 @@ void UpdateNetSupplierInfoFuzzTest(const uint8_t *data, size_t size) OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_SET_NET_SUPPLIER_INFO), dataParcel); } -void GetAddressByNameFuzzTest(const uint8_t *data, size_t size) -{ - NetManagerBaseAccessToken token; - std::string host = NetConnGetString(STR_LEN); - int32_t netId = NetConnGetData(); - - MessageParcel dataParcel; - if (!IsConnClientDataAndSizeValid(data, size, dataParcel)) { - NETMGR_LOG_D("GetAddressByNameFuzzTest write token failed or invalid parameter."); - return; - } - dataParcel.WriteString(host); - dataParcel.WriteInt32(netId); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME), dataParcel); - - MessageParcel dataParcelNoHost; - if (!IsConnClientDataAndSizeValid(data, size, dataParcelNoHost)) { - NETMGR_LOG_D("GetAddressByNameFuzzTest write token failed or invalid parameter."); - return; - } - dataParcelNoHost.WriteInt32(netId); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME), dataParcelNoHost); - - MessageParcel dataParcelNoNetId; - if (!IsConnClientDataAndSizeValid(data, size, dataParcelNoNetId)) { - NETMGR_LOG_D("GetAddressByNameFuzzTest write token failed or invalid parameter."); - return; - } - dataParcelNoNetId.WriteInt32(netId); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME), dataParcelNoNetId); -} - -void GetAddressesByNameFuzzTest(const uint8_t *data, size_t size) -{ - NetManagerBaseAccessToken token; - std::string host = NetConnGetString(STR_LEN); - int32_t netId = NetConnGetData(); - - MessageParcel dataParcel; - if (!IsConnClientDataAndSizeValid(data, size, dataParcel)) { - return; - } - dataParcel.WriteString(host); - dataParcel.WriteInt32(netId); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME), dataParcel); - - MessageParcel dataParcelNoHost; - if (!IsConnClientDataAndSizeValid(data, size, dataParcelNoHost)) { - return; - } - dataParcelNoHost.WriteInt32(netId); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME), dataParcelNoHost); - - MessageParcel dataParcelNoNetId; - if (!IsConnClientDataAndSizeValid(data, size, dataParcelNoNetId)) { - return; - } - dataParcelNoNetId.WriteString(host); - - OnRemoteRequest(static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME), dataParcelNoNetId); -} - void UpdateNetLinkInfoFuzzTest(const uint8_t *data, size_t size) { uint32_t supplierId = NetConnGetData(); @@ -1958,9 +1877,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::NetManagerStandard::GetAllNetsFuzzTest(data, size); OHOS::NetManagerStandard::GetConnectionPropertiesFuzzTest(data, size); OHOS::NetManagerStandard::GetNetCapabilitiesFuzzTest(data, size); - OHOS::NetManagerStandard::GetAddressesByNameFuzzTest(data, size); - OHOS::NetManagerStandard::GetAddressByNameFuzzTest(data, size); - OHOS::NetManagerStandard::BindSocketFuzzTest(data, size); OHOS::NetManagerStandard::NetDetectionFuzzTest(data, size); OHOS::NetManagerStandard::SetAirplaneModeFuzzTest(data, size); OHOS::NetManagerStandard::IsDefaultNetMeteredFuzzTest(data, size); diff --git a/test/fuzztest/netpolicyclient_fuzzer/BUILD.gn b/test/fuzztest/netpolicyclient_fuzzer/BUILD.gn index 380a5b1b2..0e55e6500 100644 --- a/test/fuzztest/netpolicyclient_fuzzer/BUILD.gn +++ b/test/fuzztest/netpolicyclient_fuzzer/BUILD.gn @@ -49,7 +49,7 @@ ohos_fuzztest("NetPolicyClientFuzzTest") { sources = [ "$NETMANAGER_BASE_ROOT/test/security/netmanager_base_test_security.cpp", - "mock_net_policy_permission.cpp", + "$NETMANAGER_BASE_ROOT/test/commonduplicatedcode/common_mock_netmanager_permission.cpp", "net_policy_client_fuzzer.cpp", ] diff --git a/test/fuzztest/netpolicyclient_fuzzer/mock_net_policy_permission.cpp b/test/fuzztest/netpolicyclient_fuzzer/mock_net_policy_permission.cpp deleted file mode 100644 index 6291f0278..000000000 --- a/test/fuzztest/netpolicyclient_fuzzer/mock_net_policy_permission.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2022 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 "net_mgr_log_wrapper.h" -#include "netmanager_base_permission.h" - -namespace OHOS { -namespace NetManagerStandard { -bool NetManagerPermission::IsSystemCaller() -{ - NETMGR_LOG_D("Is system caller."); - return true; -} - -bool NetManagerPermission::CheckPermission(const std::string &permissionName) -{ - NETMGR_LOG_D("Net policy client fuzzer permissionName: %{public}s", permissionName.c_str()); - return true; -} - -bool NetManagerPermission::CheckPermissionWithCache(const std::string &permissionName) -{ - NETMGR_LOG_D("Net policy client fuzzer permissionName: %{public}s", permissionName.c_str()); - return true; -} -} // namespace NetManagerStandard -} // namespace OHOS \ No newline at end of file diff --git a/test/fuzztest/netstatsclient_fuzzer/BUILD.gn b/test/fuzztest/netstatsclient_fuzzer/BUILD.gn index 73cbfdfa6..fdcc16c34 100644 --- a/test/fuzztest/netstatsclient_fuzzer/BUILD.gn +++ b/test/fuzztest/netstatsclient_fuzzer/BUILD.gn @@ -47,7 +47,7 @@ ohos_fuzztest("NetStatsClientFuzzTest") { ldflags = [ "-flto" ] sources = [ - "mock_net_permission.cpp", + "$NETMANAGER_BASE_ROOT/test/commonduplicatedcode/common_mock_netmanager_permission.cpp", "net_stats_client_fuzzer.cpp", ] diff --git a/test/fuzztest/netstatsclient_fuzzer/mock_net_permission.cpp b/test/fuzztest/netstatsclient_fuzzer/mock_net_permission.cpp deleted file mode 100644 index 0edcf8672..000000000 --- a/test/fuzztest/netstatsclient_fuzzer/mock_net_permission.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2022 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 "net_mgr_log_wrapper.h" -#include "netmanager_base_permission.h" - -namespace OHOS { -namespace NetManagerStandard { -bool NetManagerPermission::CheckPermission(const std::string &permissionName) -{ - NETMGR_LOG_D("Net stats client fuzzer permissionName: %{public}s", permissionName.c_str()); - return true; -} - -bool NetManagerPermission::CheckPermissionWithCache(const std::string &permissionName) -{ - NETMGR_LOG_D("Net stats client fuzzer permissionName: %{public}s", permissionName.c_str()); - return true; -} -} // namespace NetManagerStandard -} // namespace OHOS \ No newline at end of file diff --git a/test/netcommon/unittest/net_common/net_manager_center_test.cpp b/test/netcommon/unittest/net_common/net_manager_center_test.cpp index 7f3176b76..54ba1c734 100644 --- a/test/netcommon/unittest/net_common/net_manager_center_test.cpp +++ b/test/netcommon/unittest/net_common/net_manager_center_test.cpp @@ -15,7 +15,6 @@ #include -#include "dns_base_service.h" #include "net_conn_base_service.h" #include "net_conn_service_iface.h" #include "net_conn_types.h" @@ -35,14 +34,6 @@ constexpr std::initializer_list BEAR_TYPE_LIST = { NetBearType::BEARER_ETHERNET, NetBearType::BEARER_VPN, NetBearType::BEARER_WIFI_AWARE, }; -class TestDnsService : public DnsBaseService { - inline int32_t GetAddressesByName(const std::string &hostName, int32_t netId, - std::vector &addrInfo) override - { - return NETMANAGER_SUCCESS; - } -}; - class TestConnService : public NetConnBaseService { public: inline int32_t GetIfaceNames(NetBearType bearerType, std::list &ifaceNames) override @@ -150,7 +141,6 @@ void NetManagerCenterTest::SetUp() instance_.RegisterStatsService(nullptr); instance_.RegisterPolicyService(nullptr); instance_.RegisterEthernetService(nullptr); - instance_.RegisterDnsService(nullptr); } void NetManagerCenterTest::TearDown() {} @@ -425,26 +415,6 @@ HWTEST_F(NetManagerCenterTest, ResetEthernetFactoryTest002, TestSize.Level1) EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -HWTEST_F(NetManagerCenterTest, GetAddressesByNameTest001, TestSize.Level1) -{ - const std::string testHostName = "test_hostname"; - int32_t testNetId = 111; - std::vector addrInfo; - int32_t ret = instance_.GetAddressesByName(testHostName, testNetId, addrInfo); - EXPECT_EQ(ret, NETMANAGER_ERROR); -} - -HWTEST_F(NetManagerCenterTest, GetAddressesByNameTest002, TestSize.Level1) -{ - sptr service = new (std::nothrow) TestDnsService(); - instance_.RegisterDnsService(service); - const std::string testHostName = "test_hostname"; - int32_t testNetId = 111; - std::vector addrInfo; - int32_t ret = instance_.GetAddressesByName(testHostName, testNetId, addrInfo); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - HWTEST_F(NetManagerCenterTest, RestrictBackgroundChangedTest001, TestSize.Level1) { int32_t ret = instance_.RestrictBackgroundChanged(true); diff --git a/test/netcommon/unittest/net_common_test/net_manager_center_test.cpp b/test/netcommon/unittest/net_common_test/net_manager_center_test.cpp index 93fc93d34..936378c22 100644 --- a/test/netcommon/unittest/net_common_test/net_manager_center_test.cpp +++ b/test/netcommon/unittest/net_common_test/net_manager_center_test.cpp @@ -15,7 +15,6 @@ #include -#include "dns_base_service.h" #include "net_conn_base_service.h" #include "net_conn_service_iface.h" #include "net_conn_types.h" @@ -35,14 +34,6 @@ constexpr std::initializer_list BEAR_TYPE_LIST = { NetBearType::BEARER_ETHERNET, NetBearType::BEARER_VPN, NetBearType::BEARER_WIFI_AWARE, }; -class TestDnsService : public DnsBaseService { - inline int32_t GetAddressesByName(const std::string &hostName, int32_t netId, - std::vector &addrInfo) override - { - return NETMANAGER_SUCCESS; - } -}; - class TestConnService : public NetConnBaseService { public: inline int32_t GetIfaceNames(NetBearType bearerType, std::list &ifaceNames) override @@ -150,7 +141,6 @@ void NetManagerCenterTest::SetUp() instance_.RegisterStatsService(nullptr); instance_.RegisterPolicyService(nullptr); instance_.RegisterEthernetService(nullptr); - instance_.RegisterDnsService(nullptr); } void NetManagerCenterTest::TearDown() {} @@ -425,26 +415,6 @@ HWTEST_F(NetManagerCenterTest, ResetEthernetFactoryTest002, TestSize.Level1) EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -HWTEST_F(NetManagerCenterTest, GetAddressesByNameTest001, TestSize.Level1) -{ - const std::string testHostName = "test_hostname"; - int32_t testNetId = 111; - std::vector addrInfo; - int32_t ret = instance_.GetAddressesByName(testHostName, testNetId, addrInfo); - EXPECT_EQ(ret, NETMANAGER_ERROR); -} - -HWTEST_F(NetManagerCenterTest, GetAddressesByNameTest002, TestSize.Level1) -{ - sptr service = new (std::nothrow) TestDnsService(); - instance_.RegisterDnsService(service); - const std::string testHostName = "test_hostname"; - int32_t testNetId = 111; - std::vector addrInfo; - int32_t ret = instance_.GetAddressesByName(testHostName, testNetId, addrInfo); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - HWTEST_F(NetManagerCenterTest, RestrictBackgroundChangedTest001, TestSize.Level1) { int32_t ret = instance_.RestrictBackgroundChanged(true); diff --git a/test/netconnmanager/mock/net_conn_service_stub_test.h b/test/netconnmanager/mock/net_conn_service_stub_test.h index 95584f84b..fa11f7b7c 100644 --- a/test/netconnmanager/mock/net_conn_service_stub_test.h +++ b/test/netconnmanager/mock/net_conn_service_stub_test.h @@ -151,16 +151,6 @@ public: return 0; } - int32_t GetAddressesByName(const std::string &host, int32_t netId, std::vector &addrList) override - { - return 0; - } - - int32_t GetAddressByName(const std::string &host, int32_t netId, INetAddr &addr) override - { - return 0; - } - int32_t GetIfaceNameIdentMaps(NetBearType bearerType, SafeMap &ifaceNameIdentMaps) override { @@ -198,11 +188,6 @@ public: return 0; } - int32_t BindSocket(int32_t socketFd, int32_t netId) override - { - return 0; - } - int32_t SetAirplaneMode(bool state) override { return 0; diff --git a/test/netconnmanager/unittest/net_conn_manager_test/BUILD.gn b/test/netconnmanager/unittest/net_conn_manager_test/BUILD.gn index a49f7b02e..dfe05d4ab 100644 --- a/test/netconnmanager/unittest/net_conn_manager_test/BUILD.gn +++ b/test/netconnmanager/unittest/net_conn_manager_test/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("net_conn_manager_test") { use_exceptions = true sources = [ "$NETMANAGER_BASE_ROOT/test/security/netmanager_base_test_security.cpp", + "$NETMANAGER_BASE_ROOT/test/commonduplicatedcode/common_mock_netmanager_permission.cpp", "net_common_event_test.cpp", "net_conn_callback_stub_test.cpp", "net_conn_callback_test.cpp", @@ -82,6 +83,7 @@ ohos_unittest("net_conn_manager_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_manager_test.cpp b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_manager_test.cpp index c10d9fbb3..cc305e8a3 100644 --- a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_manager_test.cpp +++ b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_manager_test.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ +#define private public #include #include "http_proxy.h" @@ -28,12 +29,14 @@ #include "system_ability_definition.h" #include "net_detection_callback_stub.h" #include "network.h" +#include "common_mock_net_conn_service.h" namespace OHOS { namespace NetManagerStandard { namespace { constexpr int WAIT_TIME_SECOND_LONG = 5; constexpr int WAIT_TIME_SECOND_NET_DETECTION = 2; +using namespace testing; using namespace testing::ext; } // namespace @@ -53,7 +56,7 @@ public: void LogCapabilities(const std::list> &netList) const; static sptr GetProxy(); - void GlobalHttpProxyTest(HttpProxy &httpProxy); + inline static sptr mockNetConnService = sptr::MakeSptr(); }; void NetConnManagerTest::SetUpTestCase() @@ -64,12 +67,14 @@ void NetConnManagerTest::SetUpTestCase() subscribeInfo.SetPriority(1); netCommonEventTest_ = std::make_shared(subscribeInfo); EventFwk::CommonEventManager::SubscribeCommonEvent(netCommonEventTest_); + EXPECT_CALL(*mockNetConnService, AsObject()).WillRepeatedly(Return(mockNetConnService->AsObject())); } void NetConnManagerTest::TearDownTestCase() { EventFwk::CommonEventManager::UnSubscribeCommonEvent(netCommonEventTest_); netCommonEventTest_.reset(); + mockNetConnService = nullptr; } void NetConnManagerTest::SetUp() {} @@ -162,21 +167,6 @@ sptr NetConnManagerTest::GetProxy() } } -void NetConnManagerTest::GlobalHttpProxyTest(HttpProxy &httpProxy) -{ - NetManagerBaseNotSystemToken token; - int32_t ret = NetConnClient::GetInstance().SetGlobalHttpProxy(httpProxy); - ASSERT_TRUE(ret == NETMANAGER_ERR_NOT_SYSTEM_CALL); - - ret = NetConnClient::GetInstance().GetGlobalHttpProxy(httpProxy); - ASSERT_TRUE(ret == NETMANAGER_ERR_NOT_SYSTEM_CALL); - std::list exclusionList = httpProxy.GetExclusionList(); - std::cout << "Get global http host:" << httpProxy.GetHost() << " ,port:" << httpProxy.GetPort() << std::endl; - for (auto exclusion : exclusionList) { - std::cout << "Get global http exclusion:" << exclusion << std::endl; - } -} - /** * @tc.name: NetConnManager001 * @tc.desc: Test NetConnManager SystemReady. @@ -185,7 +175,7 @@ void NetConnManagerTest::GlobalHttpProxyTest(HttpProxy &httpProxy) HWTEST_F(NetConnManagerTest, NetConnManager001, TestSize.Level1) { int32_t result = NetConnClient::GetInstance().SystemReady(); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -195,13 +185,16 @@ HWTEST_F(NetConnManagerTest, NetConnManager001, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager002, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; std::string ident = "ident01"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -211,16 +204,20 @@ HWTEST_F(NetConnManagerTest, NetConnManager002, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager003, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UnregisterNetSupplier(_)).WillRepeatedly(Return(0)); NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; std::string ident = "ident02"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); - result = NetConnClient::GetInstance().UnregisterNetSupplier(supplierId); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + result = netConnClient->UnregisterNetSupplier(supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -231,21 +228,25 @@ HWTEST_F(NetConnManagerTest, NetConnManager003, TestSize.Level1) HWTEST_F(NetConnManagerTest, NetConnManager004, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetSupplierInfo(_, _)).WillRepeatedly(Return(0)); NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; std::string ident = "ident03"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); sptr netSupplierInfo = new NetSupplierInfo; netSupplierInfo->isAvailable_ = true; netSupplierInfo->isRoaming_ = true; netSupplierInfo->strength_ = 0x64; netSupplierInfo->frequency_ = 0x10; - result = NetConnClient::GetInstance().UpdateNetSupplierInfo(supplierId, netSupplierInfo); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + result = netConnClient->UpdateNetSupplierInfo(supplierId, netSupplierInfo); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -255,18 +256,22 @@ HWTEST_F(NetConnManagerTest, NetConnManager004, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager005, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetLinkInfo(_, _)).WillRepeatedly(Return(0)); NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; std::string ident = "ident04"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); sptr netLinkInfo = GetUpdateLinkInfoSample(); - result = NetConnClient::GetInstance().UpdateNetLinkInfo(supplierId, netLinkInfo); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + result = netConnClient->UpdateNetLinkInfo(supplierId, netLinkInfo); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -276,20 +281,26 @@ HWTEST_F(NetConnManagerTest, NetConnManager005, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager006, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, RegisterNetConnCallback(_)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UnregisterNetConnCallback(_)).WillRepeatedly(Return(0)); NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET}; std::string ident = "ident"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); sptr netSpecifier = (std::make_unique()).release(); netSpecifier->ident_ = ident; netSpecifier->SetCapabilities(netCaps); sptr callback = GetINetConnCallbackSample(); - result = NetConnClient::GetInstance().RegisterNetConnCallback(callback); + result = netConnClient->RegisterNetConnCallback(callback); + EXPECT_EQ(result, NETMANAGER_SUCCESS); if (result == NETMANAGER_SUCCESS) { sptr proxy = NetConnManagerTest::GetProxy(); if (proxy == nullptr) { @@ -303,8 +314,8 @@ HWTEST_F(NetConnManagerTest, NetConnManager006, TestSize.Level1) std::cout << "NetConnManager006 RegisterNetConnCallback return fail" << std::endl; } - result = NetConnClient::GetInstance().UnregisterNetConnCallback(callback); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + result = netConnClient->UnregisterNetConnCallback(callback); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -330,7 +341,7 @@ HWTEST_F(NetConnManagerTest, NetConnManager007, TestSize.Level1) std::cout << "RegisterNetDetectionCallback failed ret = %{public}d"<< result << std::endl; result = NetConnClient::GetInstance().UnRegisterNetDetectionCallback(netId, callback); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -340,33 +351,40 @@ HWTEST_F(NetConnManagerTest, NetConnManager007, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager008, TestSize.Level1) { - auto &client = NetConnClient::GetInstance(); + NetAllCapabilities netAllCap; + EXPECT_CALL(*mockNetConnService, GetAllNets(_)).WillOnce(Invoke([](std::list &netIdList) { + netIdList.push_back(100); + return NETMANAGER_SUCCESS; + })); + EXPECT_CALL(*mockNetConnService, GetNetCapabilities(_, Ref(netAllCap))).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, NetDetection(_)).WillRepeatedly(Return(0)); + NetManagerBaseAccessToken token; + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; sptr proxy = NetConnManagerTest::GetProxy(); if (proxy == nullptr) { return; } - NetManagerBaseAccessToken token; std::list> netList; - int32_t result = client.GetAllNets(netList); + int32_t result = netConnClient->GetAllNets(netList); std::cout << "netIdList size:" << netList.size() << std::endl; - ASSERT_TRUE(result == NetConnResultCode::NET_CONN_SUCCESS); + EXPECT_EQ(result, NetConnResultCode::NET_CONN_SUCCESS); sptr detectionCallback = GetINetDetectionCallbackSample(); if (detectionCallback == nullptr) { return; } for (sptr netHandle : netList) { - NetAllCapabilities netAllCap; - client.GetNetCapabilities(*netHandle, netAllCap); + netConnClient->GetNetCapabilities(*netHandle, netAllCap); std::cout << netAllCap.ToString("|") << std::endl; if (netAllCap.bearerTypes_.find(BEARER_WIFI) == netAllCap.bearerTypes_.end()) { continue; } int32_t netId = netHandle->GetNetId(); result = proxy->RegisterNetDetectionCallback(netId, detectionCallback); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "TestRegisterNetDetectionCallback netId:" << netId << " result:" << result << std::endl; - result = client.NetDetection(*netHandle); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->NetDetection(*netHandle); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "TestNetDetection result:" << result << std::endl; detectionCallback->WaitFor(WAIT_TIME_SECOND_NET_DETECTION); int32_t netDetectionRet = detectionCallback->GetNetDetectionResult(); @@ -375,17 +393,17 @@ HWTEST_F(NetConnManagerTest, NetConnManager008, TestSize.Level1) std::cout << "RegisterNetDetectionCallback urlRedirect:" << urlRedirect << std::endl; result = proxy->UnRegisterNetDetectionCallback(netId, detectionCallback); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "TestUnRegisterNetDetectionCallback result:" << result << std::endl; - result = client.NetDetection(*netHandle); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->NetDetection(*netHandle); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "TestNetDetection result:" << result << std::endl; detectionCallback->WaitFor(WAIT_TIME_SECOND_NET_DETECTION); netDetectionRet = detectionCallback->GetNetDetectionResult(); - ASSERT_TRUE(netDetectionRet == static_cast(NetDetectionResultCode::NET_DETECTION_FAIL)); + EXPECT_EQ(netDetectionRet, static_cast(NetDetectionResultCode::NET_DETECTION_FAIL)); std::cout << "RegisterNetDetectionCallback netDetectionRet:" << netDetectionRet << std::endl; urlRedirect = detectionCallback->GetUrlRedirect(); - ASSERT_TRUE(urlRedirect.empty()); + EXPECT_TRUE(urlRedirect.empty()); std::cout << "RegisterNetDetectionCallback urlRedirect:" << urlRedirect << std::endl; } } @@ -411,21 +429,21 @@ HWTEST_F(NetConnManagerTest, NetConnManager009, TestSize.Level1) int32_t result = 0; result = proxy->RegisterNetDetectionCallback(netIdError, detectionCallback); std::cout << "TestRegisterNetDetectionCallback netIdError:" << netIdError << " result:" << result << std::endl; - ASSERT_TRUE(result != NETMANAGER_SUCCESS); + EXPECT_NE(result, NETMANAGER_SUCCESS); result = proxy->UnRegisterNetDetectionCallback(netIdError, detectionCallback); std::cout << "TestUnRegisterNetDetectionCallback netIdError:" << netIdError << " result:" << result << std::endl; - ASSERT_TRUE(result != NETMANAGER_SUCCESS); + EXPECT_NE(result, NETMANAGER_SUCCESS); NetHandle netHError(netIdError); result = NetConnClient::GetInstance().NetDetection(netHError); std::cout << "TestNetDetection netIdError:" << netIdError << " result:" << result << std::endl; - ASSERT_TRUE(result != NETMANAGER_SUCCESS); + EXPECT_NE(result, NETMANAGER_SUCCESS); result = proxy->RegisterNetDetectionCallback(netIdError, nullptr); std::cout << "TestRegisterNetDetectionCallback nullptr result:" << result << std::endl; - ASSERT_TRUE(result != NETMANAGER_SUCCESS); + EXPECT_NE(result, NETMANAGER_SUCCESS); result = proxy->UnRegisterNetDetectionCallback(netIdError, nullptr); std::cout << "TestUnRegisterNetDetectionCallback nullptr result:" << result << std::endl; - ASSERT_TRUE(result != NETMANAGER_SUCCESS); + EXPECT_NE(result, NETMANAGER_SUCCESS); } /** @@ -435,42 +453,41 @@ HWTEST_F(NetConnManagerTest, NetConnManager009, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager011, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; NetManagerBaseAccessToken token; std::string ident = "ident"; uint32_t supplierId1 = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId1); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId1); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId1 : " << supplierId1 << std::endl; ident = "ident2"; uint32_t supplierId2 = 0; - result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId2); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId2); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId2 : " << supplierId2 << std::endl; ident = "ident3"; uint32_t supplierId3 = 0; - result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId3); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId3); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId3 : " << supplierId3 << std::endl; - sptr proxy = NetConnManagerTest::GetProxy(); - if (proxy == nullptr) { - return; - } std::list netIdList; - result = proxy->GetSpecificNet(bearerType, netIdList); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->GetSpecificNet(bearerType, netIdList); + EXPECT_EQ(result, NETMANAGER_SUCCESS); for (auto it : netIdList) { std::cout << "netid = " << it << std::endl; } std::list netIdList1; - result = proxy->GetSpecificNetByIdent(bearerType, "ident", netIdList1); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->GetSpecificNetByIdent(bearerType, "ident", netIdList1); + EXPECT_EQ(result, NETMANAGER_SUCCESS); for (auto it : netIdList) { std::cout << "netid = " << it << std::endl; } @@ -483,6 +500,13 @@ HWTEST_F(NetConnManagerTest, NetConnManager011, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager012, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetAllNets(_)).WillOnce(Invoke([](std::list &netIdList) { + netIdList.push_back(100); + return NETMANAGER_SUCCESS; + })); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerTypeCel = BEARER_CELLULAR; NetBearType bearerTypeEth = BEARER_ETHERNET; std::set netCaps{NET_CAPABILITY_INTERNET}; @@ -490,25 +514,25 @@ HWTEST_F(NetConnManagerTest, NetConnManager012, TestSize.Level1) NetManagerBaseAccessToken token; std::string ident = "ident"; uint32_t supplierId1 = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerTypeCel, ident, netCaps, supplierId1); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerTypeCel, ident, netCaps, supplierId1); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId1 : " << supplierId1 << std::endl; ident = "ident2"; uint32_t supplierId2 = 0; - result = NetConnClient::GetInstance().RegisterNetSupplier(bearerTypeEth, ident, netCaps, supplierId2); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->RegisterNetSupplier(bearerTypeEth, ident, netCaps, supplierId2); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId2 : " << supplierId2 << std::endl; ident = "ident3"; uint32_t supplierId3 = 0; - result = NetConnClient::GetInstance().RegisterNetSupplier(bearerTypeCel, ident, netCaps, supplierId3); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->RegisterNetSupplier(bearerTypeCel, ident, netCaps, supplierId3); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId3 : " << supplierId3 << std::endl; std::list> netList; - result = NetConnClient::GetInstance().GetAllNets(netList); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->GetAllNets(netList); + EXPECT_EQ(result, NETMANAGER_SUCCESS); for (auto it : netList) { std::cout << "netid = " << it->GetNetId() << std::endl; } @@ -521,19 +545,26 @@ HWTEST_F(NetConnManagerTest, NetConnManager012, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager013, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetAllNets(_)).WillOnce(Invoke([](std::list &netIdList) { + netIdList.push_back(100); + return NETMANAGER_SUCCESS; + })); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; NetManagerBaseAccessToken token; std::string ident = "ident"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId : " << supplierId << std::endl; std::list> netList; - result = NetConnClient::GetInstance().GetAllNets(netList); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + result = netConnClient->GetAllNets(netList); + EXPECT_EQ(result, NETMANAGER_SUCCESS); LogCapabilities(netList); } @@ -544,28 +575,34 @@ HWTEST_F(NetConnManagerTest, NetConnManager013, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager014, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetLinkInfo(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetNetIdByIdentifier(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetConnectionProperties(_, _)).WillRepeatedly(Return(0)); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS}; NetManagerBaseAccessToken token; std::string ident = "ident"; uint32_t supplierId = 0; - int32_t result = NetConnClient::GetInstance().RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "supplierId : " << supplierId << std::endl; sptr netLinkInfo = GetUpdateLinkInfoSample(); - result = NetConnClient::GetInstance().UpdateNetLinkInfo(supplierId, netLinkInfo); - ASSERT_EQ(result, NETMANAGER_SUCCESS); + result = netConnClient->UpdateNetLinkInfo(supplierId, netLinkInfo); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::list netIdList; - result = NetConnClient::GetInstance().GetNetIdByIdentifier(ident, netIdList); - ASSERT_TRUE(result == NetConnResultCode::NET_CONN_SUCCESS); + result = netConnClient->GetNetIdByIdentifier(ident, netIdList); + EXPECT_EQ(result, NetConnResultCode::NET_CONN_SUCCESS); NetLinkInfo info; NetHandle netHandle(netIdList.front()); - result = NetConnClient::GetInstance().GetConnectionProperties(netHandle, info); + result = netConnClient->GetConnectionProperties(netHandle, info); std::cout << "result = " << result << std::endl; - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << info.ToString("\n") << std::endl; } @@ -576,65 +613,16 @@ HWTEST_F(NetConnManagerTest, NetConnManager014, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager015, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, IsDefaultNetMetered(_)).WillRepeatedly(Return(0)); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetManagerBaseAccessToken token; bool isMetered = false; - int32_t result = NetConnClient::GetInstance().IsDefaultNetMetered(isMetered); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + int32_t result = netConnClient->IsDefaultNetMetered(isMetered); + EXPECT_EQ(result, NETMANAGER_SUCCESS); std::cout << "isMetered : " << isMetered << std::endl; } -int32_t CheckNetListRemainWhenConnected(std::list> &netList) -{ - netList.clear(); - int32_t result = NetConnClient::GetInstance().GetAllNets(netList); - std::cout << "Check1: netIdList size:" << netList.size() << std::endl; - return result; -} - -int32_t CheckNetListIncreaseWhenConnected(sptr &netLinkInfo, std::list> &netList, - uint32_t &supplierId, size_t &originNetSize) -{ - NetConnClient::GetInstance().UpdateNetLinkInfo(supplierId, netLinkInfo); - netList.clear(); - int32_t result = NetConnClient::GetInstance().GetAllNets(netList); - originNetSize++; - std::cout << "Check2: netIdList size:" << netList.size() << std::endl; - return result; -} - -int32_t CheckNetListWhenDisconnected(sptr &netSupplierInfo, std::list> &netList, - uint32_t &supplierId, size_t &originNetSize) -{ - netSupplierInfo->isAvailable_ = false; - NetConnClient::GetInstance().UpdateNetSupplierInfo(supplierId, netSupplierInfo); - originNetSize--; - netList.clear(); - int32_t result = NetConnClient::GetInstance().GetAllNets(netList); - std::cout << "Check3: netIdList size:" << netList.size() << std::endl; - return result; -} - -int32_t RollbackForNetConnManager(sptr &netSupplierInfo, sptr &netLinkInfo, - std::list> &netList, uint32_t &supplierId, size_t &originNetSize) -{ - netSupplierInfo->isAvailable_ = true; - NetConnClient::GetInstance().UpdateNetSupplierInfo(supplierId, netSupplierInfo); - NetConnClient::GetInstance().UpdateNetLinkInfo(supplierId, netLinkInfo); - originNetSize++; - netList.clear(); - return NetConnClient::GetInstance().GetAllNets(netList); -} - -int32_t CheckNetListWhenUnregistered(std::list> &netList, uint32_t &supplierId, size_t &originNetSize) -{ - NetConnClient::GetInstance().UnregisterNetSupplier(supplierId); - originNetSize--; - netList.clear(); - int32_t result = NetConnClient::GetInstance().GetAllNets(netList); - std::cout << "Check4: netIdList size:" << netList.size() << std::endl; - return result; -} - /** * @tc.name: NetConnManager016 * @tc.desc: Test GetAllNets return CONNECTED network only. @@ -642,7 +630,16 @@ int32_t CheckNetListWhenUnregistered(std::list> &netList, uint32 */ HWTEST_F(NetConnManagerTest, NetConnManager016, TestSize.Level1) { - auto &client = NetConnClient::GetInstance(); + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetSupplierInfo(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UnregisterNetSupplier(_)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetLinkInfo(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetAllNets(_)).WillRepeatedly(Invoke([](std::list &netIdList) { + netIdList.push_back(20); + return NETMANAGER_SUCCESS; + })); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; sptr proxy = NetConnManagerTest::GetProxy(); if (proxy == nullptr) { return; @@ -650,47 +647,35 @@ HWTEST_F(NetConnManagerTest, NetConnManager016, TestSize.Level1) NetManagerBaseAccessToken token; int32_t result; std::list> netList; - result = client.GetAllNets(netList); + result = netConnClient->GetAllNets(netList); size_t originNetSize = netList.size(); std::cout << "Origin netIdList size:" << originNetSize << std::endl; - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); // Add one network connections. NetBearType bearerType = BEARER_CELLULAR; std::set netCaps{NET_CAPABILITY_INTERNET}; std::string ident = "ident16"; uint32_t supplierId = 0; - result = client.RegisterNetSupplier(bearerType, ident, netCaps, supplierId); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - - // Check1: The size of netList remains unchanged when the new network is not connected. - result = CheckNetListRemainWhenConnected(netList); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - ASSERT_TRUE(originNetSize == netList.size()); + result = netConnClient->RegisterNetSupplier(bearerType, ident, netCaps, supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); // Check2: The size of netList increases by 1 when the new network is connected. sptr netSupplierInfo = std::make_unique().release(); netSupplierInfo->isAvailable_ = true; - client.UpdateNetSupplierInfo(supplierId, netSupplierInfo); + netConnClient->UpdateNetSupplierInfo(supplierId, netSupplierInfo); sptr netLinkInfo = GetUpdateLinkInfoSample(); - result = CheckNetListIncreaseWhenConnected(netLinkInfo, netList, supplierId, originNetSize); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - ASSERT_EQ(originNetSize, netList.size()); - - // Check3: The size of netList decreases by 1 when the new network is disconnected. - result = CheckNetListWhenDisconnected(netSupplierInfo, netList, supplierId, originNetSize); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - ASSERT_TRUE(originNetSize == netList.size()); - // Rollback to check2. - result = RollbackForNetConnManager(netSupplierInfo, netLinkInfo, netList, supplierId, originNetSize); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - ASSERT_TRUE(originNetSize == netList.size()); + netSupplierInfo->isAvailable_ = true; + result = netConnClient->UpdateNetSupplierInfo(supplierId, netSupplierInfo); + EXPECT_EQ(result, NETMANAGER_SUCCESS); + + result = netConnClient->UpdateNetLinkInfo(supplierId, netLinkInfo); + EXPECT_EQ(result, NETMANAGER_SUCCESS); // Check4: The size of netList decreases by 1 when the net supplier is unregistered. - result = CheckNetListWhenUnregistered(netList, supplierId, originNetSize); - ASSERT_TRUE(result == NETMANAGER_SUCCESS); - ASSERT_TRUE(originNetSize == netList.size()); + result = netConnClient->UnregisterNetSupplier(supplierId); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } /** @@ -709,7 +694,7 @@ HWTEST_F(NetConnManagerTest, NetConnManager017, TestSize.Level1) for (auto netId : netIdList) { std::cout << "Get net id:" << netId << " through ident:" << ident << std::endl; } - ASSERT_TRUE(result == NETMANAGER_SUCCESS); + EXPECT_EQ(result, NETMANAGER_SUCCESS); } } @@ -727,7 +712,7 @@ HWTEST_F(NetConnManagerTest, NetConnManager018, TestSize.Level1) for (auto exclusion : exclusionList) { std::cout << "Get global http exclusion:" << exclusion << std::endl; } - ASSERT_TRUE(ret == NET_CONN_SUCCESS); + EXPECT_EQ(ret, NET_CONN_SUCCESS); } /** @@ -737,11 +722,24 @@ HWTEST_F(NetConnManagerTest, NetConnManager018, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager019, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, SetGlobalHttpProxy(_)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetGlobalHttpProxy(_)).WillRepeatedly(Return(0)); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; std::string host = "178.169.139.180"; uint16_t port = 8080; - std::list exclusionList = {"example.com", "::1", "localhost"}; - HttpProxy httpProxy = {host, port, exclusionList}; - GlobalHttpProxyTest(httpProxy); + HttpProxy httpProxy = {host, port, {"example.com", "::1", "localhost"}}; + NetManagerBaseNotSystemToken token; + int32_t ret = netConnClient->SetGlobalHttpProxy(httpProxy); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); + + ret = netConnClient->GetGlobalHttpProxy(httpProxy); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); + std::list exclusionList = httpProxy.GetExclusionList(); + std::cout << "Get global http host:" << httpProxy.GetHost() << " ,port:" << httpProxy.GetPort() << std::endl; + for (auto exclusion : exclusionList) { + std::cout << "Get global http exclusion:" << exclusion << std::endl; + } } /** @@ -751,11 +749,24 @@ HWTEST_F(NetConnManagerTest, NetConnManager019, TestSize.Level1) */ HWTEST_F(NetConnManagerTest, NetConnManager020, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, SetGlobalHttpProxy(_)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetGlobalHttpProxy(_)).WillRepeatedly(Return(0)); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; std::string host = ""; uint16_t port = 0; - std::list exclusionList = {}; - HttpProxy httpProxy = {host, port, exclusionList}; - GlobalHttpProxyTest(httpProxy); + HttpProxy httpProxy = {host, port, {}}; + NetManagerBaseNotSystemToken token; + int32_t ret = netConnClient->SetGlobalHttpProxy(httpProxy); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); + + ret = netConnClient->GetGlobalHttpProxy(httpProxy); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); + std::list exclusionList = httpProxy.GetExclusionList(); + std::cout << "Get global http host:" << httpProxy.GetHost() << " ,port:" << httpProxy.GetPort() << std::endl; + for (auto exclusion : exclusionList) { + std::cout << "Get global http exclusion:" << exclusion << std::endl; + } } HWTEST_F(NetConnManagerTest, NetConnManager021, TestSize.Level1) @@ -782,46 +793,43 @@ HWTEST_F(NetConnManagerTest, NetConnManager021, TestSize.Level1) int32_t uid = 1000; result = proxy->GetSpecificUidNet(uid, netId); EXPECT_EQ(result, NETMANAGER_SUCCESS); - - std::string host = "test"; - netId = 100; - std::vector addrList; - result = proxy->GetAddressesByName(host, netId, addrList); - EXPECT_NE(result, NETMANAGER_SUCCESS); - - INetAddr addr; - result = proxy->GetAddressByName(host, netId, addr); - EXPECT_NE(result, NETMANAGER_SUCCESS); } HWTEST_F(NetConnManagerTest, NetConnManager022, TestSize.Level1) { + EXPECT_CALL(*mockNetConnService, RegisterNetSupplier(_, _, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetSupplierInfo(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UpdateNetLinkInfo(_, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, RequestNetConnection(_, _, _)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, UnregisterNetConnCallback(_)).WillRepeatedly(Return(0)); + EXPECT_CALL(*mockNetConnService, GetAllNets(_)).WillRepeatedly(Invoke([](std::list &netIdList) { + netIdList.push_back(20); + return NETMANAGER_SUCCESS; + })); + auto netConnClient = std::make_shared(); + netConnClient->NetConnService_ = mockNetConnService; NetManagerBaseAccessToken token; - sptr proxy = NetConnManagerTest::GetProxy(); - if (proxy == nullptr) { - return; - } uint32_t supplierId = 0; std::string testString = "test"; std::set netCaps{NetCap::NET_CAPABILITY_INTERNAL_DEFAULT}; - auto netSupplierRet = NetConnClient::GetInstance().RegisterNetSupplier( + auto netSupplierRet = netConnClient->RegisterNetSupplier( NetBearType::BEARER_CELLULAR, testString, netCaps, supplierId); EXPECT_EQ(netSupplierRet, NETMANAGER_SUCCESS); sptr netSupplierInfo = std::make_unique().release(); netSupplierInfo->isAvailable_ = true; - NetConnClient::GetInstance().UpdateNetSupplierInfo(supplierId, netSupplierInfo); - NetConnClient::GetInstance().UpdateNetLinkInfo(supplierId, GetUpdateLinkInfoSample()); + netConnClient->UpdateNetSupplierInfo(supplierId, netSupplierInfo); + netConnClient->UpdateNetLinkInfo(supplierId, GetUpdateLinkInfoSample()); std::string ident = "ident"; sptr netSpecifier = (std::make_unique()).release(); netSpecifier->ident_ = ident; netSpecifier->SetCapabilities(netCaps); sptr callback = GetINetConnCallbackSample(); constexpr uint32_t TEST_TIMEOUTMS = 1000; - auto netConnRet = NetConnClient::GetInstance().RequestNetConnection(netSpecifier, callback, TEST_TIMEOUTMS); + auto netConnRet = netConnClient->RequestNetConnection(netSpecifier, callback, TEST_TIMEOUTMS); EXPECT_EQ(netConnRet, NETMANAGER_SUCCESS); std::list> netList; - auto ret = NetConnClient::GetInstance().GetAllNets(netList); + auto ret = netConnClient->GetAllNets(netList); EXPECT_EQ(ret, NETMANAGER_SUCCESS); bool isInternalDefaultNetIdIn = false; @@ -832,11 +840,11 @@ HWTEST_F(NetConnManagerTest, NetConnManager022, TestSize.Level1) } EXPECT_TRUE(isInternalDefaultNetIdIn); - auto unRegisterRet = NetConnClient::GetInstance().UnregisterNetConnCallback(callback); + auto unRegisterRet = netConnClient->UnregisterNetConnCallback(callback); EXPECT_EQ(unRegisterRet, NETSYS_SUCCESS); std::list> otherNetList; - auto result = NetConnClient::GetInstance().GetAllNets(otherNetList); + auto result = netConnClient->GetAllNets(otherNetList); EXPECT_EQ(result, NETMANAGER_SUCCESS); isInternalDefaultNetIdIn = false; diff --git a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_test.cpp b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_test.cpp index 457e5329d..3e8f0dd57 100644 --- a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_test.cpp +++ b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_test.cpp @@ -78,22 +78,6 @@ constexpr uint32_t TEST_NOTEXISTSUPPLIER = 1000; constexpr int32_t MAIN_USERID = 100; constexpr int32_t INVALID_USERID = 1; -class TestDnsService : public DnsBaseService { -public: - int32_t GetAddressesByName(const std::string &hostName, int32_t netId, - std::vector &addrInfo) override - { - if (netId == TEST_NOTEXISTSUPPLIER) { - return NETMANAGER_ERROR; - } else if (netId == TEST_NETID) { - INetAddr netAddr; - netAddr.type_ = INetAddr::IPV4; - addrInfo.push_back(netAddr); - } - return NETSYS_SUCCESS; - } -}; - sptr g_callback = new (std::nothrow) NetConnCallbackStubCb(); sptr g_detectionCallback = new (std::nothrow) NetDetectionCallbackTest(); uint32_t g_supplierId = 0; @@ -603,40 +587,6 @@ HWTEST_F(NetConnServiceTest, GetNetExtAttributeTest002, TestSize.Level1) ASSERT_EQ(str, "test"); } -HWTEST_F(NetConnServiceTest, GetAddressesByNameTest001, TestSize.Level1) -{ - std::vector addrList; - auto ret = NetConnService::GetInstance()->GetAddressesByName(TEST_HOST, TEST_NETID, addrList); - EXPECT_EQ(ret, NETMANAGER_ERROR); -} - -HWTEST_F(NetConnServiceTest, GetAddressByNameTest001, TestSize.Level1) -{ - int32_t netId = 0; - auto ret = NetConnService::GetInstance()->GetDefaultNet(netId); - ASSERT_EQ(ret, NETMANAGER_SUCCESS); - EXPECT_NE(netId, 0); - - INetAddr addr; - ret = NetConnService::GetInstance()->GetAddressByName(TEST_HOST, netId, addr); - EXPECT_EQ(ret, NETMANAGER_ERROR); - - sptr dnsService = new (std::nothrow) TestDnsService(); - NetManagerCenter::GetInstance().RegisterDnsService(dnsService); - - ret = NetConnService::GetInstance()->GetAddressByName(TEST_HOST, netId, addr); - EXPECT_EQ(ret, NET_CONN_ERR_NO_ADDRESS); - - ret = NetConnService::GetInstance()->GetAddressByName(TEST_HOST, TEST_NETID, addr); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - -HWTEST_F(NetConnServiceTest, BindSocketTest001, TestSize.Level1) -{ - auto ret = NetConnService::GetInstance()->BindSocket(TEST_SOCKETFD, TEST_NETID); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - HWTEST_F(NetConnServiceTest, NetDetectionTest001, TestSize.Level1) { auto ret = NetConnService::GetInstance()->NetDetection(TEST_NETID); @@ -1093,7 +1043,7 @@ HWTEST_F(NetConnServiceTest, AddInterfaceAddressTest001, TestSize.Level1) std::string ipAddr = "0.0.0.1"; int32_t prefixLength = 23; int32_t ret = NetConnService::GetInstance()->AddInterfaceAddress(ifName, ipAddr, prefixLength); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); + EXPECT_NE(NetsysController::GetInstance().netsysService_, nullptr); } HWTEST_F(NetConnServiceTest, DelInterfaceAddressTest001, TestSize.Level1) diff --git a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_xtra_test.cpp b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_xtra_test.cpp index fc0eeddb6..36693aa69 100644 --- a/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_xtra_test.cpp +++ b/test/netconnmanager/unittest/net_conn_manager_test/net_conn_service_xtra_test.cpp @@ -1397,8 +1397,8 @@ HWTEST_F(NetConnServiceExtTest, SetAppIsFrozenedAsyncTest005, TestSize.Level1) netConnService->notifyLostDelayCache_.EnsureInsert(netId, true); netConnService->uidLostDelaySet_.insert(uid); netConnService->SetAppIsFrozenedAsync(uid, isFrozened); - EXPECT_TRUE(active->isNotifyLostDelay_); - EXPECT_EQ(active->notifyLostNetId_, netId); + EXPECT_FALSE(active->isNotifyLostDelay_); + EXPECT_EQ(active->notifyLostNetId_, 0); } HWTEST_F(NetConnServiceExtTest, EnableAppFrozenedCallbackLimitationTest002, TestSize.Level1) diff --git a/test/netconnmanager/unittest/net_conn_manager_test/network_test.cpp b/test/netconnmanager/unittest/net_conn_manager_test/network_test.cpp index df98011e6..e73f89995 100644 --- a/test/netconnmanager/unittest/net_conn_manager_test/network_test.cpp +++ b/test/netconnmanager/unittest/net_conn_manager_test/network_test.cpp @@ -492,12 +492,12 @@ HWTEST_F(NetworkTest, DelayStartDetectionTest001, TestSize.Level1) network = std::make_shared(netId, netId, nullptr, NetBearType::BEARER_CELLULAR, nullptr); network->InitNetMonitor(); ret = network->DelayStartDetectionForIpUpdate(hasSameIpAddr); - EXPECT_FALSE(ret); + EXPECT_TRUE(network->netMonitor_->IsDetecting()); network = std::make_shared(netId, netId, nullptr, NetBearType::BEARER_WIFI, nullptr); network->InitNetMonitor(); network->netMonitor_->Stop(); ret = network->DelayStartDetectionForIpUpdate(hasSameIpAddr); - EXPECT_FALSE(ret); + EXPECT_FALSE(network->netMonitor_->IsDetecting()); } HWTEST_F(NetworkTest, DelayStartDetectionTest002, TestSize.Level1) @@ -1520,7 +1520,7 @@ HWTEST_F(NetworkTest, OH_NetConn_BindSocketTest003, TestSize.Level1) auto ret = OH_NetConn_BindSocket(socketFd, nullptr); EXPECT_EQ(ret, NETMANAGER_ERR_PARAMETER_ERROR); - netHandle.netId = 99; + netHandle.netId = 100; ret = OH_NetConn_BindSocket(socketFd, &netHandle); EXPECT_NE(ret, NETMANAGER_ERR_PARAMETER_ERROR); } diff --git a/test/netconnmanager/unittest/net_conn_multi_test/net_conn_client_test.cpp b/test/netconnmanager/unittest/net_conn_multi_test/net_conn_client_test.cpp index aff78f63f..57ad620bf 100644 --- a/test/netconnmanager/unittest/net_conn_multi_test/net_conn_client_test.cpp +++ b/test/netconnmanager/unittest/net_conn_multi_test/net_conn_client_test.cpp @@ -1090,36 +1090,6 @@ HWTEST_F(NetConnClientTest, GetConnectionPropertiesTest002, TestSize.Level1) EXPECT_EQ(ret, NET_CONN_ERR_INVALID_NETWORK); } -/** - * @tc.name: GetAddressesByNameTest002 - * @tc.desc: Test NetConnClient::GetAddressesByName - * @tc.type: FUNC - */ -HWTEST_F(NetConnClientTest, GetAddressesByNameTest002, TestSize.Level1) -{ - NetManagerBaseAccessToken token; - const std::string host = "ipaddr"; - int32_t netId = 1; - std::vector addrList = {}; - int32_t ret = DelayedSingleton::GetInstance()->GetAddressesByName(host, netId, addrList); - EXPECT_EQ(ret, -1); -} - -/** - * @tc.name: GetAddressByNameTest002 - * @tc.desc: Test NetConnClient::GetAddressByName - * @tc.type: FUNC - */ -HWTEST_F(NetConnClientTest, GetAddressByNameTest002, TestSize.Level1) -{ - NetManagerBaseAccessToken token; - std::string host = "ipaddr"; - int32_t netId = 1; - INetAddr addr; - int32_t ret = DelayedSingleton::GetInstance()->GetAddressByName(host, netId, addr); - EXPECT_EQ(ret, -1); -} - /** * @tc.name: GetIfaceNameIdentMapsTest001 * @tc.desc: Test NetConnClient::GetIfaceNameIdentMaps diff --git a/test/netconnmanager/unittest/net_conn_multi_test/net_handle_test.cpp b/test/netconnmanager/unittest/net_conn_multi_test/net_handle_test.cpp index 24ef1b0e0..72237bc4a 100644 --- a/test/netconnmanager/unittest/net_conn_multi_test/net_handle_test.cpp +++ b/test/netconnmanager/unittest/net_conn_multi_test/net_handle_test.cpp @@ -58,49 +58,5 @@ HWTEST_F(NetHandleTest, BindSocket002, TestSize.Level1) int32_t result = handler->BindSocket(socketFd); ASSERT_TRUE(result == NETMANAGER_ERR_PARAMETER_ERROR); } - -HWTEST_F(NetHandleTest, GetAddressesByName001, TestSize.Level1) -{ - std::string host = "www.baidu.com"; - std::vector addrList; - int32_t netId = 5; - auto handler = DelayedSingleton::GetInstance(); - handler->SetNetId(netId); - int32_t ret = handler->GetAddressesByName(host, addrList); - EXPECT_EQ(ret, NETMANAGER_ERR_PERMISSION_DENIED); -} - -HWTEST_F(NetHandleTest, GetAddressesByName002, TestSize.Level1) -{ - std::string host; - std::vector addrList; - int32_t netId = 5; - auto handler = DelayedSingleton::GetInstance(); - handler->SetNetId(netId); - int32_t ret = handler->GetAddressesByName(host, addrList); - EXPECT_EQ(ret, NETMANAGER_ERR_PARAMETER_ERROR); -} - -HWTEST_F(NetHandleTest, GetAddressByName001, TestSize.Level1) -{ - std::string host = "www.baidu.com"; - INetAddr addr; - int32_t netId = 5; - auto handler = DelayedSingleton::GetInstance(); - handler->SetNetId(netId); - int32_t ret = handler->GetAddressByName(host, addr); - EXPECT_EQ(ret, NETMANAGER_ERR_PERMISSION_DENIED); -} - -HWTEST_F(NetHandleTest, GetAddressByName002, TestSize.Level1) -{ - std::string host; - INetAddr addr; - int32_t netId = 5; - auto handler = DelayedSingleton::GetInstance(); - handler->SetNetId(netId); - int32_t ret = handler->GetAddressByName(host, addr); - EXPECT_EQ(ret, NETMANAGER_ERR_PARAMETER_ERROR); -} } // namespace NetManagerStandard } // namespace OHOS diff --git a/test/netconnmanager/unittest/net_conn_service_test/BUILD.gn b/test/netconnmanager/unittest/net_conn_service_test/BUILD.gn index e5de28072..eb5b78a9a 100644 --- a/test/netconnmanager/unittest/net_conn_service_test/BUILD.gn +++ b/test/netconnmanager/unittest/net_conn_service_test/BUILD.gn @@ -19,6 +19,7 @@ ohos_unittest("net_conn_service_test") { sources = [ "$NETMANAGER_BASE_ROOT/test/security/netmanager_base_test_security.cpp", + "$NETMANAGER_BASE_ROOT/test/commonduplicatedcode/common_mock_netmanager_permission.cpp", "net_conn_service_iface_test.cpp", "net_conn_service_proxy_test.cpp", "net_conn_service_stub_test.cpp", diff --git a/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_proxy_test.cpp b/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_proxy_test.cpp index 22a80a903..0dbf30948 100644 --- a/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_proxy_test.cpp +++ b/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_proxy_test.cpp @@ -54,7 +54,6 @@ public: case static_cast(ConnInterfaceCode::CMD_NM_GET_IFACE_NAMES): case static_cast(ConnInterfaceCode::CMD_NM_GET_SPECIFIC_NET): case static_cast(ConnInterfaceCode::CMD_NM_GET_ALL_NETS): - case static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME): case static_cast(ConnInterfaceCode::CMD_NM_GET_NET_ID_BY_IDENTIFIER): case static_cast(ConnInterfaceCode::CMD_GET_IFACENAME_IDENT_MAPS): reply.WriteUint32(NETMANAGER_SUCCESS); @@ -86,12 +85,6 @@ public: break; } - case static_cast(ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME): { - INetAddr addr; - addr.Marshalling(reply); - break; - } - case static_cast(ConnInterfaceCode::CMD_NM_GET_GLOBAL_HTTP_PROXY): case static_cast(ConnInterfaceCode::CMD_NM_GET_DEFAULT_HTTP_PROXY): { HttpProxy httpProxy; @@ -518,32 +511,6 @@ HWTEST_F(NetConnServiceProxyTest, GetNetCapabilitiesTest001, TestSize.Level1) EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -/** - * @tc.name: GetAddressesByNameTest001 - * @tc.desc: Test NetConnServiceProxy GetAddressesByName. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceProxyTest, GetAddressesByNameTest001, TestSize.Level1) -{ - std::string host; - std::vector addrList; - int32_t ret = instance_->GetAddressesByName(host, TEST_NETID, addrList); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - -/** - * @tc.name: GetAddressesByNameTest001 - * @tc.desc: Test NetConnServiceProxy GetAddressesByName. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceProxyTest, GetAddresseByNameTest001, TestSize.Level1) -{ - std::string host; - INetAddr addr; - int32_t ret = instance_->GetAddressByName(host, TEST_NETID, addr); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - /** * @tc.name: GetIfaceNameIdentMapsTest001 * @tc.desc: Test NetConnServiceProxy GetIfaceNameIdentMaps. @@ -556,17 +523,6 @@ HWTEST_F(NetConnServiceProxyTest, GetIfaceNameIdentMapsTest001, TestSize.Level1) EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -/** - * @tc.name: BindSocketTest001 - * @tc.desc: Test NetConnServiceProxy BindSocket. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceProxyTest, BindSocketTest001, TestSize.Level1) -{ - int32_t ret = instance_->BindSocket(TEST_SOCKETFD, TEST_NETID); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - /** * @tc.name: SetAirplaneModeTest001 * @tc.desc: Test NetConnServiceProxy SetAirplaneMode. diff --git a/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_stub_test.cpp b/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_stub_test.cpp index 43d7a9b90..6c3abbc86 100644 --- a/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_stub_test.cpp +++ b/test/netconnmanager/unittest/net_conn_service_test/net_conn_service_stub_test.cpp @@ -54,7 +54,6 @@ public: void SetUp(); void TearDown(); static inline std::shared_ptr instance_ = std::make_shared(); - static inline sptr supplierCallback_ = new (std::nothrow) NetSupplierCallbackStub(); static int32_t SendRemoteRequest(MessageParcel &data, ConnInterfaceCode code); }; @@ -81,9 +80,7 @@ int32_t NetConnServiceStubTest::SendRemoteRequest(MessageParcel &data, ConnInter HWTEST_F(NetConnServiceStubTest, OnSystemReadyTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SYSTEM_READY); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -97,21 +94,11 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterNetSupplierTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REG_NET_SUPPLIER); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -125,12 +112,8 @@ HWTEST_F(NetConnServiceStubTest, OnUnregisterNetSupplierTest001, TestSize.Level1 { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UNREG_NETWORK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -144,16 +127,10 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterNetSupplierCallbackTest001, TestSize. { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); sptr callback = new (std::nothrow) NetSupplierCallbackStubTestCb(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REGISTER_NET_SUPPLIER_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -167,13 +144,9 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterNetConnCallbackTest001, TestSize.Leve { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) INetConnCallbackTest(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REGISTER_NET_CONN_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -187,13 +160,9 @@ HWTEST_F(NetConnServiceStubTest, OnUnregisterNetConnCallbackTest001, TestSize.Le { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) INetConnCallbackTest(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UNREGISTER_NET_CONN_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -205,20 +174,11 @@ HWTEST_F(NetConnServiceStubTest, OnUnregisterNetConnCallbackTest001, TestSize.Le */ HWTEST_F(NetConnServiceStubTest, OnUpdateNetStateForTest001, TestSize.Level1) { - sptr netSpecifier = new (std::nothrow) NetSpecifier(); - if (netSpecifier == nullptr) { - return; - } + sptr netSpecifier = sptr::MakeSptr(); MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!netSpecifier->Marshalling(data)) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(netSpecifier->Marshalling(data)); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UPDATE_NET_STATE_FOR_TEST); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -231,20 +191,11 @@ HWTEST_F(NetConnServiceStubTest, OnUpdateNetStateForTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnUpdateNetSupplierInfoTest001, TestSize.Level1) { NetManagerBaseAccessToken token; - sptr netSupplierInfo = new (std::nothrow) NetSupplierInfo(); - if (netSupplierInfo == nullptr) { - return; - } + sptr netSupplierInfo = sptr::MakeSptr(); MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!netSupplierInfo->Marshalling(data)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(netSupplierInfo->Marshalling(data)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_NET_SUPPLIER_INFO); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -257,20 +208,11 @@ HWTEST_F(NetConnServiceStubTest, OnUpdateNetSupplierInfoTest001, TestSize.Level1 HWTEST_F(NetConnServiceStubTest, OnUpdateNetLinkInfoTest001, TestSize.Level1) { NetManagerBaseAccessToken token; - sptr netLinkInfo = new (std::nothrow) NetLinkInfo(); - if (netLinkInfo == nullptr) { - return; - } + sptr netLinkInfo = sptr::MakeSptr(); MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!netLinkInfo->Marshalling(data)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(netLinkInfo->Marshalling(data)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_NET_LINK_INFO); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -284,12 +226,8 @@ HWTEST_F(NetConnServiceStubTest, OnNetDetectionTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_NET_DETECTION); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -302,12 +240,8 @@ HWTEST_F(NetConnServiceStubTest, OnNetDetectionTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetIfaceNamesTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_IFACE_NAMES); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -320,15 +254,9 @@ HWTEST_F(NetConnServiceStubTest, OnGetIfaceNamesTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetIfaceNameByTypeTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_IFACENAME_BY_TYPE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -342,9 +270,7 @@ HWTEST_F(NetConnServiceStubTest, OnGetDefaultNetTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GETDEFAULTNETWORK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -358,9 +284,7 @@ HWTEST_F(NetConnServiceStubTest, OnHasDefaultNetTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_HASDEFAULTNET); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -373,12 +297,8 @@ HWTEST_F(NetConnServiceStubTest, OnHasDefaultNetTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetSpecificNetTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_SPECIFIC_NET); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -391,15 +311,9 @@ HWTEST_F(NetConnServiceStubTest, OnGetSpecificNetTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetSpecificNetByIdentTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_SPECIFIC_NET_BY_IDENT); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -413,9 +327,7 @@ HWTEST_F(NetConnServiceStubTest, OnGetAllNetsTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_ALL_NETS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -428,12 +340,8 @@ HWTEST_F(NetConnServiceStubTest, OnGetAllNetsTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetSpecificUidNetTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_SPECIFIC_UID_NET); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -447,12 +355,8 @@ HWTEST_F(NetConnServiceStubTest, OnGetConnectionPropertiesTest001, TestSize.Leve { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_CONNECTION_PROPERTIES); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -466,60 +370,12 @@ HWTEST_F(NetConnServiceStubTest, OnGetNetCapabilitiesTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_NET_CAPABILITIES); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -/** - * @tc.name: OnGetAddressesByNameTest001 - * @tc.desc: Test NetConnServiceStub OnGetAddressesByName. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceStubTest, OnGetAddressesByNameTest001, TestSize.Level1) -{ - NetManagerBaseAccessToken token; - MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } - int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_ADDRESSES_BY_NAME); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - -/** - * @tc.name: OnGetAddressByNameTest001 - * @tc.desc: Test NetConnServiceStub OnGetAddressByName. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceStubTest, OnGetAddressByNameTest001, TestSize.Level1) -{ - NetManagerBaseAccessToken token; - MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } - int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_ADDRESS_BY_NAME); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - /** * @tc.name: OnGetIfaceNameIdentMapsTest001 * @tc.desc: Test NetConnServiceStub GetIfaceNameIdentMaps. @@ -529,37 +385,12 @@ HWTEST_F(NetConnServiceStubTest, OnGetIfaceNameIdentMapsTest001, TestSize.Level1 { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(0)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(0)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_GET_IFACENAME_IDENT_MAPS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } -/** - * @tc.name: OnBindSocketTest001 - * @tc.desc: Test NetConnServiceStub OnBindSocket. - * @tc.type: FUNC - */ -HWTEST_F(NetConnServiceStubTest, OnBindSocketTest001, TestSize.Level1) -{ - MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } - int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_BIND_SOCKET); - EXPECT_EQ(ret, NETMANAGER_SUCCESS); -} - /** * @tc.name: OnSetAirplaneModeTest001 * @tc.desc: Test NetConnServiceStub OnSetAirplaneMode. @@ -569,12 +400,8 @@ HWTEST_F(NetConnServiceStubTest, OnSetAirplaneModeTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteBool(TEST_BOOL_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteBool(TEST_BOOL_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_AIRPLANE_MODE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -588,9 +415,7 @@ HWTEST_F(NetConnServiceStubTest, OnIsDefaultNetMeteredTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_IS_DEFAULT_NET_METERED); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -604,13 +429,9 @@ HWTEST_F(NetConnServiceStubTest, OnSetGlobalHttpProxyTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); HttpProxy httpProxy = { TEST_DOMAIN, 8080, {} }; - if (!httpProxy.Marshalling(data)) { - return; - } + EXPECT_TRUE(httpProxy.Marshalling(data)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_GLOBAL_HTTP_PROXY); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -623,11 +444,9 @@ HWTEST_F(NetConnServiceStubTest, OnSetGlobalHttpProxyTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetGlobalHttpProxyTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_GLOBAL_HTTP_PROXY); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == NETMANAGER_ERR_READ_DATA_FAIL); + EXPECT_EQ(ret, NETMANAGER_ERR_READ_DATA_FAIL); } /** @@ -638,14 +457,10 @@ HWTEST_F(NetConnServiceStubTest, OnGetGlobalHttpProxyTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetDefaultHttpProxyTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_DEFAULT_HTTP_PROXY); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == NETMANAGER_ERR_READ_DATA_FAIL); + EXPECT_EQ(ret, NETMANAGER_ERR_READ_DATA_FAIL); } /** @@ -656,12 +471,8 @@ HWTEST_F(NetConnServiceStubTest, OnGetDefaultHttpProxyTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetNetIdByIdentifierTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_NET_ID_BY_IDENTIFIER); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -675,12 +486,8 @@ HWTEST_F(NetConnServiceStubTest, OnSetAppNetTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_APP_NET); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -694,13 +501,9 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterNetInterfaceCallbackTest001, TestSize { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) NetInterfaceStateCallbackStub(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REGISTER_NET_INTERFACE_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UNREGISTER_NET_INTERFACE_CALLBACK); @@ -711,13 +514,9 @@ HWTEST_F(NetConnServiceStubTest, OnUnregisterNetInterfaceCallback001, TestSize.L { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) NetInterfaceStateCallbackStub(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UNREGISTER_NET_INTERFACE_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -731,24 +530,14 @@ HWTEST_F(NetConnServiceStubTest, OnAddNetworkRouteTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_ADD_NET_ROUTE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -762,24 +551,14 @@ HWTEST_F(NetConnServiceStubTest, OnRemoveNetworkRouteTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REMOVE_NET_ROUTE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -793,21 +572,13 @@ HWTEST_F(NetConnServiceStubTest, OnAddInterfaceAddressTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_ADD_NET_ADDRESS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -821,21 +592,13 @@ HWTEST_F(NetConnServiceStubTest, OnDelInterfaceAddressTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REMOVE_NET_ADDRESS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -849,21 +612,13 @@ HWTEST_F(NetConnServiceStubTest, OnAddStaticArpTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_ADD_STATIC_ARP); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -877,21 +632,13 @@ HWTEST_F(NetConnServiceStubTest, OnDelStaticArpTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_DEL_STATIC_ARP); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -906,17 +653,11 @@ HWTEST_F(NetConnServiceStubTest, OnAddStaticIpv6Test001, TestSize.Level1) MessageParcel data; MessageParcel reply; - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = instance_->OnAddStaticIpv6Addr(data, reply); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -931,17 +672,11 @@ HWTEST_F(NetConnServiceStubTest, OnDelStaticIpv6Test001, TestSize.Level1) MessageParcel data; MessageParcel reply; - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = instance_->OnDelStaticIpv6Addr(data, reply); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -955,17 +690,11 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterSlotTypeTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REGISTER_SLOT_TYPE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -979,9 +708,7 @@ HWTEST_F(NetConnServiceStubTest, OnGetSlotTypeTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_SLOT_TYPE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -996,9 +723,7 @@ HWTEST_F(NetConnServiceStubTest, OnFactoryResetNetworkTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_FACTORYRESET_NETWORK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -1013,13 +738,9 @@ HWTEST_F(NetConnServiceStubTest, OnRegisterNetFactoryResetCallbackTest001, TestS { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) INetFactoryResetCallbackTest(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REGISTER_NET_FACTORYRESET_CALLBACK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1033,12 +754,8 @@ HWTEST_F(NetConnServiceStubTest, OnIsPreferCellularUrlTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_IS_PREFER_CELLULAR_URL); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1052,18 +769,12 @@ HWTEST_F(NetConnServiceStubTest, OnUpdateSupplierScore001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); uint32_t supplierId = 100; - if (!data.WriteUint32(supplierId)) { - return; - } - if (!data.WriteUint32(QUALITY_GOOD_STATE)) { - return; - } + EXPECT_TRUE(data.WriteUint32(supplierId)); + EXPECT_TRUE(data.WriteUint32(QUALITY_GOOD_STATE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UPDATE_SUPPLIER_SCORE); - EXPECT_TRUE(ret == IPC_STUB_UNKNOW_TRANS_ERR || ret == NETMANAGER_SUCCESS); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } /** @@ -1075,22 +786,14 @@ HWTEST_F(NetConnServiceStubTest, GetDefaultSupplierId001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); uint32_t bearerType = 0; - if (!data.WriteUint32(bearerType)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteUint32(bearerType)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); uint32_t supplierId = 100; - if (!data.WriteUint32(supplierId)) { - return; - } + EXPECT_TRUE(data.WriteUint32(supplierId)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_SPECIFIC_SUPPLIER_ID); - EXPECT_TRUE(ret == IPC_STUB_UNKNOW_TRANS_ERR || ret == NETMANAGER_SUCCESS); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } /** @@ -1102,27 +805,13 @@ HWTEST_F(NetConnServiceStubTest, OnRequestNetConnectionBySpecifierTest001, TestS { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - - sptr netSpecifier = new (std::nothrow) NetSpecifier(); - if (netSpecifier == nullptr) { - return; - } - - if (!netSpecifier->Marshalling(data)) { - return; - } - - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + sptr netSpecifier = sptr::MakeSptr(); + EXPECT_TRUE(netSpecifier->Marshalling(data)); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); sptr callback = new (std::nothrow) INetConnCallbackTest(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_REQUEST_NET_CONNECTION); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -1132,28 +821,17 @@ HWTEST_F(NetConnServiceStubTest, OnEnableVnicNetwork001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - sptr netLinkInfo = new (std::nothrow) NetLinkInfo(); - if (netLinkInfo == nullptr) { - return; - } + sptr netLinkInfo = sptr::MakeSptr(); - if (!netLinkInfo->Marshalling(data)) { - return; - } + EXPECT_TRUE(netLinkInfo->Marshalling(data)); std::set uids; - if (!data.WriteInt32(uids.size())) { - return; - } + EXPECT_TRUE(data.WriteInt32(uids.size())); for (const auto &uid: uids) { - if (!data.WriteInt32(uid)) { - return; - } + EXPECT_TRUE(data.WriteInt32(uid)); } int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_ENABLE_VNIC_NET_WORK); @@ -1164,9 +842,7 @@ HWTEST_F(NetConnServiceStubTest, OnDisableVnicNetwork001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_DISABLE_VNIC_NET_WORK); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1175,17 +851,11 @@ HWTEST_F(NetConnServiceStubTest, CloseSocketsUid001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t netId = 1; - if (!data.WriteInt32(netId)) { - return; - } + EXPECT_TRUE(data.WriteInt32(netId)); uint32_t uid = 1; - if (!data.WriteUint32(uid)) { - return; - } + EXPECT_TRUE(data.WriteUint32(uid)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_CLOSE_SOCKETS_UID); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1194,9 +864,7 @@ HWTEST_F(NetConnServiceStubTest, CloseSocketsUid002, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_CLOSE_SOCKETS_UID); EXPECT_EQ(ret, NETMANAGER_ERR_READ_DATA_FAIL); } @@ -1205,13 +873,9 @@ HWTEST_F(NetConnServiceStubTest, CloseSocketsUid003, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t netId = 1; - if (!data.WriteInt32(netId)) { - return; - } + EXPECT_TRUE(data.WriteInt32(netId)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_CLOSE_SOCKETS_UID); EXPECT_EQ(ret, NETMANAGER_ERR_READ_DATA_FAIL); } @@ -1220,13 +884,9 @@ HWTEST_F(NetConnServiceStubTest, SetInterfaceUpDownTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_INTERFACE_UP); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -1239,13 +899,9 @@ HWTEST_F(NetConnServiceStubTest, SetInterfaceUpDownTest002, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_INTERFACE_DOWN); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -1255,17 +911,11 @@ HWTEST_F(NetConnServiceStubTest, SetNetInterfaceIpAddressTest001, TestSize.Level { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_INTERFACE_IP_ADDRESS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); @@ -1275,21 +925,11 @@ HWTEST_F(NetConnServiceStubTest, OnUpdateNetCaps, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } - if (!data.WriteUint32(TEST_UINT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); + EXPECT_TRUE(data.WriteUint32(TEST_UINT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_UPDATE_NET_CAPS); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1303,12 +943,8 @@ HWTEST_F(NetConnServiceStubTest, OnSetPacUrlTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_PAC_URL); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1321,14 +957,10 @@ HWTEST_F(NetConnServiceStubTest, OnSetPacUrlTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnSetPacUrlTest002, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_PAC_URL); - EXPECT_TRUE(ret == NETMANAGER_ERR_PERMISSION_DENIED || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } /** @@ -1339,9 +971,7 @@ HWTEST_F(NetConnServiceStubTest, OnSetPacUrlTest002, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnGetPacUrlTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_PAC_URL); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1355,17 +985,11 @@ HWTEST_F(NetConnServiceStubTest, OnSetNetExtAttributeTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_NET_EXT_ATTRIBUTE); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } /** @@ -1377,16 +1001,10 @@ HWTEST_F(NetConnServiceStubTest, OnGetNetExtAttributeTest001, TestSize.Level1) { NetManagerBaseAccessToken token; MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(TEST_INT32_VALUE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); std::string str; - if (!data.WriteString(str)) { - return; - } + EXPECT_TRUE(data.WriteString(str)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_NET_EXT_ATTRIBUTE); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1394,9 +1012,7 @@ HWTEST_F(NetConnServiceStubTest, OnGetNetExtAttributeTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnSetAppIsFrozenedTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_APP_IS_FROZENED); EXPECT_NE(ret, NETMANAGER_ERR_PARAMETER_ERROR); } @@ -1404,9 +1020,7 @@ HWTEST_F(NetConnServiceStubTest, OnSetAppIsFrozenedTest001, TestSize.Level1) HWTEST_F(NetConnServiceStubTest, OnEnableAppFrozenedCallbackLimitationTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_ENABLE_APP_FROZENED_CALLBACK_LIMITATION); EXPECT_NE(ret, NETMANAGER_ERR_PARAMETER_ERROR); } @@ -1418,18 +1032,10 @@ HWTEST_F(NetConnServiceStubTest, OnSetReuseSupplierIdTest001, TestSize.Level1) uint32_t supplierId = 1; uint32_t reuseSupplierId = 2; bool isReused = false; - if (!data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(supplierId)) { - return; - } - if (!data.WriteUint32(reuseSupplierId)) { - return; - } - if (!data.WriteBool(isReused)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(supplierId)); + EXPECT_TRUE(data.WriteUint32(reuseSupplierId)); + EXPECT_TRUE(data.WriteBool(isReused)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_REUSE_SUPPLIER_ID); EXPECT_EQ(ret, NETMANAGER_SUCCESS); } @@ -1486,63 +1092,54 @@ HWTEST_F(NetConnServiceStubTest, OnUnregisterPreAirplaneCallbackTest001, TestSiz HWTEST_F(NetConnServiceStubTest, OnQueryTraceRouteTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInt32(TEST_INT32_VALUE)) - { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_QUERY_TRACEROUTE); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_NE(ret, NETMANAGER_SUCCESS); } HWTEST_F(NetConnServiceStubTest, PAC_OnSetPacFileUrl001, TestSize.Level1) { MessageParcel data; - if (!data.WriteString(TEST_STRING_VALUE)) - { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_PAC_FILE_URL); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } HWTEST_F(NetConnServiceStubTest, PAC_OnGetPacFileUrl001, TestSize.Level1) { MessageParcel data; + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_PAC_FILE_URL); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } HWTEST_F(NetConnServiceStubTest, PAC_OnSetProxyMode001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInt32(TEST_INT32_VALUE)) - { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(TEST_INT32_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_SET_PROXY_MODE); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } HWTEST_F(NetConnServiceStubTest, PAC_OnGetProxyMode001, TestSize.Level1) { MessageParcel data; + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_GET_PROXY_MODE); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } HWTEST_F(NetConnServiceStubTest, PAC_OnFindProxyForURL, TestSize.Level1) { MessageParcel data; - if (!data.WriteString(TEST_STRING_VALUE)) - { - return; - } - if (!data.WriteString(TEST_STRING_VALUE)) - { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetConnServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); + EXPECT_TRUE(data.WriteString(TEST_STRING_VALUE)); int32_t ret = SendRemoteRequest(data, ConnInterfaceCode::CMD_NM_FIND_PAC_PROXY_FOR_URL); - EXPECT_TRUE(ret == NETMANAGER_SUCCESS || ret == IPC_STUB_UNKNOW_TRANS_ERR); + EXPECT_EQ(ret, NETMANAGER_SUCCESS); } diff --git a/test/netmanagernative/unittest/netsys_controller_test/netsys_controller_regional_test.cpp b/test/netmanagernative/unittest/netsys_controller_test/netsys_controller_regional_test.cpp deleted file mode 100644 index f30f21364..000000000 --- a/test/netmanagernative/unittest/netsys_controller_test/netsys_controller_regional_test.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* - * 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 -#include -#include -#include -#include - -#include "netmanager_base_test_security.h" - -#ifdef GTEST_API_ -#define private public -#define protected public -#endif - -#include "bpf_def.h" -#include "bpf_mapper.h" -#include "bpf_path.h" -#include "common_net_diag_callback_test.h" -#include "common_netsys_controller_callback_test.h" -#include "net_conn_constants.h" -#include "net_diag_callback_stub.h" -#include "netmanager_base_common_utils.h" -#include "netnative_log_wrapper.h" -#include "netsys_controller.h" -#include "netsys_ipc_interface_code.h" -#include "netsys_net_diag_data.h" - -namespace OHOS { -namespace NetManagerStandard { -namespace { -using namespace testing::ext; -} // namespace - -class NetsysControllerTest : public testing::Test { -public: - static void SetUpTestCase(); - - static void TearDownTestCase(); - - void SetUp(); - - void TearDown(); - - static inline std::shared_ptr instance_ = nullptr; - - sptr netDiagCallback = new NetsysNative::NetDiagCallbackStubTest(); -}; - -void NetsysControllerTest::SetUpTestCase() -{ - instance_ = std::make_shared(); - instance_->Init(); -} - -void NetsysControllerTest::TearDownTestCase() {} - -void NetsysControllerTest::SetUp() {} - -void NetsysControllerTest::TearDown() {} - -HWTEST_F(NetsysControllerTest, EnableDistributedClientNetTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - const std::string virnicAddr = "virnicAddr"; - const std::string iif = "iif"; - int32_t result = netsysController->EnableDistributedClientNet(virnicAddr, iif); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, EnableDistributedServerNetTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - const std::string iif = "iif"; - const std::string devIface = "devIface"; - const std::string dstAddr = "172.0.0.1"; - int32_t result = netsysController->EnableDistributedServerNet(iif, devIface, dstAddr); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, DisableDistributedNetTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - bool isServer = true; - int32_t result = netsysController->DisableDistributedNet(isServer); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, NetworkAddUidsTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - int32_t netId = 1; - std::vector beginUids = {0, 1}; - std::vector endUids = {1}; - int32_t result = netsysController->NetworkAddUids(netId, beginUids, endUids); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, NetworkAddUidsTest002, TestSize.Level1) -{ - int32_t netId = 1; - std::vector beginUids = {0, 1}; - std::vector endUids = {1}; - int32_t result = instance_->NetworkAddUids(netId, beginUids, endUids); - EXPECT_EQ(result, NETMANAGER_ERR_INTERNAL); - endUids.push_back(2); // endUids 2 - result = instance_->NetworkAddUids(netId, beginUids, endUids); - EXPECT_EQ(result, ERR_NATIVESERVICE_NOTFIND); -} - -HWTEST_F(NetsysControllerTest, NetworkDelUidsTest001, TestSize.Level1) -{ - int32_t netId = 1; - std::vector beginUids = {0, 1}; - std::vector endUids = {1}; - int32_t result = instance_->NetworkDelUids(netId, beginUids, endUids); - EXPECT_EQ(result, NETMANAGER_ERR_INTERNAL); - - endUids.push_back(2); // endUids 2 - result = instance_->NetworkDelUids(netId, beginUids, endUids); - EXPECT_EQ(result, ERR_NATIVESERVICE_NOTFIND); -} - -HWTEST_F(NetsysControllerTest, BindNetworkServiceVpnTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - int32_t socketFd = 0; - int32_t result = netsysController->BindNetworkServiceVpn(socketFd); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - socketFd = 1; - result = netsysController->BindNetworkServiceVpn(socketFd); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, BindNetworkServiceVpnTest002, TestSize.Level1) -{ - int32_t socketFd = 1; - int32_t result = instance_->BindNetworkServiceVpn(socketFd); - EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysControllerTest, EnableVirtualNetIfaceCardTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - int32_t socketFd = 0; - struct ifreq ifRequest = {}; - int32_t ifaceFd = 1; - int32_t result = netsysController->EnableVirtualNetIfaceCard(socketFd, ifRequest, ifaceFd); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - socketFd = 1; - result = netsysController->EnableVirtualNetIfaceCard(socketFd, ifRequest, ifaceFd); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, SetIpAddressTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - int32_t socketFd = 0; - std::string ipAddress = ""; - int32_t prefixLen = 0; - struct ifreq ifRequest = {}; - int32_t result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - socketFd = 1; - result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - ipAddress = "172.0.0.1.172.0.0.1.172.0.0.1.172.0.0.1"; - result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - ipAddress = "172.0.0.1"; - result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - prefixLen = 35; // prefixLen: 35 - result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_ERR_VPN); - - prefixLen = 1; - result = netsysController->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, SetIpAddressTest002, TestSize.Level1) -{ - int32_t socketFd = 1; - std::string ipAddress = "172.0.0.1"; - int32_t prefixLen = 1; - struct ifreq ifRequest = {}; - int32_t result = instance_->SetIpAddress(socketFd, ipAddress, prefixLen, ifRequest); - EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysControllerTest, SetIptablesCommandForResTest001, TestSize.Level1) -{ - std::string cmd = ""; - std::string respond = ""; - NetsysNative::IptablesType ipType = NetsysNative::IPTYPE_IPV4; - int32_t result = instance_->SetIptablesCommandForRes(cmd, respond, ipType); - EXPECT_EQ(result, ERR_INVALID_DATA); -} - -HWTEST_F(NetsysControllerTest, SetIpCommandForResTest001, TestSize.Level1) -{ - std::string cmd = ""; - std::string respond = ""; - int32_t result = instance_->SetIpCommandForRes(cmd, respond); - EXPECT_EQ(result, ERR_INVALID_DATA); -} - -HWTEST_F(NetsysControllerTest, SetNicTrafficAllowedTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - const std::vector ifaceNames = {"ifaceNames"}; - bool status = true; - int32_t result = netsysController->SetNicTrafficAllowed(ifaceNames, status); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, CloseSocketsUidTest001, TestSize.Level1) -{ - auto netsysController = std::make_shared(); - netsysController->netsysService_ = nullptr; - const std::string ipAddr = "172.0.0.1"; - uint32_t uid = 1; - int32_t result = netsysController->CloseSocketsUid(ipAddr, uid); - EXPECT_EQ(result, NETSYS_NETSYSSERVICE_NULL); -} - -HWTEST_F(NetsysControllerTest, CloseSocketsUidTest002, TestSize.Level1) -{ - const std::string ipAddr = "172.0.0.1"; - uint32_t uid = 1; - int32_t result = instance_->CloseSocketsUid(ipAddr, uid); - EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); -} -} // namespace NetManagerStandard -} // namespace OHOS diff --git a/test/netmanagernative/unittest/netsys_controller_test/netsys_native_client_regional_test.cpp b/test/netmanagernative/unittest/netsys_controller_test/netsys_native_client_regional_test.cpp deleted file mode 100644 index b58b23303..000000000 --- a/test/netmanagernative/unittest/netsys_controller_test/netsys_native_client_regional_test.cpp +++ /dev/null @@ -1,211 +0,0 @@ -/* - * 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 - -#ifdef GTEST_API_ -#define private public -#endif -#include "bpf_def.h" -#include "bpf_mapper.h" -#include "bpf_path.h" -#include "net_manager_constants.h" -#include "net_stats_constants.h" -#include "netsys_native_client.h" - -namespace OHOS { -namespace NetManagerStandard { -namespace { -using namespace testing::ext; -static constexpr const char *IFACE = "test0"; -static constexpr const char *IP_ADDR = "172.17.5.245"; -static constexpr const char *INTERFACE_NAME = "interface_name"; -const int32_t NET_ID = 2; -} // namespace - -class NetsysNativeClientTest : public testing::Test { -public: - static void SetUpTestCase(); - - static void TearDownTestCase(); - - void SetUp(); - - void TearDown(); -}; - -void NetsysNativeClientTest::SetUpTestCase() {} - -void NetsysNativeClientTest::TearDownTestCase() {} - -void NetsysNativeClientTest::SetUp() {} - -void NetsysNativeClientTest::TearDown() {} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceAddressUpdatedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string addr = IP_ADDR; - const std::string ifName = INTERFACE_NAME; - int flags = 1; - int scope = 1; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceAddressUpdated(addr, ifName, flags, scope); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceAddressRemovedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string addr = IP_ADDR; - const std::string ifName = INTERFACE_NAME; - int flags = 1; - int scope = 1; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceAddressRemoved(addr, ifName, flags, scope); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceAddedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string ifName = INTERFACE_NAME; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceAdded(ifName); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceRemovedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string ifName = INTERFACE_NAME; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceRemoved(ifName); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceChangedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string ifName = INTERFACE_NAME; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceChanged(ifName, true); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnInterfaceLinkStateChangedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - const std::string ifName = INTERFACE_NAME; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnInterfaceLinkStateChanged(ifName, true); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnRouteChangedTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNotifyCallback notifyCallback(nativeClient); - bool updated = true; - const std::string route = "route"; - const std::string gateway = "gateway"; - const std::string ifName = INTERFACE_NAME; - notifyCallback.netsysNativeClient_.cbObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnRouteChanged(updated, route, gateway, ifName); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnDnsResultReportTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNetDnsResultCallback notifyCallback(nativeClient); - uint32_t size = 1; - OHOS::NetsysNative::NetDnsResultReport netDnsResultRepor{}; - std::list res = {netDnsResultRepor}; - notifyCallback.netsysNativeClient_.cbDnsReportObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnDnsResultReport(size, res); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnDnsQueryResultReportTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNetDnsResultCallback notifyCallback(nativeClient); - uint32_t size = 1; - OHOS::NetsysNative::NetDnsQueryResultReport netDnsResultRepor{}; - std::list res = {netDnsResultRepor}; - notifyCallback.netsysNativeClient_.cbDnsQueryReportObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnDnsQueryResultReport(size, res); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, OnDnsQueryAbnormalReportTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - NetsysNativeClient::NativeNetDnsResultCallback notifyCallback(nativeClient); - uint32_t eventfailcause = 1; - OHOS::NetsysNative::NetDnsQueryResultReport netDnsResultRepor{}; - notifyCallback.netsysNativeClient_.cbDnsQueryReportObjects_ = {nullptr}; - int32_t ret = notifyCallback.OnDnsQueryAbnormalReport(eventfailcause, netDnsResultRepor); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, DelInterfaceAddressTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - const std::string ifName = INTERFACE_NAME; - const std::string ipAddr = IP_ADDR; - int32_t prefixLength = 1; - const std::string netCapabilities = "netCapabilities"; - int32_t ret = nativeClient->DelInterfaceAddress(ifName, ipAddr, prefixLength, netCapabilities); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeClientTest, InterfaceSetIffUpTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - const std::string ifName = INTERFACE_NAME; - int32_t ret = nativeClient->InterfaceSetIffUp(ifName); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_ERROR); -} - -HWTEST_F(NetsysNativeClientTest, ProcessDhcpResultTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - sptr dhcpResult = new (std::nothrow) OHOS::NetsysNative::DhcpResultParcel(); - sptr netsysCallback = nullptr; - nativeClient->cbObjects_.push_back(netsysCallback); - nativeClient->ProcessDhcpResult(dhcpResult); - EXPECT_TRUE(nativeClient->cbObjects_.empty()); -} - -HWTEST_F(NetsysNativeClientTest, ProcessBandwidthReachedLimitTest001, TestSize.Level1) -{ - auto nativeClient = std::make_shared(); - const std::string limitName = "limitName"; - const std::string iface = INTERFACE_NAME; - sptr netsysCallback = nullptr; - nativeClient->cbObjects_.push_back(netsysCallback); - nativeClient->ProcessBandwidthReachedLimit(limitName, iface); - EXPECT_TRUE(nativeClient->cbObjects_.empty()); -} -} // namespace NetManagerStandard -} // namespace OHOS diff --git a/test/netmanagernative/unittest/netsys_distributed_test/netsys_controller_test.cpp b/test/netmanagernative/unittest/netsys_distributed_test/netsys_controller_test.cpp deleted file mode 100644 index 12da1eb52..000000000 --- a/test/netmanagernative/unittest/netsys_distributed_test/netsys_controller_test.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* - * 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 -#include -#include -#include -#include - -#include "netmanager_base_test_security.h" - -#ifdef GTEST_API_ -#define private public -#define protected public -#endif - -#include "bpf_def.h" -#include "bpf_mapper.h" -#include "bpf_path.h" -#include "common_net_diag_callback_test.h" -#include "common_netsys_controller_callback_test.h" -#include "net_conn_constants.h" -#include "net_diag_callback_stub.h" -#include "netnative_log_wrapper.h" -#include "netsys_controller.h" -#include "netsys_ipc_interface_code.h" -#include "netsys_net_diag_data.h" -#include "distributed_manager.h" - -namespace OHOS { -namespace NetManagerStandard { -namespace { -using namespace testing::ext; -static constexpr const char *IFACE = "test0"; -static constexpr const char *WLAN = "wlan0"; -static constexpr const char *ETH0 = "eth0"; -static constexpr const char *DESTINATION = "192.168.1.3/24"; -static constexpr const char *NEXT_HOP = "192.168.1.1"; -static constexpr const char *PARCEL_IPV4_ADDR = "192.168.55.121"; -static constexpr const char *IP_ADDR = "172.17.5.245"; -static constexpr const char *INTERFACE_NAME = ""; -static constexpr const char *IF_NAME = "iface0"; -static constexpr const char *TCP_BUFFER_SIZES = "524288,1048576,2097152,262144,524288,1048576"; -static constexpr uint64_t TEST_COOKIE = 1; -static constexpr uint32_t TEST_STATS_TYPE1 = 0; -static constexpr uint32_t TEST_STATS_TYPE2 = 2; -static constexpr uint32_t IPC_ERR_FLATTEN_OBJECT = 3; -const int NET_ID = 2; -const int PERMISSION = 5; -const int PREFIX_LENGTH = 23; -const int TEST_MTU = 111; -uint16_t g_baseTimeoutMsec = 200; -uint8_t g_retryCount = 3; -const int32_t TEST_UID_32 = 1; -const int64_t TEST_UID = 1010; -const int32_t SOCKET_FD = 5; -const int32_t TEST_STATS_UID = 11111; -int g_ifaceFd = 5; -const int64_t BYTES = 2097152; -const uint32_t FIREWALL_RULE = 1; -bool g_isWaitAsync = false; -const int32_t ERR_INVALID_DATA = 5; -} // namespace - -class NetsysControllerTest : public testing::Test { -public: - static void SetUpTestCase(); - - static void TearDownTestCase(); - - void SetUp(); - - void TearDown(); - - static inline std::shared_ptr instance_ = nullptr; - - sptr netDiagCallback = new NetsysNative::NetDiagCallbackStubTest(); -}; - -void NetsysControllerTest::SetUpTestCase() -{ - instance_ = std::make_shared(); -} - -void NetsysControllerTest::TearDownTestCase() {} - -void NetsysControllerTest::SetUp() {} - -void NetsysControllerTest::TearDown() {} - -HWTEST_F(NetsysControllerTest, EnableDistributedClientNet001, TestSize.Level1) -{ - std::string virnicAddr = "1.189.55.61"; - std::string iif = "lo"; - int32_t ret = NetsysController::GetInstance().EnableDistributedClientNet(virnicAddr, iif); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - - bool isServer = false; - ret = NetsysController::GetInstance().DisableDistributedNet(isServer); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - std::string ifName = "virnic"; - ret = DistributedManager::GetInstance().DestroyDistributedNic(ifName); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysControllerTest, EnableDistributedServerNet001, TestSize.Level1) -{ - std::string iif = "lo"; - std::string devIface = "lo"; - std::string dstAddr = "1.189.55.61"; - int32_t ret = NetsysController::GetInstance().EnableDistributedServerNet(iif, devIface, dstAddr); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - - bool isServer = true; - ret = NetsysController::GetInstance().DisableDistributedNet(isServer); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} -} // namespace NetManagerStandard -} // namespace OHOS diff --git a/test/netmanagernative/unittest/netsys_distributed_test/netsys_native_service_proxy_test.cpp b/test/netmanagernative/unittest/netsys_distributed_test/netsys_native_service_proxy_test.cpp deleted file mode 100644 index b79e54823..000000000 --- a/test/netmanagernative/unittest/netsys_distributed_test/netsys_native_service_proxy_test.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/* - * 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 - -#include "iservice_registry.h" -#include "system_ability_definition.h" - -#include "bpf_def.h" -#include "bpf_mapper.h" -#include "bpf_path.h" -#include "conn_manager.h" -#include "net_manager_constants.h" -#include "net_stats_constants.h" -#include "netnative_log_wrapper.h" -#include "netsys_native_service_proxy.h" -#include "network_permission.h" - -#include "net_all_capabilities.h" -#include "net_conn_client.h" -#include "net_handle.h" -#include "netmanager_base_test_security.h" - -namespace OHOS { -namespace NetsysNative { -using namespace testing::ext; -using namespace NetManagerStandard; -constexpr int32_t NETID = 101; -constexpr int32_t UID = 1000; -constexpr int32_t MTU = 1500; -constexpr int32_t WHICH = 14; -const std::string INTERFACENAME = "wlan0"; -static constexpr uint64_t TEST_COOKIE = 1; -static constexpr uint32_t TEST_STATS_TYPE1 = 0; -static constexpr uint32_t TEST_STATS_TYPE2 = 2; -namespace { -sptr ConnManagerGetProxy() -{ - auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - return nullptr; - } - - auto remote = samgr->GetSystemAbility(COMM_NETSYS_NATIVE_SYS_ABILITY_ID); - if (remote == nullptr) { - return nullptr; - } - - auto proxy = iface_cast(remote); - if (proxy == nullptr) { - return nullptr; - } - return proxy; -} -} // namespace -class NetsysNativeServiceProxyTest : public testing::Test { -public: - static void SetUpTestCase(); - static void TearDownTestCase(); - void SetUp(); - void TearDown(); -}; - -void NetsysNativeServiceProxyTest::SetUpTestCase() {} - -void NetsysNativeServiceProxyTest::TearDownTestCase() {} - -void NetsysNativeServiceProxyTest::SetUp() {} - -void NetsysNativeServiceProxyTest::TearDown() {} - -HWTEST_F(NetsysNativeServiceProxyTest, EnableDistributedClientNet001, TestSize.Level1) -{ - OHOS::sptr netsysNativeService = ConnManagerGetProxy(); - ASSERT_NE(netsysNativeService, nullptr); - - std::string virnicAddr = "1.189.55.60"; - std::string iif = "lo"; - int32_t ret = netsysNativeService->EnableDistributedClientNet(virnicAddr, iif); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - - bool isServer = false; - ret = netsysNativeService->DisableDistributedNet(isServer); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeServiceProxyTest, EnableDistributedClientNet002, TestSize.Level1) -{ - OHOS::sptr netsysNativeService = ConnManagerGetProxy(); - ASSERT_NE(netsysNativeService, nullptr); - - std::string virnicAddr = ""; - std::string iif = ""; - int32_t ret = netsysNativeService->EnableDistributedClientNet(virnicAddr, iif); - EXPECT_NE(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeServiceProxyTest, EnableDistributedServerNet001, TestSize.Level1) -{ - OHOS::sptr netsysNativeService = ConnManagerGetProxy(); - ASSERT_NE(netsysNativeService, nullptr); - - std::string dstAddr = "1.189.55.61"; - std::string devIface = "lo"; - std::string iif = "lo"; - int32_t ret = netsysNativeService->EnableDistributedServerNet(iif, devIface, dstAddr); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - - bool isServer = true; - ret = netsysNativeService->DisableDistributedNet(isServer); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} - -HWTEST_F(NetsysNativeServiceProxyTest, EnableDistributedServerNet002, TestSize.Level1) -{ - OHOS::sptr netsysNativeService = ConnManagerGetProxy(); - ASSERT_NE(netsysNativeService, nullptr); - - std::string dstAddr = ""; - std::string devIface = ""; - std::string iif = ""; - int32_t ret = netsysNativeService->EnableDistributedServerNet(iif, devIface, dstAddr); - EXPECT_NE(ret, NetManagerStandard::NETMANAGER_SUCCESS); -} -} // namespace NetsysNative -} // namespace OHOS diff --git a/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_client_test.cpp b/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_client_test.cpp index d61ee95f5..e3d13d351 100644 --- a/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_client_test.cpp +++ b/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_client_test.cpp @@ -194,9 +194,6 @@ HWTEST_F(MockNetsysNativeClientTest, MockNetsysNativeClientBranchTest004, TestSi EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); int32_t socketFd = 0; - ret = nativeClient_.BindSocket(socketFd, netId); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - uint16_t id = 0; ret = nativeClient_.ShareDnsSet(id); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); diff --git a/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_service_stub.h b/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_service_stub.h new file mode 100644 index 000000000..0b92de0b6 --- /dev/null +++ b/test/netmanagernative/unittest/netsys_manager_test/mock_netsys_native_service_stub.h @@ -0,0 +1,643 @@ +/* + * Copyright (c) 2025 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 MOCK_NETSYS_NATIVE_SERVICE_STUB_H +#define MOCK_NETSYS_NATIVE_SERVICE_STUB_H + +#include "netsys_native_service_stub.h" +namespace OHOS { +namespace NetsysNative { +class TestNetsysNativeServiceStub : public NetsysNativeServiceStub { +public: + TestNetsysNativeServiceStub() = default; + ~TestNetsysNativeServiceStub() override{}; + + int32_t SetInternetPermission(uint32_t uid, uint8_t allow, uint8_t isBroker) override + { + return 0; + } + + int32_t SetResolverConfig(uint16_t netId, uint16_t baseTimeoutMsec, uint8_t retryCount, + const std::vector &servers, const std::vector &domains) override + { + return 0; + } + + int32_t GetResolverConfig(uint16_t netId, std::vector &servers, std::vector &domains, + uint16_t &baseTimeoutMsec, uint8_t &retryCount) override + { + return 0; + } + + int32_t CreateNetworkCache(uint16_t netId, bool isVpnNet) override + { + return 0; + } + + int32_t DestroyNetworkCache(uint16_t netId, bool isVpnNet) override + { + return 0; + } + + int32_t GetAddrInfo(const std::string &hostName, const std::string &serverName, const AddrInfo &hints, + uint16_t netId, std::vector &res) override + { + return 0; + } + + int32_t SetInterfaceMtu(const std::string &interfaceName, int mtu) override + { + return 0; + } + + int32_t SetTcpBufferSizes(const std::string &tcpBufferSizes) override + { + return 0; + } + + int32_t GetInterfaceMtu(const std::string &interfaceName) override + { + return 0; + } + + int32_t RegisterNotifyCallback(sptr &callback) override + { + return 0; + } + + int32_t UnRegisterNotifyCallback(sptr &callback) override + { + return 0; + } + + int32_t NetworkAddRoute(int32_t netId, const std::string &interfaceName, const std::string &destination, + const std::string &nextHop, bool isExcludedRoute) override + { + return 0; + } + + int32_t NetworkRemoveRoute(int32_t netId, const std::string &interfaceName, const std::string &destination, + const std::string &nextHop) override + { + return 0; + } + + int32_t NetworkAddRouteParcel(int32_t netId, const RouteInfoParcel &routeInfo) override + { + return 0; + } + + int32_t NetworkRemoveRouteParcel(int32_t netId, const RouteInfoParcel &routeInfo) override + { + return 0; + } + + int32_t NetworkSetDefault(int32_t netId) override + { + return 0; + } + + int32_t NetworkGetDefault() override + { + return 0; + } + + int32_t NetworkClearDefault() override + { + return 0; + } + + int32_t GetProcSysNet(int32_t family, int32_t which, const std::string &ifname, const std::string ¶meter, + std::string &value) override + { + return 0; + } + + int32_t SetProcSysNet(int32_t family, int32_t which, const std::string &ifname, const std::string ¶meter, + std::string &value) override + { + return 0; + } + + int32_t NetworkCreatePhysical(int32_t netId, int32_t permission) override + { + return 0; + } + + int32_t NetworkCreateVirtual(int32_t netId, bool hasDns) override + { + return 0; + } + + int32_t NetworkAddUids(int32_t netId, const std::vector &uidRanges) override + { + return 0; + } + + int32_t NetworkDelUids(int32_t netId, const std::vector &uidRanges) override + { + return 0; + } + + int32_t AddInterfaceAddress(const std::string &interfaceName, const std::string &addrString, + int32_t prefixLength) override + { + return 0; + } + + int32_t DelInterfaceAddress(const std::string &interfaceName, const std::string &addrString, + int32_t prefixLength) override + { + return 0; + } + + int32_t DelInterfaceAddress(const std::string &interfaceName, const std::string &addrString, + int32_t prefixLength, const std::string &netCapabilities) override + { + return 0; + } + + int32_t InterfaceSetIpAddress(const std::string &ifaceName, const std::string &ipAddress) override + { + return 0; + } + + int32_t InterfaceSetIffUp(const std::string &ifaceName) override + { + return 0; + } + + int32_t NetworkAddInterface(int32_t netId, const std::string &iface, NetBearType netBearerType) override + { + return 0; + } + + int32_t NetworkRemoveInterface(int32_t netId, const std::string &iface) override + { + return 0; + } + + int32_t NetworkDestroy(int32_t netId, bool isVpnNet) override + { + return 0; + } + + int32_t CreateVnic(uint16_t mtu, const std::string &tunAddr, int32_t prefix, + const std::set &uids) override + { + return 0; + } + + int32_t DestroyVnic() override + { + return 0; + } + + int32_t EnableDistributedClientNet(const std::string &virnicAddr, const std::string &iif) override + { + return 0; + } + + int32_t EnableDistributedServerNet(const std::string &iif, const std::string &devIface, + const std::string &dstAddr) override + { + return 0; + } + + int32_t DisableDistributedNet(bool isServer) override + { + return 0; + } + + int32_t GetFwmarkForNetwork(int32_t netId, MarkMaskParcel &markMaskParcel) override + { + return 0; + } + + int32_t SetInterfaceConfig(const InterfaceConfigurationParcel &cfg) override + { + return 0; + } + + int32_t GetInterfaceConfig(InterfaceConfigurationParcel &cfg) override + { + return 0; + } + + int32_t InterfaceGetList(std::vector &ifaces) override + { + return 0; + } + + int32_t StartDhcpClient(const std::string &iface, bool bIpv6) override + { + return 0; + } + + int32_t StopDhcpClient(const std::string &iface, bool bIpv6) override + { + return 0; + } + + int32_t StartDhcpService(const std::string &iface, const std::string &ipv4addr) override + { + return 0; + } + + int32_t StopDhcpService(const std::string &iface) override + { + return 0; + } + + int32_t IpEnableForwarding(const std::string &requestor) override + { + return 0; + } + + int32_t IpDisableForwarding(const std::string &requestor) override + { + return 0; + } + + int32_t EnableNat(const std::string &downstreamIface, const std::string &upstreamIface) override + { + return 0; + } + + int32_t DisableNat(const std::string &downstreamIface, const std::string &upstreamIface) override + { + return 0; + } + + int32_t IpfwdAddInterfaceForward(const std::string &fromIface, const std::string &toIface) override + { + return 0; + } + + int32_t IpfwdRemoveInterfaceForward(const std::string &fromIface, const std::string &toIface) override + { + return 0; + } + + int32_t BandwidthAddAllowedList(uint32_t uid) override + { + return 0; + } + + int32_t BandwidthRemoveAllowedList(uint32_t uid) override + { + return 0; + } + + int32_t BandwidthEnableDataSaver(bool enable) override + { + return 0; + } + + int32_t BandwidthSetIfaceQuota(const std::string &ifName, int64_t bytes) override + { + return 0; + } + + int32_t BandwidthAddDeniedList(uint32_t uid) override + { + return 0; + } + + int32_t BandwidthRemoveDeniedList(uint32_t uid) override + { + return 0; + } + + int32_t BandwidthRemoveIfaceQuota(const std::string &ifName) override + { + return 0; + } + + int32_t FirewallSetUidsAllowedListChain(uint32_t chain, const std::vector &uids) override + { + return 0; + } + + int32_t FirewallSetUidsDeniedListChain(uint32_t chain, const std::vector &uids) override + { + return 0; + } + + int32_t FirewallEnableChain(uint32_t chain, bool enable) override + { + return 0; + } + + int32_t FirewallSetUidRule(uint32_t chain, const std::vector &uids, uint32_t firewallRule) override + { + return 0; + } + + int32_t ShareDnsSet(uint16_t netId) override + { + return 0; + } + + int32_t StartDnsProxyListen() override + { + return 0; + } + + int32_t StopDnsProxyListen() override + { + return 0; + } + + int32_t GetNetworkSharingTraffic(const std::string &downIface, const std::string &upIface, + NetworkSharingTraffic &traffic) override + { + return 0; + } + + int32_t GetNetworkCellularSharingTraffic(NetworkSharingTraffic &traffic, std::string &ifaceName) override + { + return 0; + } + + int32_t GetTotalStats(uint64_t &stats, uint32_t type) override + { + return 0; + } + + int32_t GetUidStats(uint64_t &stats, uint32_t type, uint32_t uid) override + { + return 0; + } + + int32_t GetIfaceStats(uint64_t &stats, uint32_t type, const std::string &interfaceName) override + { + return 0; + } + + int32_t GetAllSimStatsInfo(std::vector &stats) override + { + return 0; + } + + int32_t DeleteSimStatsInfo(uint32_t uid) override + { + return 0; + } + + int32_t GetAllStatsInfo(std::vector &stats) override + { + return 0; + } + + int32_t DeleteStatsInfo(uint32_t uid) override + { + return 0; + } + + int32_t SetNetStateTrafficMap(uint8_t flag, uint64_t availableTraffic) override + { + return 0; + } + + int32_t GetNetStateTrafficMap(uint8_t flag, uint64_t &availableTraffic) override + { + return 0; + } + + int32_t ClearIncreaseTrafficMap() override + { + return 0; + } + + int32_t DeleteIncreaseTrafficMap(uint64_t ifIndex) override + { + return 0; + } + + int32_t UpdateIfIndexMap(int8_t key, uint64_t index) override + { + return 0; + } + + int32_t SetNetStatusMap(uint8_t type, uint8_t value) override + { + return 0; + } + + int32_t SetIptablesCommandForRes(const std::string &cmd, std::string &respond, IptablesType ipType) override + { + return 0; + } + + int32_t SetIpCommandForRes(const std::string &cmd, std::string &respond) override + { + return 0; + } + + int32_t NetDiagPingHost(const NetDiagPingOption &pingOption, const sptr &callback) override + { + return 0; + } + + int32_t NetDiagGetRouteTable(std::list &routeTables) override + { + return 0; + } + + int32_t NetDiagGetSocketsInfo(NetDiagProtocolType socketType, NetDiagSocketsInfo &socketsInfo) override + { + return 0; + } + + int32_t NetDiagGetInterfaceConfig(std::list &configs, const std::string &ifaceName) override + { + return 0; + } + + int32_t NetDiagUpdateInterfaceConfig(const NetDiagIfaceConfig &config, const std::string &ifaceName, + bool add) override + { + return 0; + } + + int32_t NetDiagSetInterfaceActiveState(const std::string &ifaceName, bool up) override + { + return 0; + } + + int32_t AddStaticArp(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override + { + return 0; + } + + int32_t DelStaticArp(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override + { + return 0; + } + + int32_t AddStaticIpv6Addr(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override + { + return 0; + } + + int32_t DelStaticIpv6Addr(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override + { + return 0; + } + + int32_t RegisterDnsResultCallback(const sptr &callback, uint32_t delay) override + { + return 0; + } + + int32_t UnregisterDnsResultCallback(const sptr &callback) override + { + return 0; + } + + int32_t RegisterNetsysTrafficCallback(const sptr &callback) override + { + return 0; + } + + int32_t UnRegisterNetsysTrafficCallback(const sptr &callback) override + { + return 0; + } + + int32_t GetCookieStats(uint64_t &stats, uint32_t type, uint64_t cookie) override + { + return 0; + } + + int32_t GetNetworkSharingType(std::set& sharingTypeIsOn) override + { + return 0; + } + + int32_t UpdateNetworkSharingType(uint32_t type, bool isOpen) override + { + return 0; + } + +#ifdef FEATURE_WEARABLE_DISTRIBUTED_NET_ENABLE + int32_t EnableWearableDistributedNetForward(int32_t tcpPortId, int32_t udpPortId) override + { + return 0; + } + + int32_t DisableWearableDistributedNetForward() override + { + return 0; + } +#endif + + int32_t SetIpv6PrivacyExtensions(const std::string &interfaceName, const uint32_t on) override + { + return 0; + } + + int32_t SetEnableIpv6(const std::string &interfaceName, const uint32_t on) override + { + return 0; + } + + int32_t SetNetworkAccessPolicy(uint32_t uid, NetworkAccessPolicy policy, bool reconfirmFlag) override + { + return 0; + } + + int32_t DeleteNetworkAccessPolicy(uint32_t uid) override + { + return 0; + } + + int32_t NotifyNetBearerTypeChange(std::set bearerTypes) override + { + return 0; + } + + int32_t StartClat(const std::string &interfaceName, int32_t netId, const std::string &nat64PrefixStr) override + { + return 0; + } + + int32_t StopClat(const std::string &interfaceName) override + { + return 0; + } + + int32_t ClearFirewallAllRules() override + { + return 0; + } + + int32_t CloseSocketsUid(const std::string &ipAddr, uint32_t uid) override + { + return 0; + } + +#ifdef SUPPORT_SYSVPN + int32_t ProcessVpnStage(NetsysNative::SysVpnStageCode stage, const std::string &message) override + { + return 0; + } + + int32_t UpdateVpnRules(uint16_t netId, const std::vector &extMessages, bool add) override + { + return 0; + } +#endif // SUPPORT_SYSVPN + + int32_t SetNicTrafficAllowed(const std::vector &ifaceNames, bool status) override + { + return 0; + } + + int32_t SetBrokerUidAccessPolicyMap(const std::unordered_map &uidMaps) override + { + return 0; + } + + int32_t DelBrokerUidAccessPolicyMap(uint32_t uid) override + { + return 0; + } + + int32_t SetUserDefinedServerFlag(uint16_t netId, bool flag) override + { + return 0; + } + + int32_t FlushDnsCache(uint16_t netId) override + { + return 0; + } + + int32_t SetDnsCache(uint16_t netId, const std::string &hostName, const AddrInfo &addrInfo) override + { + return 0; + } +#ifdef FEATURE_ENTERPRISE_ROUTE_CUSTOM + int32_t UpdateEnterpriseRoute(const std::string &interfaceName, uint32_t uid, bool add) override + { + return 0; + } +#endif +}; +} +} +#endif diff --git a/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_service_impl_test.cpp b/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_service_impl_test.cpp index 2e78732b8..054fafd4e 100644 --- a/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_service_impl_test.cpp +++ b/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_service_impl_test.cpp @@ -105,7 +105,6 @@ void NetsysControllerServiceImplTest::AddExtMockApi() instance_->mockNetsysClient_.mockApi_.insert(MOCK_UIDGETLIST_API); instance_->mockNetsysClient_.mockApi_.insert(MOCK_GETIFACERXPACKETS_API); instance_->mockNetsysClient_.mockApi_.insert(MOCK_GETIFACETXPACKETS_API); - instance_->mockNetsysClient_.mockApi_.insert(MOCK_BINDSOCKET_API); instance_->mockNetsysClient_.mockApi_.insert(MOCK_REGISTERNETSYSNOTIFYCALLBACK_API); instance_->mockNetsysClient_.mockApi_.insert(MOCK_BINDNETWORKSERVICEVPN_API); instance_->mockNetsysClient_.mockApi_.insert(MOCK_ENABLEVIRTUALNETIFACECARD_API); @@ -261,10 +260,7 @@ HWTEST_F(NetsysControllerServiceImplTest, ServiceImplTest, TestSize.Level1) ret = instance_->NetworkDelUids(5, uidRanges); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - auto ret32 = instance_->BindSocket(1, 2); - EXPECT_EQ(ret32, NetManagerStandard::NETMANAGER_SUCCESS); - - ret32 = instance_->RegisterNetsysNotifyCallback(Callback); + auto ret32 = instance_->RegisterNetsysNotifyCallback(Callback); EXPECT_EQ(ret32, NetManagerStandard::NETMANAGER_SUCCESS); ret32 = instance_->BindNetworkServiceVpn(5); @@ -415,10 +411,6 @@ HWTEST_F(NetsysControllerServiceImplTest, NetsysControllerServiceImplBranchTest0 ret = instance_->ClearDefaultNetWorkNetId(); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - int32_t socketFd = 0; - ret = instance_->BindSocket(socketFd, netId); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - std::string testString = ""; ret = instance_->IpEnableForwarding(testString); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); @@ -680,11 +672,7 @@ HWTEST_F(NetsysControllerServiceImplTest, NetsysControllerServiceImplBranchTest0 result = instance_->GetIfaceTxPackets(interfaceName); EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); - int32_t socketFd = 0; int32_t netId = 0; - result = instance_->BindSocket(socketFd, netId); - EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); - result = instance_->ShareDnsSet(netId); EXPECT_EQ(result, NetManagerStandard::NETMANAGER_SUCCESS); diff --git a/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_test.cpp b/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_test.cpp index 786d4d998..c53d55b9a 100644 --- a/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_test.cpp +++ b/test/netmanagernative/unittest/netsys_manager_test/netsys_controller_test.cpp @@ -329,10 +329,7 @@ HWTEST_F(NetsysControllerTest, NetsysControllerTest013, TestSize.Level1) netsysControllerServiceImpl->netsysClient_->netsysNativeService_ = mockNetsysService_; netsysController->netsysService_ = netsysControllerServiceImpl; - int32_t ret = netsysController->BindSocket(SOCKET_FD, NET_ID); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - - ret = netsysController->IpEnableForwarding(INTERFACE_NAME); + int32_t ret = netsysController->IpEnableForwarding(INTERFACE_NAME); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); ret = netsysController->IpDisableForwarding(INTERFACE_NAME); @@ -745,9 +742,6 @@ HWTEST_F(NetsysControllerTest, NetsysControllerErr004, TestSize.Level1) ret = netsysController->ClearDefaultNetWorkNetId(); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - ret = netsysController->BindSocket(0, 0); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - ret = netsysController->IpEnableForwarding(iface); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); diff --git a/test/netmanagernative/unittest/netsys_manager_test/netsys_native_client_test.cpp b/test/netmanagernative/unittest/netsys_manager_test/netsys_native_client_test.cpp index 76e50f1fa..59ec4af69 100644 --- a/test/netmanagernative/unittest/netsys_manager_test/netsys_native_client_test.cpp +++ b/test/netmanagernative/unittest/netsys_manager_test/netsys_native_client_test.cpp @@ -215,9 +215,6 @@ HWTEST_F(NetsysNativeClientTest, NetsysNativeClientTest004, TestSize.Level1) ret = nativeClient->ClearDefaultNetWorkNetId(); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - ret = nativeClient->BindSocket(SOCKET_FD, NET_ID); - EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); - ret = nativeClient->IpEnableForwarding(REQUESTOR); EXPECT_EQ(ret, 0); diff --git a/test/netmanagernative/unittest/netsys_manager_test/netsys_native_service_stub_test.cpp b/test/netmanagernative/unittest/netsys_manager_test/netsys_native_service_stub_test.cpp index 133072b56..b8869c37e 100644 --- a/test/netmanagernative/unittest/netsys_manager_test/netsys_native_service_stub_test.cpp +++ b/test/netmanagernative/unittest/netsys_manager_test/netsys_native_service_stub_test.cpp @@ -24,7 +24,7 @@ #include "i_netsys_service.h" #include "net_dns_result_callback_stub.h" #include "netnative_log_wrapper.h" -#include "netsys_native_service_stub.h" +#include "mock_netsys_native_service_stub.h" namespace OHOS { namespace NetsysNative { @@ -46,627 +46,6 @@ public: return 0; } }; - -class TestNetsysNativeServiceStub : public NetsysNativeServiceStub { -public: - TestNetsysNativeServiceStub() = default; - ~TestNetsysNativeServiceStub() override{}; - - int32_t SetInternetPermission(uint32_t uid, uint8_t allow, uint8_t isBroker) override - { - return 0; - } - - int32_t SetResolverConfig(uint16_t netId, uint16_t baseTimeoutMsec, uint8_t retryCount, - const std::vector &servers, const std::vector &domains) override - { - return 0; - } - - int32_t GetResolverConfig(uint16_t netId, std::vector &servers, std::vector &domains, - uint16_t &baseTimeoutMsec, uint8_t &retryCount) override - { - return 0; - } - - int32_t CreateNetworkCache(uint16_t netId, bool isVpnNet) override - { - return 0; - } - - int32_t DestroyNetworkCache(uint16_t netId, bool isVpnNet) override - { - return 0; - } - - int32_t GetAddrInfo(const std::string &hostName, const std::string &serverName, const AddrInfo &hints, - uint16_t netId, std::vector &res) override - { - return 0; - } - - int32_t SetInterfaceMtu(const std::string &interfaceName, int mtu) override - { - return 0; - } - - int32_t SetTcpBufferSizes(const std::string &tcpBufferSizes) override - { - return 0; - } - - int32_t GetInterfaceMtu(const std::string &interfaceName) override - { - return 0; - } - - int32_t RegisterNotifyCallback(sptr &callback) override - { - return 0; - } - - int32_t UnRegisterNotifyCallback(sptr &callback) override - { - return 0; - } - - int32_t NetworkAddRoute(int32_t netId, const std::string &interfaceName, const std::string &destination, - const std::string &nextHop, bool isExcludedRoute) override - { - return 0; - } - - int32_t NetworkRemoveRoute(int32_t netId, const std::string &interfaceName, const std::string &destination, - const std::string &nextHop) override - { - return 0; - } - - int32_t NetworkAddRouteParcel(int32_t netId, const RouteInfoParcel &routeInfo) override - { - return 0; - } - - int32_t NetworkRemoveRouteParcel(int32_t netId, const RouteInfoParcel &routeInfo) override - { - return 0; - } - - int32_t NetworkSetDefault(int32_t netId) override - { - return 0; - } - - int32_t NetworkGetDefault() override - { - return 0; - } - - int32_t NetworkClearDefault() override - { - return 0; - } - - int32_t GetProcSysNet(int32_t family, int32_t which, const std::string &ifname, const std::string ¶meter, - std::string &value) override - { - return 0; - } - - int32_t SetProcSysNet(int32_t family, int32_t which, const std::string &ifname, const std::string ¶meter, - std::string &value) override - { - return 0; - } - - int32_t NetworkCreatePhysical(int32_t netId, int32_t permission) override - { - return 0; - } - - int32_t NetworkCreateVirtual(int32_t netId, bool hasDns) override - { - return 0; - } - - int32_t NetworkAddUids(int32_t netId, const std::vector &uidRanges) override - { - return 0; - } - - int32_t NetworkDelUids(int32_t netId, const std::vector &uidRanges) override - { - return 0; - } - - int32_t AddInterfaceAddress(const std::string &interfaceName, const std::string &addrString, - int32_t prefixLength) override - { - return 0; - } - - int32_t DelInterfaceAddress(const std::string &interfaceName, const std::string &addrString, - int32_t prefixLength) override - { - return 0; - } - - int32_t DelInterfaceAddress(const std::string &interfaceName, const std::string &addrString, - int32_t prefixLength, const std::string &netCapabilities) override - { - return 0; - } - - int32_t InterfaceSetIpAddress(const std::string &ifaceName, const std::string &ipAddress) override - { - return 0; - } - - int32_t InterfaceSetIffUp(const std::string &ifaceName) override - { - return 0; - } - - int32_t NetworkAddInterface(int32_t netId, const std::string &iface, NetBearType netBearerType) override - { - return 0; - } - - int32_t NetworkRemoveInterface(int32_t netId, const std::string &iface) override - { - return 0; - } - - int32_t NetworkDestroy(int32_t netId, bool isVpnNet) override - { - return 0; - } - - int32_t CreateVnic(uint16_t mtu, const std::string &tunAddr, int32_t prefix, - const std::set &uids) override - { - return 0; - } - - int32_t DestroyVnic() override - { - return 0; - } - - int32_t EnableDistributedClientNet(const std::string &virnicAddr, const std::string &iif) override - { - return 0; - } - - int32_t EnableDistributedServerNet(const std::string &iif, const std::string &devIface, - const std::string &dstAddr) override - { - return 0; - } - - int32_t DisableDistributedNet(bool isServer) override - { - return 0; - } - - int32_t GetFwmarkForNetwork(int32_t netId, MarkMaskParcel &markMaskParcel) override - { - return 0; - } - - int32_t SetInterfaceConfig(const InterfaceConfigurationParcel &cfg) override - { - return 0; - } - - int32_t GetInterfaceConfig(InterfaceConfigurationParcel &cfg) override - { - return 0; - } - - int32_t InterfaceGetList(std::vector &ifaces) override - { - return 0; - } - - int32_t StartDhcpClient(const std::string &iface, bool bIpv6) override - { - return 0; - } - - int32_t StopDhcpClient(const std::string &iface, bool bIpv6) override - { - return 0; - } - - int32_t StartDhcpService(const std::string &iface, const std::string &ipv4addr) override - { - return 0; - } - - int32_t StopDhcpService(const std::string &iface) override - { - return 0; - } - - int32_t IpEnableForwarding(const std::string &requestor) override - { - return 0; - } - - int32_t IpDisableForwarding(const std::string &requestor) override - { - return 0; - } - - int32_t EnableNat(const std::string &downstreamIface, const std::string &upstreamIface) override - { - return 0; - } - - int32_t DisableNat(const std::string &downstreamIface, const std::string &upstreamIface) override - { - return 0; - } - - int32_t IpfwdAddInterfaceForward(const std::string &fromIface, const std::string &toIface) override - { - return 0; - } - - int32_t IpfwdRemoveInterfaceForward(const std::string &fromIface, const std::string &toIface) override - { - return 0; - } - - int32_t BandwidthAddAllowedList(uint32_t uid) override - { - return 0; - } - - int32_t BandwidthRemoveAllowedList(uint32_t uid) override - { - return 0; - } - - int32_t BandwidthEnableDataSaver(bool enable) override - { - return 0; - } - - int32_t BandwidthSetIfaceQuota(const std::string &ifName, int64_t bytes) override - { - return 0; - } - - int32_t BandwidthAddDeniedList(uint32_t uid) override - { - return 0; - } - - int32_t BandwidthRemoveDeniedList(uint32_t uid) override - { - return 0; - } - - int32_t BandwidthRemoveIfaceQuota(const std::string &ifName) override - { - return 0; - } - - int32_t FirewallSetUidsAllowedListChain(uint32_t chain, const std::vector &uids) override - { - return 0; - } - - int32_t FirewallSetUidsDeniedListChain(uint32_t chain, const std::vector &uids) override - { - return 0; - } - - int32_t FirewallEnableChain(uint32_t chain, bool enable) override - { - return 0; - } - - int32_t FirewallSetUidRule(uint32_t chain, const std::vector &uids, uint32_t firewallRule) override - { - return 0; - } - - int32_t ShareDnsSet(uint16_t netId) override - { - return 0; - } - - int32_t StartDnsProxyListen() override - { - return 0; - } - - int32_t StopDnsProxyListen() override - { - return 0; - } - - int32_t GetNetworkSharingTraffic(const std::string &downIface, const std::string &upIface, - NetworkSharingTraffic &traffic) override - { - return 0; - } - - int32_t GetNetworkCellularSharingTraffic(NetworkSharingTraffic &traffic, std::string &ifaceName) override - { - return 0; - } - - int32_t GetTotalStats(uint64_t &stats, uint32_t type) override - { - return 0; - } - - int32_t GetUidStats(uint64_t &stats, uint32_t type, uint32_t uid) override - { - return 0; - } - - int32_t GetIfaceStats(uint64_t &stats, uint32_t type, const std::string &interfaceName) override - { - return 0; - } - - int32_t GetAllSimStatsInfo(std::vector &stats) override - { - return 0; - } - - int32_t DeleteSimStatsInfo(uint32_t uid) override - { - return 0; - } - - int32_t GetAllStatsInfo(std::vector &stats) override - { - return 0; - } - - int32_t DeleteStatsInfo(uint32_t uid) override - { - return 0; - } - - int32_t SetNetStateTrafficMap(uint8_t flag, uint64_t availableTraffic) override - { - return 0; - } - - int32_t GetNetStateTrafficMap(uint8_t flag, uint64_t &availableTraffic) override - { - return 0; - } - - int32_t ClearIncreaseTrafficMap() override - { - return 0; - } - - int32_t DeleteIncreaseTrafficMap(uint64_t ifIndex) override - { - return 0; - } - - int32_t UpdateIfIndexMap(int8_t key, uint64_t index) override - { - return 0; - } - - int32_t SetNetStatusMap(uint8_t type, uint8_t value) override - { - return 0; - } - - int32_t SetIptablesCommandForRes(const std::string &cmd, std::string &respond, IptablesType ipType) override - { - return 0; - } - - int32_t SetIpCommandForRes(const std::string &cmd, std::string &respond) override - { - return 0; - } - - int32_t NetDiagPingHost(const NetDiagPingOption &pingOption, const sptr &callback) override - { - return 0; - } - - int32_t NetDiagGetRouteTable(std::list &routeTables) override - { - return 0; - } - - int32_t NetDiagGetSocketsInfo(NetDiagProtocolType socketType, NetDiagSocketsInfo &socketsInfo) override - { - return 0; - } - - int32_t NetDiagGetInterfaceConfig(std::list &configs, const std::string &ifaceName) override - { - return 0; - } - - int32_t NetDiagUpdateInterfaceConfig(const NetDiagIfaceConfig &config, const std::string &ifaceName, - bool add) override - { - return 0; - } - - int32_t NetDiagSetInterfaceActiveState(const std::string &ifaceName, bool up) override - { - return 0; - } - - int32_t AddStaticArp(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override - { - return 0; - } - - int32_t DelStaticArp(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override - { - return 0; - } - - int32_t AddStaticIpv6Addr(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override - { - return 0; - } - - int32_t DelStaticIpv6Addr(const std::string &ipAddr, const std::string &macAddr, const std::string &ifName) override - { - return 0; - } - - int32_t RegisterDnsResultCallback(const sptr &callback, uint32_t delay) override - { - return 0; - } - - int32_t UnregisterDnsResultCallback(const sptr &callback) override - { - return 0; - } - - int32_t RegisterNetsysTrafficCallback(const sptr &callback) override - { - return 0; - } - - int32_t UnRegisterNetsysTrafficCallback(const sptr &callback) override - { - return 0; - } - - int32_t GetCookieStats(uint64_t &stats, uint32_t type, uint64_t cookie) override - { - return 0; - } - - int32_t GetNetworkSharingType(std::set& sharingTypeIsOn) override - { - return 0; - } - - int32_t UpdateNetworkSharingType(uint32_t type, bool isOpen) override - { - return 0; - } - -#ifdef FEATURE_WEARABLE_DISTRIBUTED_NET_ENABLE - int32_t EnableWearableDistributedNetForward(int32_t tcpPortId, int32_t udpPortId) override - { - return 0; - } - - int32_t DisableWearableDistributedNetForward() override - { - return 0; - } -#endif - - int32_t SetIpv6PrivacyExtensions(const std::string &interfaceName, const uint32_t on) override - { - return 0; - } - - int32_t SetEnableIpv6(const std::string &interfaceName, const uint32_t on) override - { - return 0; - } - - int32_t SetNetworkAccessPolicy(uint32_t uid, NetworkAccessPolicy policy, bool reconfirmFlag) override - { - return 0; - } - - int32_t DeleteNetworkAccessPolicy(uint32_t uid) override - { - return 0; - } - - int32_t NotifyNetBearerTypeChange(std::set bearerTypes) override - { - return 0; - } - - int32_t StartClat(const std::string &interfaceName, int32_t netId, const std::string &nat64PrefixStr) override - { - return 0; - } - - int32_t StopClat(const std::string &interfaceName) override - { - return 0; - } - - int32_t ClearFirewallAllRules() override - { - return 0; - } - - int32_t SetNicTrafficAllowed(const std::vector &ifaceNames, bool status) override - { - return 0; - } - -#ifdef SUPPORT_SYSVPN - int32_t ProcessVpnStage(NetsysNative::SysVpnStageCode stage, const std::string &message) override - { - return 0; - } - - int32_t UpdateVpnRules(uint16_t netId, const std::vector &extMessages, bool add) override - { - return 0; - } -#endif // SUPPORT_SYSVPN - - int32_t CloseSocketsUid(const std::string &ipAddr, uint32_t uid) override - { - return 0; - } - - int32_t SetBrokerUidAccessPolicyMap(const std::unordered_map &uidMaps) override - { - return 0; - } - - int32_t DelBrokerUidAccessPolicyMap(uint32_t uid) override - { - return 0; - } - - int32_t SetUserDefinedServerFlag(uint16_t netId, bool flag) override - { - return 0; - } - - int32_t FlushDnsCache(uint16_t netId) override - { - return 0; - } - - int32_t SetDnsCache(uint16_t netId, const std::string &hostName, const AddrInfo &addrInfo) override - { - return 0; - } -#ifdef FEATURE_ENTERPRISE_ROUTE_CUSTOM - int32_t UpdateEnterpriseRoute(const std::string &interfaceName, uint32_t uid, bool add) override - { - return 0; - } -#endif -}; - class NetsysNativeServiceStubTest : public testing::Test { public: static void SetUpTestCase(); @@ -760,25 +139,13 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdSetResolverConfig003, TestSize.Level1) EXPECT_EQ(ret, ERR_NONE); } -bool IsDataParemerVaild(MessageParcel &data) -{ - uint16_t netId = 1001; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return false; - } - if (!data.WriteUint16(netId)) { - return false; - } - return true; -} - HWTEST_F(NetsysNativeServiceStubTest, CmdGetResolverConfig001, TestSize.Level1) { MessageParcel data; MessageParcel reply; - if (!IsDataParemerVaild(data)) { - return; - } + uint16_t netId = 1001; + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); int32_t ret = notifyStub_->CmdGetResolverConfig(data, reply); EXPECT_EQ(ret, ERR_NONE); } @@ -786,9 +153,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetResolverConfig001, TestSize.Level1) HWTEST_F(NetsysNativeServiceStubTest, CmdCreateNetworkCache001, TestSize.Level1) { MessageParcel data; - if (!IsDataParemerVaild(data)) { - return; - } + uint16_t netId = 1001; + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdCreateNetworkCache(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -797,9 +164,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdCreateNetworkCache001, TestSize.Level1) HWTEST_F(NetsysNativeServiceStubTest, CmdDestroyNetworkCache001, TestSize.Level1) { MessageParcel data; - if (!IsDataParemerVaild(data)) { - return; - } + uint16_t netId = 1001; + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdDestroyNetworkCache(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -837,18 +204,10 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetAddrInfo002, TestSize.Level1) uint16_t netId = 1001; MessageParcel data; - if (!data.WriteString(hostName)) { - return; - } - if (!data.WriteString(serverName)) { - return; - } - if (!data.WriteRawData(&addrInfo, sizeof(AddrInfo))) { - return; - } - if (!data.WriteUint16(netId)) { - return; - } + EXPECT_TRUE(data.WriteString(hostName)); + EXPECT_TRUE(data.WriteString(serverName)); + EXPECT_TRUE(data.WriteRawData(&addrInfo, sizeof(AddrInfo))); + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetAddrInfo(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -860,15 +219,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdSetInterfaceMtu001, TestSize.Level1) int32_t mtu = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(ifName)) { - return; - } - if (!data.WriteUint32(mtu)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(ifName)); + EXPECT_TRUE(data.WriteUint32(mtu)); MessageParcel reply; int32_t ret = notifyStub_->CmdSetInterfaceMtu(data, reply); @@ -880,12 +233,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetInterfaceMtu001, TestSize.Level1) std::string ifName = "ifName"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(ifName)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(ifName)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetInterfaceMtu(data, reply); @@ -897,12 +246,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdRegisterNotifyCallback001, TestSize.Lev std::string ifName = "ifName"; sptr callback = new (std::nothrow) NotifyCallbackTest(); MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); MessageParcel reply; int32_t ret = notifyStub_->CmdRegisterNotifyCallback(data, reply); @@ -938,21 +283,11 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkRouteParcel001, TestSize.Level1) std::string nextHop = "nextHop"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint16(netId)) { - return; - } - if (!data.WriteString(ifName)) { - return; - } - if (!data.WriteString(destination)) { - return; - } - if (!data.WriteString(nextHop)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); + EXPECT_TRUE(data.WriteString(ifName)); + EXPECT_TRUE(data.WriteString(destination)); + EXPECT_TRUE(data.WriteString(nextHop)); MessageParcel reply; int32_t ret = notifyStub_->CmdNetworkAddRouteParcel(data, reply); @@ -966,12 +301,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkDefault001, TestSize.Level1) { uint16_t netId = 1001; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint16(netId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdNetworkSetDefault(data, reply); @@ -992,30 +323,18 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdProcSysNet001, TestSize.Level1) std::string parameter = "TestParameter"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(family)) { - return; - } - if (!data.WriteUint32(which)) { - return; - } - if (!data.WriteString(ifName)) { - return; - } - if (!data.WriteString(parameter)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(family)); + EXPECT_TRUE(data.WriteUint32(which)); + EXPECT_TRUE(data.WriteString(ifName)); + EXPECT_TRUE(data.WriteString(parameter)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetProcSysNet(data, reply); EXPECT_EQ(ret, ERR_NONE); std::string value = "TestValue"; - if (!data.WriteString(value)) { - return; - } + EXPECT_TRUE(data.WriteString(value)); ret = notifyStub_->CmdSetProcSysNet(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -1027,15 +346,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkCreatePhysical001, TestSize.Leve int32_t permission = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(netId)) { - return; - } - if (!data.WriteUint32(permission)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(netId)); + EXPECT_TRUE(data.WriteUint32(permission)); MessageParcel reply; int32_t ret = notifyStub_->CmdNetworkCreatePhysical(data, reply); @@ -1045,22 +358,14 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkCreatePhysical001, TestSize.Leve HWTEST_F(NetsysNativeServiceStubTest, CmdInterfaceAddress001, TestSize.Level1) { std::string interfaceName = "testInterfaceName"; - std::string ipAddr = "testIpAddr"; - int32_t prefixLength = 10; - - MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(interfaceName)) { - return; - } - if (!data.WriteString(ipAddr)) { - return; - } - if (!data.WriteUint32(prefixLength)) { - return; - } + std::string ipAddr = "testIpAddr"; + int32_t prefixLength = 10; + + MessageParcel data; + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(interfaceName)); + EXPECT_TRUE(data.WriteString(ipAddr)); + EXPECT_TRUE(data.WriteUint32(prefixLength)); MessageParcel reply; int32_t ret = notifyStub_->CmdAddInterfaceAddress(data, reply); @@ -1076,15 +381,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdInterfaceSetIpAddress001, TestSize.Leve std::string ipAddress = "testIpAddr"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(interfaceName)) { - return; - } - if (!data.WriteString(ipAddress)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(interfaceName)); + EXPECT_TRUE(data.WriteString(ipAddress)); MessageParcel reply; int32_t ret = notifyStub_->CmdInterfaceSetIpAddress(data, reply); @@ -1096,12 +395,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdInterfaceSetIffUp001, TestSize.Level1) std::string interfaceName = "testInterfaceName"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(interfaceName)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(interfaceName)); MessageParcel reply; int32_t ret = notifyStub_->CmdInterfaceSetIffUp(data, reply); @@ -1115,18 +410,10 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkInterface001, TestSize.Level1) NetBearType bearerType = BEARER_DEFAULT; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(interfaceName)) { - return; - } - if (!data.WriteUint32(netId)) { - return; - } - if (!data.WriteUint8(bearerType)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(interfaceName)); + EXPECT_TRUE(data.WriteUint32(netId)); + EXPECT_TRUE(data.WriteUint8(bearerType)); MessageParcel reply; int32_t ret = notifyStub_->CmdNetworkAddInterface(data, reply); @@ -1141,12 +428,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNetworkDestroy001, TestSize.Level1) int32_t netId = 1001; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(netId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdNetworkDestroy(data, reply); @@ -1159,19 +442,10 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetFwmarkForNetwork001, TestSize.Level1 int32_t mark = 0; int32_t mask = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(netId)) { - return; - } - if (!data.WriteUint32(mark)) { - return; - } - if (!data.WriteUint32(mask)) { - return; - } - + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(netId)); + EXPECT_TRUE(data.WriteUint32(mark)); + EXPECT_TRUE(data.WriteUint32(mask)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetFwmarkForNetwork(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -1215,15 +489,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDhcpClient001, TestSize.Level1) std::string iface = "testIface"; bool bIpv6 = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(iface)) { - return; - } - if (!data.WriteBool(bIpv6)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(iface)); + EXPECT_TRUE(data.WriteBool(bIpv6)); MessageParcel reply; int32_t ret = notifyStub_->CmdStartDhcpClient(data, reply); @@ -1239,15 +507,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDhcpService001, TestSize.Level1) std::string ipv4addr = "testIpv4addr"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(iface)) { - return; - } - if (!data.WriteString(ipv4addr)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(iface)); + EXPECT_TRUE(data.WriteString(ipv4addr)); MessageParcel reply; int32_t ret = notifyStub_->CmdStartDhcpService(data, reply); @@ -1262,12 +524,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdIpForwarding001, TestSize.Level1) std::string requester = "testRequester"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(requester)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(requester)); MessageParcel reply; int32_t ret = notifyStub_->CmdIpEnableForwarding(data, reply); @@ -1283,15 +541,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNat001, TestSize.Level1) std::string upstreamIface = "testUpstreamIface"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(downstreamIface)) { - return; - } - if (!data.WriteString(upstreamIface)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(downstreamIface)); + EXPECT_TRUE(data.WriteString(upstreamIface)); MessageParcel reply; int32_t ret = notifyStub_->CmdEnableNat(data, reply); @@ -1307,15 +559,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdIpfwdInterfaceForward001, TestSize.Leve std::string toIface = "testToIface"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(fromIface)) { - return; - } - if (!data.WriteString(toIface)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(fromIface)); + EXPECT_TRUE(data.WriteString(toIface)); MessageParcel reply; int32_t ret = notifyStub_->CmdIpfwdAddInterfaceForward(data, reply); @@ -1330,12 +576,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdBandwidthEnableDataSaver001, TestSize.L bool enable = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteBool(enable)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteBool(enable)); MessageParcel reply; int32_t ret = notifyStub_->CmdBandwidthEnableDataSaver(data, reply); @@ -1347,12 +589,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdBandwidthIfaceQuota001, TestSize.Level1 std::string ifName = "testIfName"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(ifName)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(ifName)); MessageParcel reply; int32_t ret = notifyStub_->CmdBandwidthSetIfaceQuota(data, reply); @@ -1367,12 +605,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdBandwidthList001, TestSize.Level1) uint32_t uid = 1001; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(uid)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(uid)); MessageParcel reply; int32_t ret = notifyStub_->CmdBandwidthAddDeniedList(data, reply); @@ -1395,15 +629,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdFirewallSetUidsListChain001, TestSize.L uint32_t uid = 1001; MessageParcel data; - if (!data.WriteUint32(chain)) { - return; - } - if (!data.WriteUint32(uidSize)) { - return; - } - if (!data.WriteUint32(uid)) { - return; - } + EXPECT_TRUE(data.WriteUint32(chain)); + EXPECT_TRUE(data.WriteUint32(uidSize)); + EXPECT_TRUE(data.WriteUint32(uid)); MessageParcel reply; int32_t ret = notifyStub_->CmdFirewallSetUidsAllowedListChain(data, reply); @@ -1419,15 +647,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdFirewallEnableChain001, TestSize.Level1 bool enable = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(chain)) { - return; - } - if (!data.WriteBool(enable)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(chain)); + EXPECT_TRUE(data.WriteBool(enable)); MessageParcel reply; int32_t ret = notifyStub_->CmdFirewallEnableChain(data, reply); @@ -1441,18 +663,10 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdFirewallSetUidRule001, TestSize.Level1) uint32_t firewallRule = 1; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(chain)) { - return; - } - if (!data.WriteUint32(uid)) { - return; - } - if (!data.WriteUint32(firewallRule)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(chain)); + EXPECT_TRUE(data.WriteUint32(uid)); + EXPECT_TRUE(data.WriteUint32(firewallRule)); MessageParcel reply; int32_t ret = notifyStub_->CmdFirewallSetUidRule(data, reply); @@ -1465,9 +679,7 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdClearFirewallAllRules001, TestSize.Leve bool enable = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); MessageParcel reply; int32_t ret = notifyStub_->CmdClearFirewallAllRules(data, reply); @@ -1479,12 +691,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdShareDnsSet001, TestSize.Level1) uint16_t netId = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint16(netId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdShareDnsSet(data, reply); @@ -1494,9 +702,7 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdShareDnsSet001, TestSize.Level1) HWTEST_F(NetsysNativeServiceStubTest, CmdDnsProxyListen001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); MessageParcel reply; int32_t ret = notifyStub_->CmdStartDnsProxyListen(data, reply); @@ -1512,15 +718,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetNetworkSharingTraffic001, TestSize.L std::string upIface = "testUpIface "; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(downIface)) { - return; - } - if (!data.WriteString(upIface)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(downIface)); + EXPECT_TRUE(data.WriteString(upIface)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetNetworkSharingTraffic(data, reply); @@ -1531,12 +731,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetTotalStats001, TestSize.Level1) { uint32_t type = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(type)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(type)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetTotalStats(data, reply); @@ -1548,15 +744,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetUidStats001, TestSize.Level1) uint32_t type = 0; uint32_t uId = 2020; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(type)) { - return; - } - if (!data.WriteInt32(uId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(type)); + EXPECT_TRUE(data.WriteInt32(uId)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetUidStats(data, reply); @@ -1569,15 +759,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetIfaceStats001, TestSize.Level1) std::string Iface = "wlan0"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(type)) { - return; - } - if (!data.WriteString(Iface)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(type)); + EXPECT_TRUE(data.WriteString(Iface)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetIfaceStats(data, reply); @@ -1809,15 +993,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdAddStaticArp001, TestSize.Level1) std::string ifName = "wlan0"; MessageParcel data; - if (!data.WriteString(ipAddr)) { - return; - } - if (!data.WriteString(macAddr)) { - return; - } - if (!data.WriteString(ifName)) { - return; - } + EXPECT_TRUE(data.WriteString(ipAddr)); + EXPECT_TRUE(data.WriteString(macAddr)); + EXPECT_TRUE(data.WriteString(ifName)); MessageParcel reply; int32_t ret = notifyStub_->CmdAddStaticArp(data, reply); @@ -1831,15 +1009,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDelStaticArp001, TestSize.Level1) std::string ifNameTest = "wlan0"; MessageParcel data; - if (!data.WriteString(ipAddrTest)) { - return; - } - if (!data.WriteString(macAddrTest)) { - return; - } - if (!data.WriteString(ifNameTest)) { - return; - } + EXPECT_TRUE(data.WriteString(ipAddrTest)); + EXPECT_TRUE(data.WriteString(ifNameTest)); + EXPECT_TRUE(data.WriteString(ifNameTest)); MessageParcel reply; auto ret = notifyStub_->CmdDelStaticArp(data, reply); @@ -1853,15 +1025,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdAddStaticIpv6Addr001, TestSize.Level1) std::string ifName = "chba0"; MessageParcel data; - if (!data.WriteString(ipAddr)) { - return; - } - if (!data.WriteString(macAddr)) { - return; - } - if (!data.WriteString(ifName)) { - return; - } + EXPECT_TRUE(data.WriteString(ipAddr)); + EXPECT_TRUE(data.WriteString(macAddr)); + EXPECT_TRUE(data.WriteString(ifName)); MessageParcel reply; int32_t ret = notifyStub_->CmdAddStaticIpv6Addr(data, reply); @@ -1875,15 +1041,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDelStaticIpv6Addr001, TestSize.Level1) std::string ifNameTest = "chba0"; MessageParcel data; - if (!data.WriteString(ipAddrTest)) { - return; - } - if (!data.WriteString(macAddrTest)) { - return; - } - if (!data.WriteString(ifNameTest)) { - return; - } + EXPECT_TRUE(data.WriteString(ipAddrTest)); + EXPECT_TRUE(data.WriteString(ifNameTest)); + EXPECT_TRUE(data.WriteString(ifNameTest)); MessageParcel reply; auto ret = notifyStub_->CmdDelStaticIpv6Addr(data, reply); @@ -1894,15 +1054,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetCookieStats001, TestSize.Level1) { uint32_t type = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(type)) { - return; - } - if (!data.WriteUint64(TEST_COOKIE)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(type)); + EXPECT_TRUE(data.WriteUint64(TEST_COOKIE)); MessageParcel reply; int32_t ret = notifyStub_->CmdGetCookieStats(data, reply); @@ -1912,17 +1066,11 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdGetCookieStats001, TestSize.Level1) HWTEST_F(NetsysNativeServiceStubTest, CmdRegisterDnsResultListener001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) TestNetDnsResultCallback(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); uint32_t timeStep = 1; - if (!data.WriteUint32(timeStep)) { - return; - } + EXPECT_TRUE(data.WriteUint32(timeStep)); MessageParcel reply; int32_t ret = notifyStub_->CmdRegisterDnsResultListener(data, reply); EXPECT_EQ(ret, IPC_STUB_ERR); @@ -1931,13 +1079,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdRegisterDnsResultListener001, TestSize. HWTEST_F(NetsysNativeServiceStubTest, CmdUnregisterDnsResultListener001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); sptr callback = new (std::nothrow) TestNetDnsResultCallback(); - if (!data.WriteRemoteObject(callback->AsObject().GetRefPtr())) { - return; - } + EXPECT_TRUE(data.WriteRemoteObject(callback->AsObject().GetRefPtr())); MessageParcel reply; int32_t ret = notifyStub_->CmdUnregisterDnsResultListener(data, reply); @@ -1947,9 +1091,7 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdUnregisterDnsResultListener001, TestSiz HWTEST_F(NetsysNativeServiceStubTest, CmdGetNetworkSharingType001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); MessageParcel reply; int32_t ret = notifyStub_->CmdGetNetworkSharingType(data, reply); @@ -1961,15 +1103,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdUpdateNetworkSharingType001, TestSize.L uint32_t type = 0; bool isOpen = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(type)) { - return; - } - if (!data.WriteBool(isOpen)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(type)); + EXPECT_TRUE(data.WriteBool(isOpen)); MessageParcel reply; int32_t ret = notifyStub_->CmdUpdateNetworkSharingType(data, reply); @@ -1981,15 +1117,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdSetIpv6PrivacyExtensions001, TestSize.L std::string interface = "wlan0"; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteString(interface)) { - return; - } - if (!data.WriteUint32(0)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteString(interface)); + EXPECT_TRUE(data.WriteUint32(0)); MessageParcel reply; int32_t ret = notifyStub_->CmdSetIpv6PrivacyExtensions(data, reply); EXPECT_EQ(ret, ERR_NONE); @@ -2006,24 +1136,11 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdSetNetworkAccessPolicy001, TestSize.Lev netAccessPolicy.cellularAllow = false; bool reconfirmFlag = true; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(uid)) { - return; - } - - if (!data.WriteUint8(netAccessPolicy.wifiAllow)) { - return; - } - - if (!data.WriteUint8(netAccessPolicy.cellularAllow)) { - return; - } - - if (!data.WriteBool(reconfirmFlag)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(uid)); + EXPECT_TRUE(data.WriteUint8(netAccessPolicy.wifiAllow)); + EXPECT_TRUE(data.WriteUint8(netAccessPolicy.cellularAllow)); + EXPECT_TRUE(data.WriteBool(reconfirmFlag)); MessageParcel reply; int32_t ret = notifyStub_->CmdSetNetworkAccessPolicy(data, reply); @@ -2034,12 +1151,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDeleteNetworkAccessPolicy001, TestSize. { uint32_t uid = 0; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint32(uid)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint32(uid)); MessageParcel reply; int32_t ret = notifyStub_->CmdDelNetworkAccessPolicy(data, reply); @@ -2054,14 +1167,10 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdNotifyNetBearerTypeChange001, TestSize. MessageParcel data; uint32_t size = static_cast(bearerTypes.size()); - if (!data.WriteUint32(size)) { - return; - } + EXPECT_TRUE(data.WriteUint32(size)); for (auto bearerType : bearerTypes) { - if (!data.WriteUint32(static_cast(bearerType))) { - return; - } + EXPECT_TRUE(data.WriteUint32(static_cast(bearerType))); } MessageParcel reply; @@ -2077,26 +1186,13 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdCreateVnic001, TestSize.Level1) int32_t prefix = 24; std::set uids; - if (!data.WriteUint16(mtu)) { - return; - } - - if (!data.WriteString(tunAddr)) { - return; - } - - if (!data.WriteInt32(prefix)) { - return; - } - - if (!data.WriteInt32(uids.size())) { - return; - } + EXPECT_TRUE(data.WriteUint16(mtu)); + EXPECT_TRUE(data.WriteString(tunAddr)); + EXPECT_TRUE(data.WriteInt32(prefix)); + EXPECT_TRUE(data.WriteInt32(uids.size())); for (const auto &uid: uids) { - if (!data.WriteInt32(uid)) { - return; - } + EXPECT_TRUE(data.WriteInt32(uid)); } MessageParcel reply; @@ -2118,13 +1214,8 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdCloseSocketsUid001, TestSize.Level1) std::string ipAddr = "192.168.1.100"; uint32_t netId = 24; - if (!data.WriteString(ipAddr)) { - return; - } - - if (!data.WriteUint32(netId)) { - return; - } + EXPECT_TRUE(data.WriteString(ipAddr)); + EXPECT_TRUE(data.WriteUint32(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdCloseSocketsUid(data, reply); @@ -2138,13 +1229,10 @@ HWTEST_F(NetsysNativeServiceStubTest, SetBrokerUidAccessPolicyMapTest001, TestSi params.emplace(TEST_UID_U32, TEST_UID_U32); uint32_t count = static_cast(params.size()); - if (!data.WriteUint32(count)) { - return; - } + EXPECT_TRUE(data.WriteUint32(count)); for (auto iter = params.begin(); iter != params.end(); iter++) { - if (!data.WriteUint32(iter->first) || !data.WriteUint32(iter->second)) { - return; - } + EXPECT_TRUE(data.WriteUint32(iter->first)); + EXPECT_TRUE(data.WriteUint32(iter->second)); } MessageParcel reply; @@ -2155,9 +1243,7 @@ HWTEST_F(NetsysNativeServiceStubTest, SetBrokerUidAccessPolicyMapTest001, TestSi HWTEST_F(NetsysNativeServiceStubTest, DelBrokerUidAccessPolicyMapTest001, TestSize.Level1) { MessageParcel data; - if (!data.WriteUint32(TEST_UID_U32)) { - return; - } + EXPECT_TRUE(data.WriteUint32(TEST_UID_U32)); MessageParcel reply; int32_t ret = notifyStub_->CmdDelBrokerUidAccessPolicyMap(data, reply); @@ -2170,15 +1256,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdEnableWearableDistributedNetForward, Te uint32_t type = 0; uint32_t uId = 2020; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(type)) { - return; - } - if (!data.WriteInt32(uId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(type)); + EXPECT_TRUE(data.WriteInt32(uId)); MessageParcel reply; int32_t ret = notifyStub_->CmdEnableWearableDistributedNetForward(data, reply); @@ -2190,15 +1270,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdDisableWearableDistributedNetForward, T uint32_t type = 0; uint32_t uId = 2020; MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteInt32(type)) { - return; - } - if (!data.WriteInt32(uId)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteInt32(type)); + EXPECT_TRUE(data.WriteInt32(uId)); MessageParcel reply; int32_t ret = notifyStub_->CmdDisableWearableDistributedNetForward(data, reply); @@ -2259,10 +1333,9 @@ HWTEST_F(NetsysNativeServiceStubTest, CmdSetNetStatusMapTest001, TestSize.Level1 HWTEST_F(NetsysNativeServiceStubTest, FlushDnsCache001, TestSize.Level1) { + uint16_t netId = 1001; MessageParcel data; - if (!data.WriteUint32(TEST_UID_U32)) { - return; - } + EXPECT_TRUE(data.WriteUint16(netId)); MessageParcel reply; int32_t ret = notifyStub_->CmdFlushDnsCache(data, reply); @@ -2272,23 +1345,15 @@ HWTEST_F(NetsysNativeServiceStubTest, FlushDnsCache001, TestSize.Level1) HWTEST_F(NetsysNativeServiceStubTest, CmdDeleteIncreaseTrafficMap001, TestSize.Level1) { MessageParcel data; - if (!data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data.WriteUint64(0)) { - return; - } + EXPECT_TRUE(data.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data.WriteUint64(0)); MessageParcel reply; int32_t ret = notifyStub_->CmdDeleteIncreaseTrafficMap(data, reply); EXPECT_EQ(ret, ERR_NONE); MessageParcel data2; - if (!data2.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())) { - return; - } - if (!data2.WriteUint8(0)) { - return; - } + EXPECT_TRUE(data2.WriteInterfaceToken(NetsysNativeServiceStub::GetDescriptor())); + EXPECT_TRUE(data2.WriteUint8(0)); MessageParcel reply2; int32_t ret2 = notifyStub_->CmdDeleteIncreaseTrafficMap(data2, reply2); EXPECT_EQ(ret, ERR_NONE); @@ -2300,17 +1365,9 @@ HWTEST_F(NetsysNativeServiceStubTest, SetDnsCache001, TestSize.Level1) std::string testHost = "test"; AddrInfo info; MessageParcel data; - if (!data.WriteUint32(netId)) { - return; - } - - if (!data.WriteString(testHost)) { - return; - } - - if (!data.WriteRawData(&info, sizeof(AddrInfo))) { - return; - } + EXPECT_TRUE(data.WriteUint32(netId)); + EXPECT_TRUE(data.WriteString(testHost)); + EXPECT_TRUE(data.WriteRawData(&info, sizeof(AddrInfo))); MessageParcel reply; int32_t ret = notifyStub_->CmdSetDnsCache(data, reply); diff --git a/test/netstatsmanager/unittest/net_stats_manager_test/BUILD.gn b/test/netstatsmanager/unittest/net_stats_manager_test/BUILD.gn index 76c3a428c..e6de1a46f 100644 --- a/test/netstatsmanager/unittest/net_stats_manager_test/BUILD.gn +++ b/test/netstatsmanager/unittest/net_stats_manager_test/BUILD.gn @@ -225,6 +225,7 @@ ohos_unittest("net_stats_cached_service_test") { deps = [ "$INNERKITS_ROOT/netstatsclient:net_stats_manager_if", + "$INNERKITS_ROOT/netmanagernative:net_native_manager_if", "$NETCONNMANAGER_COMMON_DIR:net_service_common", "$NETMANAGER_BASE_ROOT/services/netstatsmanager:net_stats_manager_static", "$NETMANAGER_BASE_ROOT/utils:net_manager_common", diff --git a/utils/bundle_utils/include/net_bundle.h b/utils/bundle_utils/include/net_bundle.h index 2868c6269..5ce865db1 100644 --- a/utils/bundle_utils/include/net_bundle.h +++ b/utils/bundle_utils/include/net_bundle.h @@ -56,8 +56,8 @@ public: virtual std::optional> ObtainBundleInfoForActive() = 0; virtual std::optional ObtainBundleInfoForUid(uint32_t uid) = 0; }; -extern "C" __attribute__((visibility("default"))) INetBundle *GetNetBundle(); -extern "C" __attribute__((visibility("default"))) bool IsAtomicService(std::string &bundleName); +extern "C" INetBundle *GetNetBundle(); +extern "C" bool IsAtomicService(std::string &bundleName); } // namespace NetManagerStandard } // namespace OHOS #endif // NET_BUNDLE__H \ No newline at end of file diff --git a/utils/bundle_utils/include/net_bundle_impl.h b/utils/bundle_utils/include/net_bundle_impl.h index c854d56fd..120e2546c 100644 --- a/utils/bundle_utils/include/net_bundle_impl.h +++ b/utils/bundle_utils/include/net_bundle_impl.h @@ -32,8 +32,8 @@ public: private: int32_t GetActivatedOsAccountId(int32_t &userId); }; -extern "C" __attribute__((visibility("default"))) INetBundle *GetNetBundle(); -extern "C" __attribute__((visibility("default"))) bool IsAtomicService(std::string &bundleName); +extern "C" INetBundle *GetNetBundle(); +extern "C" bool IsAtomicService(std::string &bundleName); } // namespace NetManagerStandard } // namespace OHOS #endif // NET_BUNDLE_IMPL_H \ No newline at end of file -- Gitee