diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index b52afc6379cf86608b3c4e40b7682a86de5b20fc..393a87609c2de9080e3f39c99df2207e31a3909e 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -72,6 +72,7 @@ ohos_unittest("DCameraClientTest") { "access_token:libnativetoken", "access_token:libtoken_setproc", "c_utils:utils", + "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp index f276a6a8ed94b71ef592a11cd9b09be49710d71e..1b4b392e9f00d92118cf7282c4a1faba75fcc475 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp @@ -17,9 +17,15 @@ #include "accesstoken_kit.h" #include "anonymous_string.h" +#include "camera_util.h" #include "dcamera_client.h" #include "dcamera_handler.h" -#include "dcamera_video_surface_listener.h" +#include "dcamera_input_callback.h" +#include "dcamera_manager_callback.h" +#include "dcamera_photo_callback.h" +#include "dcamera_preview_callback.h" +#include "dcamera_session_callback.h" +#include "dcamera_video_callback.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -175,7 +181,52 @@ void DCameraClientTest::SetTokenID() HWTEST_F(DCameraClientTest, dcamera_client_test_001, TestSize.Level1) { DHLOGI("DCameraClientTest dcamera_client_test_001: test set state callback"); + auto managerCallback = std::make_shared(); + CameraStandard::CameraStatusInfo cameraStatus; + managerCallback->OnCameraStatusChanged(cameraStatus); + managerCallback->OnFlashlightStatusChanged("", CameraStandard::FlashStatus::FLASH_STATUS_OFF); + + auto inputCallback = std::make_shared(nullptr); + inputCallback->OnError(CameraStandard::CamServiceError::CAMERA_DEVICE_BUSY, 0); + + auto sessionCallback = std::make_shared(nullptr); + sessionCallback->OnError(0); + sessionCallback->OnFocusState(CameraStandard::FocusCallback::UNFOCUSED); + + auto photoCallback = std::make_shared(nullptr); + photoCallback->OnCaptureStarted(0); + photoCallback->OnCaptureEnded(0, 0); + photoCallback->OnFrameShutter(0, 0); + photoCallback->OnCaptureError(0, 0); + + auto previewCallback = std::make_shared(nullptr); + previewCallback->OnFrameStarted(); + previewCallback->OnFrameEnded(0); + previewCallback->OnError(0); + + auto videoCallback = std::make_shared(nullptr); + videoCallback->OnFrameStarted(); + videoCallback->OnFrameEnded(0); + videoCallback->OnError(0); + std::shared_ptr stateCallback = std::make_shared(); + inputCallback = std::make_shared(stateCallback); + inputCallback->OnError(CameraStandard::CamServiceError::CAMERA_DEVICE_BUSY, 0); + inputCallback->OnError(CameraStandard::CamServiceError::CAMERA_DEVICE_PREEMPTED, 0); + + sessionCallback = std::make_shared(stateCallback); + sessionCallback->OnError(0); + sessionCallback->OnFocusState(CameraStandard::FocusCallback::UNFOCUSED); + + photoCallback = std::make_shared(stateCallback); + photoCallback->OnCaptureError(0, 0); + + previewCallback = std::make_shared(stateCallback); + previewCallback->OnError(0); + + videoCallback = std::make_shared(stateCallback); + videoCallback->OnError(0); + int32_t ret = client_->SetStateCallback(stateCallback); EXPECT_EQ(DCAMERA_OK, ret); } @@ -189,7 +240,19 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_001, TestSize.Level1) HWTEST_F(DCameraClientTest, dcamera_client_test_002, TestSize.Level1) { DHLOGI("DCameraClientTest dcamera_client_test_002: test set result callback"); + auto photoSurfaceListener = std::make_shared(nullptr, nullptr); + photoSurfaceListener->OnBufferAvailable(); + + auto videoSurfaceListener = std::make_shared(nullptr, nullptr); + videoSurfaceListener->OnBufferAvailable(); + std::shared_ptr resultCallback = std::make_shared(); + photoSurfaceListener = std::make_shared(nullptr, resultCallback); + photoSurfaceListener->OnBufferAvailable(); + + videoSurfaceListener = std::make_shared(nullptr, resultCallback); + videoSurfaceListener->OnBufferAvailable(); + int32_t ret = client_->SetResultCallback(resultCallback); EXPECT_EQ(DCAMERA_OK, ret); }