diff --git a/BUILD.gn b/BUILD.gn index 3d0f2232ad480dd073bc0879dce94f059e8c06c6..f4ec2b4d701cc10eb91777c295ee1e38e5c669b2 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", diff --git a/services/distributedfiledaemon/test/unittest/BUILD.gn b/services/distributedfiledaemon/test/unittest/BUILD.gn index 02e69cefc04af8162913bf8b38ba252da477e4fd..dad53da68c96a4e1281ea045f690d62f77511a8c 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", 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 ec2000c34c9bdf91d9b07a3441add956838c317b..168ffe6d80e0e926947934c34b28b97ab94e3037 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,12 @@ namespace Test { using namespace testing::ext; using namespace std; +DistributedHardware::DmDeviceInfo deviceInfo = { + .deviceId = "testdevid", + .deviceName = "testdevname", + .deviceTypeId = 1, +}; + class DeviceManagerAgentTest : public testing::Test { public: static void SetUpTestCase(void); @@ -56,57 +62,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. - * @tc.type: FUNC - * @tc.require: SR000H0387 - */ -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); - } 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. @@ -116,12 +71,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 +93,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 +115,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 +138,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 +160,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; @@ -230,4 +175,4 @@ HWTEST_F(DeviceManagerAgentTest, DeviceManagerAgentTest_OnDeviceReady_0100, Test } // namespace Test } // namespace DistributedFile } // namespace Storage -} // namespace OHOS +} // namespace OHOS \ No newline at end of file