From 9821474ae412e83e09dd167a18be1012d226a337 Mon Sep 17 00:00:00 2001
From: l00635678
Date: Tue, 4 Mar 2025 22:46:38 +0800
Subject: [PATCH] =?UTF-8?q?DT=E8=A6=86=E7=9B=96=E7=8E=87=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: k-lee9575
---
bundle.json | 12 +--
.../src/networkshare_upstreammonitor.cpp | 10 +--
test/BUILD.gn | 29 +++++++
.../router_advertisement_daemon_test.cpp | 78 +++++++++----------
4 files changed, 71 insertions(+), 58 deletions(-)
create mode 100644 test/BUILD.gn
diff --git a/bundle.json b/bundle.json
index 967e6aca..17c66d87 100644
--- a/bundle.json
+++ b/bundle.json
@@ -178,17 +178,7 @@
}
],
"test": [
- "//foundation/communication/netmanager_ext/test/ethernetmanager:unittest",
- "//foundation/communication/netmanager_ext/test/ethernetmanager:fuzztest",
- "//foundation/communication/netmanager_ext/test/networksharemanager:fuzztest",
- "//foundation/communication/netmanager_ext/test/networksharemanager:unittest",
- "//foundation/communication/netmanager_ext/test/mdnsmanager:fuzztest",
- "//foundation/communication/netmanager_ext/test/mdnsmanager:unittest",
- "//foundation/communication/netmanager_ext/test/vpnmanager:unittest",
- "//foundation/communication/netmanager_ext/test/vpnmanager:fuzztest",
- "//foundation/communication/netmanager_ext/test/netfirewallmanager:unittest",
- "//foundation/communication/netmanager_ext/test/netfirewallmanager:fuzztest",
- "//foundation/communication/netmanager_ext/test/wearabledistributednetmanager:unittest"
+ "//foundation/communication/netmanager_ext/test:netmanager_ext_test"
]
}
}
diff --git a/services/networksharemanager/src/networkshare_upstreammonitor.cpp b/services/networksharemanager/src/networkshare_upstreammonitor.cpp
index db904a23..8f135ea1 100644
--- a/services/networksharemanager/src/networkshare_upstreammonitor.cpp
+++ b/services/networksharemanager/src/networkshare_upstreammonitor.cpp
@@ -93,14 +93,8 @@ NetworkShareUpstreamMonitor::NetworkShareUpstreamMonitor() : defaultNetworkId_(I
NetworkShareUpstreamMonitor::~NetworkShareUpstreamMonitor()
{
- {
- std::lock_guard lock(networkMapMutex_);
- networkMaps_.clear();
- }
- {
- std::lock_guard lock(networkCallbackMutex_);
- NetConnClient::GetInstance().UnregisterNetConnCallback(defaultNetworkCallback_);
- }
+ std::lock_guard lock(networkMapMutex_);
+ networkMaps_.clear();
}
void NetworkShareUpstreamMonitor::SetOptionData(int32_t what)
diff --git a/test/BUILD.gn b/test/BUILD.gn
new file mode 100644
index 00000000..d933c5a8
--- /dev/null
+++ b/test/BUILD.gn
@@ -0,0 +1,29 @@
+# Copyright (c) 2025-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.
+
+group("netmanager_ext_test") {
+ testonly = true
+ deps = [
+ "ethernetmanager:fuzztest",
+ "ethernetmanager:unittest",
+ "mdnsmanager:fuzztest",
+ "mdnsmanager:unittest",
+ "netfirewallmanager:fuzztest",
+ "netfirewallmanager:unittest",
+ "networksharemanager:fuzztest",
+ "networksharemanager:unittest",
+ "vpnmanager:fuzztest",
+ "vpnmanager:unittest",
+ "wearabledistributednetmanager:unittest",
+ ]
+}
diff --git a/test/networksharemanager/unittest/networkshare_manager_test/router_advertisement_daemon_test.cpp b/test/networksharemanager/unittest/networkshare_manager_test/router_advertisement_daemon_test.cpp
index f0c26f0c..6d868df2 100644
--- a/test/networksharemanager/unittest/networkshare_manager_test/router_advertisement_daemon_test.cpp
+++ b/test/networksharemanager/unittest/networkshare_manager_test/router_advertisement_daemon_test.cpp
@@ -59,12 +59,12 @@ void RouterAdvertisementDaemonTest::TearDown() {}
*/
HWTEST_F(RouterAdvertisementDaemonTest, StartStopRaTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
- auto ret = routerAdvertiseDaemon.StartRa();
+ auto routerAdvertiseDaemon = std::make_shared();
+ auto ret = routerAdvertiseDaemon->StartRa();
EXPECT_EQ(ret, NETMANAGER_EXT_SUCCESS);
- EXPECT_TRUE(routerAdvertiseDaemon.IsSocketValid());
- routerAdvertiseDaemon.StopRa();
- EXPECT_FALSE(routerAdvertiseDaemon.IsSocketValid());
+ EXPECT_TRUE(routerAdvertiseDaemon->IsSocketValid());
+ routerAdvertiseDaemon->StopRa();
+ EXPECT_FALSE(routerAdvertiseDaemon->IsSocketValid());
}
/**
@@ -75,10 +75,10 @@ HWTEST_F(RouterAdvertisementDaemonTest, StartStopRaTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, CreateRASocketTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
- auto ret = routerAdvertiseDaemon.CreateRASocket();
+ auto routerAdvertiseDaemon = std::make_shared();
+ auto ret = routerAdvertiseDaemon->CreateRASocket();
EXPECT_TRUE(ret);
- EXPECT_TRUE(routerAdvertiseDaemon.IsSocketValid());
+ EXPECT_TRUE(routerAdvertiseDaemon->IsSocketValid());
}
/**
@@ -89,9 +89,9 @@ HWTEST_F(RouterAdvertisementDaemonTest, CreateRASocketTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, CloseRaSocketTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
- routerAdvertiseDaemon.CloseRaSocket();
- EXPECT_FALSE(routerAdvertiseDaemon.IsSocketValid());
+ auto routerAdvertiseDaemon = std::make_shared();
+ routerAdvertiseDaemon->CloseRaSocket();
+ EXPECT_FALSE(routerAdvertiseDaemon->IsSocketValid());
}
/**
@@ -102,14 +102,14 @@ HWTEST_F(RouterAdvertisementDaemonTest, CloseRaSocketTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, MaybeSendRaTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
sockaddr_in6 dest;
dest.sin6_port = htons(0);
dest.sin6_family = AF_INET6;
dest.sin6_scope_id = 0;
inet_pton(AF_INET6, "ff02::1", &dest.sin6_addr);
- routerAdvertiseDaemon.raPacketLength_ = RA_HEADER_SIZE - 1;
- auto ret = routerAdvertiseDaemon.MaybeSendRa(dest);
+ routerAdvertiseDaemon->raPacketLength_ = RA_HEADER_SIZE - 1;
+ auto ret = routerAdvertiseDaemon->MaybeSendRa(dest);
EXPECT_FALSE(ret);
}
@@ -121,9 +121,9 @@ HWTEST_F(RouterAdvertisementDaemonTest, MaybeSendRaTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, HupRaThreadTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
- routerAdvertiseDaemon.HupRaThread();
- EXPECT_TRUE(routerAdvertiseDaemon.stopRaThread_);
+ auto routerAdvertiseDaemon = std::make_shared();
+ routerAdvertiseDaemon->HupRaThread();
+ EXPECT_TRUE(routerAdvertiseDaemon->stopRaThread_);
}
/**
@@ -134,7 +134,7 @@ HWTEST_F(RouterAdvertisementDaemonTest, HupRaThreadTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, GetDeprecatedRaParamsTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
const char *ipv6Prefix1 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
const char *ipv6Prefix2 = "2001:0db8:85a3:0000:0000:8a2e:0370:7335";
const char *dns1 = "2001:0db8:85a3:0000:0000:8a2e:0370:7336";
@@ -156,7 +156,7 @@ HWTEST_F(RouterAdvertisementDaemonTest, GetDeprecatedRaParamsTest, TestSize.Leve
newRa.dnses_.emplace_back(testDns1);
newRa.prefixes_.emplace_back(ipPrefix2);
newRa.dnses_.emplace_back(testDns2);
- RaParams deprecateRa = routerAdvertiseDaemon.GetDeprecatedRaParams(oldRa, newRa);
+ RaParams deprecateRa = routerAdvertiseDaemon->GetDeprecatedRaParams(oldRa, newRa);
EXPECT_EQ(deprecateRa.prefixes_.size(), 1);
EXPECT_EQ(deprecateRa.dnses_.size(), 1);
int prefixRet = memcmp(deprecateRa.prefixes_[0].address.s6_addr, ipPrefix1.address.s6_addr, sizeof(in6_addr));
@@ -173,15 +173,15 @@ HWTEST_F(RouterAdvertisementDaemonTest, GetDeprecatedRaParamsTest, TestSize.Leve
*/
HWTEST_F(RouterAdvertisementDaemonTest, BuildNewRaTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
RaParams newRa;
newRa.hasDefaultRoute_ = true;
newRa.hopLimit_ = 255;
newRa.mtu_ = 1500;
- routerAdvertiseDaemon.BuildNewRa(newRa);
- EXPECT_EQ(routerAdvertiseDaemon.raParams_->hasDefaultRoute_, true);
- EXPECT_EQ(routerAdvertiseDaemon.raParams_->hopLimit_, 255);
- EXPECT_EQ(routerAdvertiseDaemon.raParams_->mtu_, 1500);
+ routerAdvertiseDaemon->BuildNewRa(newRa);
+ EXPECT_EQ(routerAdvertiseDaemon->raParams_->hasDefaultRoute_, true);
+ EXPECT_EQ(routerAdvertiseDaemon->raParams_->hopLimit_, 255);
+ EXPECT_EQ(routerAdvertiseDaemon->raParams_->mtu_, 1500);
}
/**
@@ -193,13 +193,13 @@ HWTEST_F(RouterAdvertisementDaemonTest, BuildNewRaTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, ResetRaRetryIntervalTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
- routerAdvertiseDaemon.sendRaTimes_ = 2;
- routerAdvertiseDaemon.ResetRaRetryInterval();
- EXPECT_EQ(routerAdvertiseDaemon.sendRaTimes_, 3);
- routerAdvertiseDaemon.sendRaTimes_ = 12;
- routerAdvertiseDaemon.ResetRaRetryInterval();
- EXPECT_EQ(routerAdvertiseDaemon.sendRaTimes_, 12);
+ auto routerAdvertiseDaemon = std::make_shared();
+ routerAdvertiseDaemon->sendRaTimes_ = 2;
+ routerAdvertiseDaemon->ResetRaRetryInterval();
+ EXPECT_EQ(routerAdvertiseDaemon->sendRaTimes_, 3);
+ routerAdvertiseDaemon->sendRaTimes_ = 12;
+ routerAdvertiseDaemon->ResetRaRetryInterval();
+ EXPECT_EQ(routerAdvertiseDaemon->sendRaTimes_, 12);
}
/**
@@ -210,10 +210,10 @@ HWTEST_F(RouterAdvertisementDaemonTest, ResetRaRetryIntervalTest, TestSize.Level
*/
HWTEST_F(RouterAdvertisementDaemonTest, PutRaHeaderTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
std::vector buffer;
uint8_t raBuf[TEST_BUF] = {};
- uint16_t raHeadLen = routerAdvertiseDaemon.PutRaHeader(raBuf);
+ uint16_t raHeadLen = routerAdvertiseDaemon->PutRaHeader(raBuf);
EXPECT_EQ(raHeadLen, sizeof(Icmpv6HeadSt));
EXPECT_EQ(raBuf[0], ICMPV6_ND_ROUTER_ADVERT_TYPE);
EXPECT_EQ(raBuf[1], 0);
@@ -241,11 +241,11 @@ HWTEST_F(RouterAdvertisementDaemonTest, PutRaHeaderTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, PutRaSllaTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
std::string mac = std::string("02:00:00:00:00:00");
const char defaultMac[HW_MAC_LENGTH] = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
uint8_t raBuf[TEST_BUF] = {};
- uint16_t raSllLen = routerAdvertiseDaemon.PutRaSlla(raBuf, mac);
+ uint16_t raSllLen = routerAdvertiseDaemon->PutRaSlla(raBuf, mac);
EXPECT_EQ(raSllLen, sizeof(Icmpv6SllOpt));
EXPECT_EQ(raBuf[0], ND_OPTION_SLLA_TYPE);
EXPECT_EQ(raBuf[1], 1);
@@ -262,10 +262,10 @@ HWTEST_F(RouterAdvertisementDaemonTest, PutRaSllaTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, PutRaMtuTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
int32_t mtu = 1500;
uint8_t raBuf[TEST_BUF] = {};
- uint16_t raMtuLen = routerAdvertiseDaemon.PutRaMtu(raBuf, mtu);
+ uint16_t raMtuLen = routerAdvertiseDaemon->PutRaMtu(raBuf, mtu);
EXPECT_EQ(raMtuLen, sizeof(Icmpv6MtuOpt));
EXPECT_EQ(raBuf[0], ND_OPTION_MTU_TYPE);
EXPECT_EQ(raBuf[1], 1);
@@ -285,14 +285,14 @@ HWTEST_F(RouterAdvertisementDaemonTest, PutRaMtuTest, TestSize.Level1)
*/
HWTEST_F(RouterAdvertisementDaemonTest, PutRaPioTest, TestSize.Level1)
{
- RouterAdvertisementDaemon routerAdvertiseDaemon;
+ auto routerAdvertiseDaemon = std::make_shared();
uint8_t raBuf[TEST_BUF] = {};
IpPrefix ipp;
ipp.prefix = IN6ADDR_LOOPBACK_INIT;
ipp.prefixesLength = 64;
int validTime = 3600;
int preferredTime = 3600;
- uint16_t raPrefixLen = routerAdvertiseDaemon.PutRaPio(raBuf, ipp);
+ uint16_t raPrefixLen = routerAdvertiseDaemon->PutRaPio(raBuf, ipp);
EXPECT_EQ(raPrefixLen, sizeof(Icmpv6PrefixInfoOpt));
EXPECT_EQ(raBuf[0], ND_OPTION_PIO_TYPE);
EXPECT_EQ(raBuf[1], 4);
--
Gitee