From 91ce1ac82db411d1e59361e25c9e96f856d3bc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 06:02:35 +0000 Subject: [PATCH 1/8] update services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../device/device_manager_agent_test.cpp | 91 +++++++++---------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp index ec2000c34..9757f14f9 100644 --- a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp +++ b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp @@ -28,6 +28,16 @@ namespace Test { using namespace testing::ext; using namespace std; +constexpr int USER_ID = 100; +static const string SAME_ACCOUNT = "account"; +shared_ptr smp; +weak_ptr wmp; +DistributedHardware::DmDeviceInfo deviceInfo = { + .deviceId = "testdevid", + .deviceName = "testdevname", + .deviceTypeId = 1, +}; + class DeviceManagerAgentTest : public testing::Test { public: static void SetUpTestCase(void); @@ -39,6 +49,8 @@ public: void DeviceManagerAgentTest::SetUpTestCase(void) { // input testsuit setup step，setup invoked before all testcases + smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(USER_ID, SAME_ACCOUNT)); + wmp = smp; } void DeviceManagerAgentTest::TearDownTestCase(void) @@ -56,30 +68,6 @@ void DeviceManagerAgentTest::TearDown(void) // input testcase teardown step，teardown invoked after each testcases } -/** - * @tc.name: DeviceManagerAgentTest_Start_Stop_0100 - * @tc.desc: Verify the Start/Stop function. - * @tc.type: FUNC - * @tc.require: SR000H0387 - */ -HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_Start_Stop_0100, TestSize.Level1) -{ - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - bool res = true; - - try { - sdm->Start(); - sdm->Stop(); - } catch (const exception &e) { - LOGE("Error:%{public}s", e.what()); - res = false; - } - - EXPECT_TRUE(res == false); - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 end"; -} - /** * @tc.name: DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 * @tc.desc: Verify the JoinGroup/QuitGroup function. @@ -89,15 +77,11 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_Start_Stop_0100, TestSiz HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_JoinGroup_QuitGroup_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 start"; - const int userId = 5202; - auto smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(userId, "account")); - weak_ptr wmp = smp; - auto sdm = DeviceManagerAgent::GetInstance(); bool res = true; try { - sdm->JoinGroup(wmp); - sdm->QuitGroup(wmp); + DeviceManagerAgent::GetInstance()->JoinGroup(wmp); + DeviceManagerAgent::GetInstance()->QuitGroup(wmp); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -116,12 +100,10 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOnline_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceOnline_0100 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - DistributedHardware::DmDeviceInfo deviceInfo; bool res = true; try { - sdm->OnDeviceOnline(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceOnline(deviceInfo); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -140,12 +122,10 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOnline_0100, Tes HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOffline_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceOffline_0100 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - DistributedHardware::DmDeviceInfo deviceInfo; bool res = true; try { - sdm->OnDeviceOffline(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceOffline(deviceInfo); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -164,13 +144,11 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOffline_0100, Te HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOffline_0200, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceOffline_0200 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - DistributedHardware::DmDeviceInfo deviceInfo; bool res = true; try { - sdm->OnDeviceOnline(deviceInfo); - sdm->OnDeviceOffline(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceOnline(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceOffline(deviceInfo); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -189,12 +167,10 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceOffline_0200, Te HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceChanged_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceChanged_0100 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - DistributedHardware::DmDeviceInfo deviceInfo; bool res = true; try { - sdm->OnDeviceChanged(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceChanged(deviceInfo); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -213,12 +189,10 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceChanged_0100, Te HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceReady_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceReady_0100 start"; - auto sdm = DeviceManagerAgent::GetInstance(); - DistributedHardware::DmDeviceInfo deviceInfo; bool res = true; try { - sdm->OnDeviceReady(deviceInfo); + DeviceManagerAgent::GetInstance()->OnDeviceReady(deviceInfo); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; @@ -227,7 +201,30 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceReady_0100, Test EXPECT_TRUE(res == true); GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceReady_0100 end"; } + +/** + * @tc.name: DeviceManagerAgentTest_Start_Stop_0100 + * @tc.desc: Verify the Start/Stop function. + * @tc.type: FUNC + * @tc.require: SR000H0387 + */ +HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_Start_Stop_0100, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 start"; + bool res = true; + + try { + DeviceManagerAgent::GetInstance()->Start(); + DeviceManagerAgent::GetInstance()->Stop(); + } catch (const exception &e) { + LOGE("Error:%{public}s", e.what()); + res = false; + } + + EXPECT_TRUE(res == false); + GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 end"; +} } // namespace Test } // namespace DistributedFile } // namespace Storage -} // namespace OHOS +} // namespace OHOS \ No newline at end of file -- Gitee From 9fbfc811ff758c155f9605a48ed59454d087381d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 06:04:31 +0000 Subject: [PATCH 2/8] update services/distributedfiledaemon/test/unittest/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- services/distributedfiledaemon/test/unittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn index 02e69cefc..dad53da68 100644 --- a/services/distributedfiledaemon/test/unittest/BUILD.gn +++ b/services/distributedfiledaemon/test/unittest/BUILD.gn @@ -506,6 +506,7 @@ group("unittest") { deps = [ ":daemon_stub_test", ":daemon_test", + ":device_manager_agent_test", ":devsl_dispatcher_test", ":kernel_talker_test", ":os_account_observer_test", -- Gitee From 848d979d7c49bc623ef870e4a1db4da6ac90ea80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 06:05:19 +0000 Subject: [PATCH 3/8] update BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 3d0f2232a..f4ec2b4d7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -28,6 +28,7 @@ group("dfs_test_moudule") { deps = [ "${services_path}/distributedfiledaemon/test/unittest:daemon_stub_test", "${services_path}/distributedfiledaemon/test/unittest:daemon_test", + "${services_path}/distributedfiledaemon/test/unittest:device_manager_agent_test", "${services_path}/distributedfiledaemon/test/unittest:devsl_dispatcher_test", "${services_path}/distributedfiledaemon/test/unittest:kernel_talker_test", "${services_path}/distributedfiledaemon/test/unittest:os_account_observer_test", -- Gitee From caef3f1f02ebf91b80bac9b8e1cf07c198926a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 12:53:51 +0000 Subject: [PATCH 4/8] update services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../test/unittest/device/device_manager_agent_test.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp index 9757f14f9..007d64d95 100644 --- a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp +++ b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp @@ -30,8 +30,7 @@ using namespace std; constexpr int USER_ID = 100; static const string SAME_ACCOUNT = "account"; -shared_ptr smp; -weak_ptr wmp; +shared_ptr smp = nullptr; DistributedHardware::DmDeviceInfo deviceInfo = { .deviceId = "testdevid", .deviceName = "testdevname", @@ -50,7 +49,6 @@ void DeviceManagerAgentTest::SetUpTestCase(void) { // input testsuit setup step，setup invoked before all testcases smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(USER_ID, SAME_ACCOUNT)); - wmp = smp; } void DeviceManagerAgentTest::TearDownTestCase(void) @@ -80,8 +78,8 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 bool res = true; try { - DeviceManagerAgent::GetInstance()->JoinGroup(wmp); - DeviceManagerAgent::GetInstance()->QuitGroup(wmp); + DeviceManagerAgent::GetInstance()->JoinGroup(smp); + DeviceManagerAgent::GetInstance()->QuitGroup(smp); } catch (const exception &e) { LOGE("Error:%{public}s", e.what()); res = false; -- Gitee From 5894d5a41c1b68f05b222d2b6b8556e52ddafcc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 13:02:57 +0000 Subject: [PATCH 5/8] update services/distributedfiledaemon/src/device/device_manager_agent.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../distributedfiledaemon/src/device/device_manager_agent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedfiledaemon/src/device/device_manager_agent.cpp b/services/distributedfiledaemon/src/device/device_manager_agent.cpp index 2947a60ae..66cdcd6a4 100644 --- a/services/distributedfiledaemon/src/device/device_manager_agent.cpp +++ b/services/distributedfiledaemon/src/device/device_manager_agent.cpp @@ -88,7 +88,7 @@ void DeviceManagerAgent::JoinGroup(weak_ptr mp) shared_ptr agent = nullptr; { unique_lock lock(mpToNetworksMutex_); - agent = make_shared(mp); + agent = make_shared(smp); auto [ignored, inserted] = mpToNetworks_.insert({ smp->GetID(), agent }); if (!inserted) { stringstream ss; -- Gitee From a3ea7df7cd78dd292694a59963df33d6f14cb501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Sat, 26 Nov 2022 13:09:53 +0000 Subject: [PATCH 6/8] update services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../test/unittest/device/device_manager_agent_test.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp index 007d64d95..47f568ce5 100644 --- a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp +++ b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp @@ -30,7 +30,6 @@ using namespace std; constexpr int USER_ID = 100; static const string SAME_ACCOUNT = "account"; -shared_ptr smp = nullptr; DistributedHardware::DmDeviceInfo deviceInfo = { .deviceId = "testdevid", .deviceName = "testdevname", @@ -48,7 +47,6 @@ public: void DeviceManagerAgentTest::SetUpTestCase(void) { // input testsuit setup step，setup invoked before all testcases - smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(USER_ID, SAME_ACCOUNT)); } void DeviceManagerAgentTest::TearDownTestCase(void) @@ -76,6 +74,7 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 { GTEST_LOG_(INFO) << "DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 start"; bool res = true; + auto smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(USER_ID, SAME_ACCOUNT)); try { DeviceManagerAgent::GetInstance()->JoinGroup(smp); -- Gitee From 69d0a860e86a261e296b4b29e9ebf186935e214f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Mon, 28 Nov 2022 07:48:17 +0000 Subject: [PATCH 7/8] update services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../device/device_manager_agent_test.cpp | 49 ------------------- 1 file changed, 49 deletions(-) diff --git a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp index 47f568ce5..168ffe6d8 100644 --- a/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp +++ b/services/distributedfiledaemon/test/unittest/device/device_manager_agent_test.cpp @@ -28,8 +28,6 @@ namespace Test { using namespace testing::ext; using namespace std; -constexpr int USER_ID = 100; -static const string SAME_ACCOUNT = "account"; DistributedHardware::DmDeviceInfo deviceInfo = { .deviceId = "testdevid", .deviceName = "testdevname", @@ -64,30 +62,6 @@ void DeviceManagerAgentTest::TearDown(void) // input testcase teardown step，teardown invoked after each testcases } -/** - * @tc.name: DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 - * @tc.desc: Verify the JoinGroup/QuitGroup function. - * @tc.type: FUNC - * @tc.require: SR000H0387 - */ -HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_JoinGroup_QuitGroup_0100, TestSize.Level1) -{ - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 start"; - bool res = true; - auto smp = make_shared(Utils::DfsuMountArgumentDescriptors::Alpha(USER_ID, SAME_ACCOUNT)); - - try { - DeviceManagerAgent::GetInstance()->JoinGroup(smp); - DeviceManagerAgent::GetInstance()->QuitGroup(smp); - } catch (const exception &e) { - LOGE("Error:%{public}s", e.what()); - res = false; - } - - EXPECT_TRUE(res == true); - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_JoinGroup_QuitGroup_0100 end"; -} - /** * @tc.name: DeviceManagerAgentTest_OnDeviceOnline_0100 * @tc.desc: Verify the OnDeviceOnline function. @@ -198,29 +172,6 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceReady_0100, Test EXPECT_TRUE(res == true); GTEST_LOG_(INFO) << "DeviceManagerAgentTest_OnDeviceReady_0100 end"; } - -/** - * @tc.name: DeviceManagerAgentTest_Start_Stop_0100 - * @tc.desc: Verify the Start/Stop function. - * @tc.type: FUNC - * @tc.require: SR000H0387 - */ -HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_Start_Stop_0100, TestSize.Level1) -{ - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 start"; - bool res = true; - - try { - DeviceManagerAgent::GetInstance()->Start(); - DeviceManagerAgent::GetInstance()->Stop(); - } catch (const exception &e) { - LOGE("Error:%{public}s", e.what()); - res = false; - } - - EXPECT_TRUE(res == false); - GTEST_LOG_(INFO) << "DeviceManagerAgentTest_Start_Stop_0100 end"; -} } // namespace Test } // namespace DistributedFile } // namespace Storage -- Gitee From a4f644e81307c461770f162ca3a894f7e0036cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= Date: Mon, 28 Nov 2022 07:49:19 +0000 Subject: [PATCH 8/8] update services/distributedfiledaemon/src/device/device_manager_agent.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 孙旭辉 --- .../distributedfiledaemon/src/device/device_manager_agent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedfiledaemon/src/device/device_manager_agent.cpp b/services/distributedfiledaemon/src/device/device_manager_agent.cpp index 66cdcd6a4..2947a60ae 100644 --- a/services/distributedfiledaemon/src/device/device_manager_agent.cpp +++ b/services/distributedfiledaemon/src/device/device_manager_agent.cpp @@ -88,7 +88,7 @@ void DeviceManagerAgent::JoinGroup(weak_ptr mp) shared_ptr agent = nullptr; { unique_lock lock(mpToNetworksMutex_); - agent = make_shared(smp); + agent = make_shared(mp); auto [ignored, inserted] = mpToNetworks_.insert({ smp->GetID(), agent }); if (!inserted) { stringstream ss; -- Gitee