From d48ec7594285b460c5805a32b8d4a611bcb9fa92 Mon Sep 17 00:00:00 2001 From: byndyx Date: Tue, 20 Feb 2024 19:34:20 +0800 Subject: [PATCH] sa serail Signed-off-by: byndyx --- .../callback/dcamera_sink_callback_stub.cpp | 2 +- .../callback/dcamera_source_callback_stub.cpp | 2 +- .../dcamera_source_handler_test.cpp | 5 ++- .../distributed_camera_sink_stub.cpp | 2 +- .../dcamera_sink_hidumper_test.cpp | 34 +++++++++++++++++++ .../distributed_camera_source_stub.cpp | 2 +- .../dcamera_source_hidumper_test.cpp | 34 +++++++++++++++++++ 7 files changed, 76 insertions(+), 5 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp index 191175b7..49b5ede3 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp @@ -23,7 +23,7 @@ namespace OHOS { class MessageOption; } namespace OHOS { namespace DistributedHardware { -DCameraSinkCallbackStub::DCameraSinkCallbackStub() +DCameraSinkCallbackStub::DCameraSinkCallbackStub() : IRemoteStub(true) { memberFuncMap_[NOTIFY_RESOURCEINFO] = &DCameraSinkCallbackStub::OnNotifyResourceInfoInner; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp index b7b6dd5a..fc004a82 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp @@ -23,7 +23,7 @@ namespace OHOS { class MessageOption; } namespace OHOS { namespace DistributedHardware { -DCameraSourceCallbackStub::DCameraSourceCallbackStub() +DCameraSourceCallbackStub::DCameraSourceCallbackStub() : IRemoteStub(true) { memberFuncMap_[NOTIFY_REG_RESULT] = &DCameraSourceCallbackStub::NotifyRegResultInner; memberFuncMap_[NOTIFY_UNREG_RESULT] = &DCameraSourceCallbackStub::NotifyUnregResultInner; diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp index e65d9745..1908a0ee 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp @@ -116,8 +116,11 @@ HWTEST_F(DCameraSourceHandlerTest, dcamera_source_handler_test_003, TestSize.Lev param.sourceAttrs = TEST_ATTRS; param.sinkVersion = TEST_VER; param.sinkAttrs = TEST_ATTRS; - std::shared_ptr callback = std::make_shared(); + std::shared_ptr callback = nullptr; int32_t ret = DCameraSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + EXPECT_EQ(DCAMERA_BAD_VALUE, ret); + callback = std::make_shared(); + ret = DCameraSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_NE(DCAMERA_OK, ret); } diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp index 41cb9075..e87ebde2 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { -DistributedCameraSinkStub::DistributedCameraSinkStub() +DistributedCameraSinkStub::DistributedCameraSinkStub() : IRemoteStub(true) { memberFuncMap_[static_cast(IDCameraSinkInterfaceCode::INIT_SINK)] = &DistributedCameraSinkStub::InitSinkInner; diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp index 2494ceaa..5007c488 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/dcamera_sink_hidumper_test.cpp @@ -168,5 +168,39 @@ HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_007, TestSize.Level bool ret = DcameraSinkHidumper::GetInstance().Dump(args, result); EXPECT_EQ(true, ret); } + +/** + * @tc.name: dcamera_sink_hidumper_test_008 + * @tc.desc: Verify the Dump function. + * @tc.type: FUNC + * @tc.require: issue + */ +HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_008, TestSize.Level1) +{ + DHLOGI("dcamera_sink_hidumper_test_008"); + std::vector args; + std::string str1 = "--startdump"; + args.push_back(str1); + std::string result; + bool ret = DcameraSinkHidumper::GetInstance().Dump(args, result); + EXPECT_EQ(true, ret); +} + +/** + * @tc.name: dcamera_sink_hidumper_test_009 + * @tc.desc: Verify the Dump function. + * @tc.type: FUNC + * @tc.require: issue + */ +HWTEST_F(DcameraSinkHidumperTest, dcamera_sink_hidumper_test_009, TestSize.Level1) +{ + DHLOGI("dcamera_sink_hidumper_test_009"); + std::vector args; + std::string str1 = "--stopdump"; + args.push_back(str1); + std::string result; + bool ret = DcameraSinkHidumper::GetInstance().Dump(args, result); + EXPECT_EQ(true, ret); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp index 02bd93e6..6319cf39 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { -DistributedCameraSourceStub::DistributedCameraSourceStub() +DistributedCameraSourceStub::DistributedCameraSourceStub() : IRemoteStub(true) { memberFuncMap_[static_cast(IDCameraSourceInterfaceCode::INIT_SOURCE)] = &DistributedCameraSourceStub::InitSourceInner; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp index ce9ce260..bcdb2583 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/dcamera_source_hidumper_test.cpp @@ -151,5 +151,39 @@ HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_006, TestSize.L bool ret = DcameraSourceHidumper::GetInstance().Dump(args, result); EXPECT_EQ(true, ret); } + +/** + * @tc.name: dcamera_source_hidumper_test_007 + * @tc.desc: Verify the Dump function. + * @tc.type: FUNC + * @tc.require: issue + */ +HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_007, TestSize.Level1) +{ + DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_007"); + std::vector args; + std::string str1 = "--startdump"; + args.push_back(str1); + std::string result; + bool ret = DcameraSourceHidumper::GetInstance().Dump(args, result); + EXPECT_EQ(true, ret); +} + +/** + * @tc.name: dcamera_source_hidumper_test_008 + * @tc.desc: Verify the Dump function. + * @tc.type: FUNC + * @tc.require: issue + */ +HWTEST_F(DcameraSourceHidumperTest, dcamera_source_hidumper_test_008, TestSize.Level1) +{ + DHLOGI("DcameraSourceHidumperTest::dcamera_source_hidumper_test_008"); + std::vector args; + std::string str1 = "--stopdump"; + args.push_back(str1); + std::string result; + bool ret = DcameraSourceHidumper::GetInstance().Dump(args, result); + EXPECT_EQ(true, ret); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee