From b99cb78281915a9a2587aca981fa69c969ba8f93 Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Thu, 13 Jun 2024 16:11:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SubmarinePhantom --- services/netstatsmanager/src/stub/net_stats_service_stub.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/netstatsmanager/src/stub/net_stats_service_stub.cpp b/services/netstatsmanager/src/stub/net_stats_service_stub.cpp index e17d32e46..05712821d 100755 --- a/services/netstatsmanager/src/stub/net_stats_service_stub.cpp +++ b/services/netstatsmanager/src/stub/net_stats_service_stub.cpp @@ -410,13 +410,13 @@ int32_t NetStatsServiceStub::CheckNetManagerAvailable(MessageParcel &reply) if (!reply.WriteInt32(NETMANAGER_ERR_NOT_SYSTEM_CALL)) { return IPC_STUB_WRITE_PARCEL_ERR; } - return NETMANAGER_SUCCESS; + return NETMANAGER_ERR_NOT_SYSTEM_CALL; } if (!NetManagerPermission::CheckPermission(Permission::GET_NETWORK_STATS)) { if (!reply.WriteInt32(NETMANAGER_ERR_PERMISSION_DENIED)) { return IPC_STUB_WRITE_PARCEL_ERR; } - return NETMANAGER_SUCCESS; + return NETMANAGER_ERR_PERMISSION_DENIED; } return NETMANAGER_SUCCESS; -- Gitee From 3adf6363eaf7779ec5cbc4ee02d1564883197544 Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Tue, 18 Jun 2024 20:17:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A5=E5=85=85UpdateIfacesStats=20Reset?= =?UTF-8?q?Factory=20UT=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SubmarinePhantom --- .../net_stats_service_stub_test.cpp | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp b/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp index 67b3a3de6..9a4d9fb7c 100644 --- a/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp +++ b/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp @@ -453,6 +453,66 @@ HWTEST_F(TestNetStatsServiceStub, UpdateIfacesStatsTest001, TestSize.Level1) EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); } +/** + * @tc.name: UpdateIfacesStatsTest002 + * @tc.desc: Test NetConnCallbackStub UpdateIfacesStats. + * @tc.type: FUNC + */ +HWTEST_F(TestNetStatsServiceStub, UpdateIfacesStatsTest002, TestSize.Level1) +{ + NetManagerBaseNotSystemToken token; + MessageParcel data; + if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { + return; + } + if (!data.WriteString(TEST_STRING)) { + return; + } + if (!data.WriteUint64(TEST_UINT64_VALUE)) { + return; + } + if (!data.WriteUint64(TEST_UINT64_VALUE)) { + return; + } + NetStatsInfo stats; + stats.Marshalling(data); + MessageParcel reply; + MessageOption option; + int32_t ret = instance_->OnRemoteRequest(static_cast(StatsInterfaceCode::CMD_UPDATE_IFACES_STATS), data, + reply, option); + EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_ERR_NOT_SYSTEM_CALL); +} + +/** + * @tc.name: UpdateIfacesStatsTest003 + * @tc.desc: Test NetConnCallbackStub UpdateIfacesStats. + * @tc.type: FUNC + */ +HWTEST_F(TestNetStatsServiceStub, UpdateIfacesStatsTest003, TestSize.Level1) +{ + NetManagerBaseNoPermissionToken token; + MessageParcel data; + if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { + return; + } + if (!data.WriteString(TEST_STRING)) { + return; + } + if (!data.WriteUint64(TEST_UINT64_VALUE)) { + return; + } + if (!data.WriteUint64(TEST_UINT64_VALUE)) { + return; + } + NetStatsInfo stats; + stats.Marshalling(data); + MessageParcel reply; + MessageOption option; + int32_t ret = instance_->OnRemoteRequest(static_cast(StatsInterfaceCode::CMD_UPDATE_IFACES_STATS), data, + reply, option); + EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_ERR_PERMISSION_DENIED); +} + /** * @tc.name: UpdateStatsDataTest001 * @tc.desc: Test NetConnCallbackStub UpdateStatsData. @@ -466,6 +526,7 @@ HWTEST_F(TestNetStatsServiceStub, UpdateStatsDataTest001, TestSize.Level1) } MessageParcel reply; MessageOption option; + int32_t ret = instance_->OnRemoteRequest(static_cast(StatsInterfaceCode::CMD_UPDATE_STATS_DATA), data, reply, option); EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); @@ -489,6 +550,44 @@ HWTEST_F(TestNetStatsServiceStub, ResetFactoryTest001, TestSize.Level1) EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_SUCCESS); } +/** + * @tc.name: ResetFactoryTest002 + * @tc.desc: Test NetConnCallbackStub ResetFactory. + * @tc.type: FUNC + */ +HWTEST_F(TestNetStatsServiceStub, ResetFactoryTest002, TestSize.Level1) +{ + NetManagerBaseNotSystemToken token; + MessageParcel data; + if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { + return; + } + MessageParcel reply; + MessageOption option; + int32_t ret = instance_->OnRemoteRequest(static_cast(StatsInterfaceCode::CMD_NSM_RESET_FACTORY), data, + reply, option); + EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_ERR_NOT_SYSTEM_CALL); +} + +/** + * @tc.name: ResetFactoryTest003 + * @tc.desc: Test NetConnCallbackStub ResetFactory. + * @tc.type: FUNC + */ +HWTEST_F(TestNetStatsServiceStub, ResetFactoryTest003, TestSize.Level1) +{ + NetManagerBaseNoPermissionToken token; + MessageParcel data; + if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { + return; + } + MessageParcel reply; + MessageOption option; + int32_t ret = instance_->OnRemoteRequest(static_cast(StatsInterfaceCode::CMD_NSM_RESET_FACTORY), data, + reply, option); + EXPECT_EQ(ret, NetManagerStandard::NETMANAGER_ERR_PERMISSION_DENIED); +} + /** * @tc.name: GetAllStatsInfoTest001 * @tc.desc: Test NetConnCallbackStub GetAllStatsInfo. -- Gitee From 52bc024be14de7d356eea010391968bf59acf882 Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Tue, 18 Jun 2024 14:34:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?UT=E7=94=A8=E4=BE=8B=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SubmarinePhantom --- .../net_stats_service_stub_test.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp b/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp index 9a4d9fb7c..a8832c28e 100644 --- a/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp +++ b/test/netstatsmanager/unittest/net_stats_manager_test/net_stats_service_stub_test.cpp @@ -21,11 +21,11 @@ #define protected public #endif +#include "common_net_stats_callback_test.h" #include "i_net_stats_callback.h" #include "net_all_capabilities.h" - #include "net_stats_service_stub.h" -#include "common_net_stats_callback_test.h" +#include "netmanager_base_test_security.h" namespace OHOS { namespace NetManagerStandard { @@ -174,6 +174,7 @@ HWTEST_F(TestNetStatsServiceStub, OnRemoteRequestTest001, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, RegisterNetStatsCallbackTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -196,6 +197,7 @@ HWTEST_F(TestNetStatsServiceStub, RegisterNetStatsCallbackTest001, TestSize.Leve */ HWTEST_F(TestNetStatsServiceStub, UnregisterNetStatsCallbackTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -374,6 +376,7 @@ HWTEST_F(TestNetStatsServiceStub, GetUidTxBytesTest001, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, GetIfaceStatsDetailTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -401,6 +404,7 @@ HWTEST_F(TestNetStatsServiceStub, GetIfaceStatsDetailTest001, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, GetUidStatsDetailTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -431,6 +435,7 @@ HWTEST_F(TestNetStatsServiceStub, GetUidStatsDetailTest001, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, UpdateIfacesStatsTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -520,6 +525,7 @@ HWTEST_F(TestNetStatsServiceStub, UpdateIfacesStatsTest003, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, UpdateStatsDataTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -539,6 +545,7 @@ HWTEST_F(TestNetStatsServiceStub, UpdateStatsDataTest001, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, ResetFactoryTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; @@ -595,6 +602,7 @@ HWTEST_F(TestNetStatsServiceStub, ResetFactoryTest003, TestSize.Level1) */ HWTEST_F(TestNetStatsServiceStub, GetAllStatsInfoTest001, TestSize.Level1) { + NetManagerBaseAccessToken token; MessageParcel data; if (!data.WriteInterfaceToken(NetStatsServiceStub::GetDescriptor())) { return; -- Gitee