From b315bd9cb7ea77a874a7eff3c7cd5d8df2a14f56 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 15:58:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../src/camera_framework_manager_unittest.cpp | 19 ++++++ .../include/capture_session_unittest.h | 7 ++ .../session/src/capture_session_unittest.cpp | 64 +++++++++---------- 3 files changed, 58 insertions(+), 32 deletions(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp index 6c1c1723b..6f1b85d9e 100644 --- a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp @@ -2551,5 +2551,24 @@ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_083, Test EXPECT_EQ(cameraManager_->CreateCustomPreviewOutput(surface, width, height), nullptr); cameraManager_->IsCameraMuteSupported(); } + +/* + * Feature: Framework + * Function: Test two calling methods for CreateCameraSwitchSession + * SubFunction: NA + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Test two calling methods for CreateCameraSwitchSession + */ +HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_084, TestSize.Level0) +{ + sptr session1 = cameraManager_->CreateCameraSwitchSession(); + ASSERT_NE(session1, nullptr); + + sptr session2 = nullptr; + int ret = cameraManager_->CreateCameraSwitchSession(&session2); + ASSERT_EQ(ret, CameraErrorCode::SUCCESS); + ASSERT_NE(session2, nullptr); +} } } \ No newline at end of file diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 885f4d852..33e3cf0c2 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -131,6 +131,13 @@ class MockFeatureDetectionStatusCallback : public OHOS::CameraStandard::FeatureD class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitchRequestCallback { void OnAppCameraSwitch(const std::string &cameraId) override {} }; + +class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { + void OnCameraActive( + const std::string &cameraId, bool isRegisterCameraSwitchCallback, const CaptureSessionInfo &sessionInfo) override {}; + void OnCameraUnactive(const std::string &cameraId) override {}; + void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {}; +}; } } #endif diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp index 4db87ea23..8534f8eb4 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp @@ -9861,7 +9861,6 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_072, TestSize.Level0) EXPECT_NE(session->GetModuleType(moduleType), 0); } - /* * Feature: Framework * Function: Test EnableControlCenter @@ -9870,7 +9869,7 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_072, TestSize.Level0) * EnvConditions: NA * CaseDescription: Test EnableControlCenter */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_073, TestSize.Level0) { sptr session = cameraManager_->CreateCaptureSession(); ASSERT_NE(session, nullptr); @@ -9887,35 +9886,6 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) session->EnableControlCenter(true); EXPECT_EQ(session->isControlCenterEnabled_, false); - - input->Close(); - preview->Release(); - input->Release(); - session->Release(); -} -/* - * Feature: Framework - * Function: Test EnableKeyFrameReport - * SubFunction: NA - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Test EnableKeyFrameReport - */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_073, TestSize.Level0) -{ - sptr session = cameraManager_->CreateCaptureSession(); - ASSERT_NE(session, nullptr); - sptr input = cameraManager_->CreateCameraInput(cameras_[0]); - ASSERT_NE(input, nullptr); - input->Open(); - UpdateCameraOutputCapability(); - sptr preview = CreatePreviewOutput(previewProfile_[0]); - ASSERT_NE(preview, nullptr); - EXPECT_EQ(session->BeginConfig(), 0); - EXPECT_EQ(session->AddInput(input), 0); - EXPECT_EQ(session->AddOutput(preview), 0); - EXPECT_EQ(session->CommitConfig(), 0); - session->EnableKeyFrameReport(true); session->EnableKeyFrameReport(false); @@ -10082,7 +10052,7 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_079, TestSize.Level0) * EnvConditions: NA * CaseDescription: Test OnFoldStatusChanged when the session not is nullptr */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) { sptr input = cameraManager_->CreateCameraInput(cameras_[0]); sptr surface = Surface::CreateSurfaceAsConsumer(); @@ -10101,5 +10071,35 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) std::shared_ptr foldCallback1 = std::make_shared(nullptr); EXPECT_EQ(foldCallback1->captureSession_, nullptr); } + +/* + * Feature: Framework + * Function: Test CameraSwitchCallback + * IsVideoDeferred + * SubFunction: NA + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Test CameraSwitchCallback + */ +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) +{ + sptr session = cameraManager_->CreateCameraSwitchSession(); + ASSERT_NE(session, nullptr); + + auto cameraSwitchCallback = std::make_shared(); + EXPECT_NE(cameraSwitchCallback, nullptr); + + session->SetCallback(cameraSwitchCallback); + EXPECT_EQ(session->GetCameraSwitchCallback(), cameraSwitchCallback); + + auto cameraSwitchCallbackImpl = std::make_shared(session); + EXPECT_NE(cameraSwitchCallbackImpl, nullptr); + + std::string cameraID = ""; + CaptureSessionInfo captureSessionInfo{}; + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraActive(cameraID,true,captureSessionInfo)); + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraUnactive(cameraID)); + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraSwitch(cameraID,cameraID,true)); +} } } \ No newline at end of file -- Gitee From d81f1f38f7480967a4520fb1b5208c4279ca585f Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 15:58:46 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../src/camera_framework_manager_unittest.cpp | 19 ++++++ .../include/capture_session_unittest.h | 7 ++ .../session/src/capture_session_unittest.cpp | 64 +++++++++---------- 3 files changed, 58 insertions(+), 32 deletions(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp index 6c1c1723b..ff3994574 100644 --- a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp @@ -2551,5 +2551,24 @@ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_083, Test EXPECT_EQ(cameraManager_->CreateCustomPreviewOutput(surface, width, height), nullptr); cameraManager_->IsCameraMuteSupported(); } + +/* + * Feature: Framework + * Function: Test two calling methods for Create Camera Switch Session + * SubFunction: NA + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Test two calling methods for Create Camera Switch Session + */ +HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_084, TestSize.Level0) +{ + sptr session1 = cameraManager_->CreateCameraSwitchSession(); + ASSERT_NE(session1, nullptr); + + sptr session2 = nullptr; + int ret = cameraManager_->CreateCameraSwitchSession(&session2); + ASSERT_EQ(ret, CameraErrorCode::SUCCESS); + ASSERT_NE(session2, nullptr); +} } } \ No newline at end of file diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 885f4d852..f6c28e46d 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -131,6 +131,13 @@ class MockFeatureDetectionStatusCallback : public OHOS::CameraStandard::FeatureD class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitchRequestCallback { void OnAppCameraSwitch(const std::string &cameraId) override {} }; + +class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { + void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, + const CaptureSessionInfo &sessionInfo) override {}; + void OnCameraUnactive(const std::string &cameraId) override {}; + void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {}; +}; } } #endif diff --git a/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp index 4db87ea23..8534f8eb4 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/session/src/capture_session_unittest.cpp @@ -9861,7 +9861,6 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_072, TestSize.Level0) EXPECT_NE(session->GetModuleType(moduleType), 0); } - /* * Feature: Framework * Function: Test EnableControlCenter @@ -9870,7 +9869,7 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_072, TestSize.Level0) * EnvConditions: NA * CaseDescription: Test EnableControlCenter */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_073, TestSize.Level0) { sptr session = cameraManager_->CreateCaptureSession(); ASSERT_NE(session, nullptr); @@ -9887,35 +9886,6 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) session->EnableControlCenter(true); EXPECT_EQ(session->isControlCenterEnabled_, false); - - input->Close(); - preview->Release(); - input->Release(); - session->Release(); -} -/* - * Feature: Framework - * Function: Test EnableKeyFrameReport - * SubFunction: NA - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Test EnableKeyFrameReport - */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_073, TestSize.Level0) -{ - sptr session = cameraManager_->CreateCaptureSession(); - ASSERT_NE(session, nullptr); - sptr input = cameraManager_->CreateCameraInput(cameras_[0]); - ASSERT_NE(input, nullptr); - input->Open(); - UpdateCameraOutputCapability(); - sptr preview = CreatePreviewOutput(previewProfile_[0]); - ASSERT_NE(preview, nullptr); - EXPECT_EQ(session->BeginConfig(), 0); - EXPECT_EQ(session->AddInput(input), 0); - EXPECT_EQ(session->AddOutput(preview), 0); - EXPECT_EQ(session->CommitConfig(), 0); - session->EnableKeyFrameReport(true); session->EnableKeyFrameReport(false); @@ -10082,7 +10052,7 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_079, TestSize.Level0) * EnvConditions: NA * CaseDescription: Test OnFoldStatusChanged when the session not is nullptr */ -HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_080, TestSize.Level0) { sptr input = cameraManager_->CreateCameraInput(cameras_[0]); sptr surface = Surface::CreateSurfaceAsConsumer(); @@ -10101,5 +10071,35 @@ HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) std::shared_ptr foldCallback1 = std::make_shared(nullptr); EXPECT_EQ(foldCallback1->captureSession_, nullptr); } + +/* + * Feature: Framework + * Function: Test CameraSwitchCallback + * IsVideoDeferred + * SubFunction: NA + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Test CameraSwitchCallback + */ +HWTEST_F(CaptureSessionUnitTest, capture_session_unit_081, TestSize.Level0) +{ + sptr session = cameraManager_->CreateCameraSwitchSession(); + ASSERT_NE(session, nullptr); + + auto cameraSwitchCallback = std::make_shared(); + EXPECT_NE(cameraSwitchCallback, nullptr); + + session->SetCallback(cameraSwitchCallback); + EXPECT_EQ(session->GetCameraSwitchCallback(), cameraSwitchCallback); + + auto cameraSwitchCallbackImpl = std::make_shared(session); + EXPECT_NE(cameraSwitchCallbackImpl, nullptr); + + std::string cameraID = ""; + CaptureSessionInfo captureSessionInfo{}; + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraActive(cameraID,true,captureSessionInfo)); + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraUnactive(cameraID)); + EXPECT_EQ(CAMERA_OK,cameraSwitchCallbackImpl->OnCameraSwitch(cameraID,cameraID,true)); +} } } \ No newline at end of file -- Gitee From a357285b2ded1c89e8e6864c1d28521c3bb91f59 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 16:33:39 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../manager/src/camera_framework_manager_unittest.cpp | 8 -------- .../session/include/capture_session_unittest.h | 5 ----- 2 files changed, 13 deletions(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp index f01a03474..ff3994574 100644 --- a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp @@ -2554,19 +2554,11 @@ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_083, Test /* * Feature: Framework -<<<<<<< HEAD * Function: Test two calling methods for Create Camera Switch Session * SubFunction: NA * FunctionPoints: NA * EnvConditions: NA * CaseDescription: Test two calling methods for Create Camera Switch Session -======= - * Function: Test two calling methods for CreateCameraSwitchSession - * SubFunction: NA - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Test two calling methods for CreateCameraSwitchSession ->>>>>>> b315bd9cb7ea77a874a7eff3c7cd5d8df2a14f56 */ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_084, TestSize.Level0) { diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 5721defb8..f6c28e46d 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -133,13 +133,8 @@ class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitc }; class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { -<<<<<<< HEAD void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, const CaptureSessionInfo &sessionInfo) override {}; -======= - void OnCameraActive( - const std::string &cameraId, bool isRegisterCameraSwitchCallback, const CaptureSessionInfo &sessionInfo) override {}; ->>>>>>> b315bd9cb7ea77a874a7eff3c7cd5d8df2a14f56 void OnCameraUnactive(const std::string &cameraId) override {}; void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {}; }; -- Gitee From 5e95ed7cac2d0449c5536d720e374e08cd450f70 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 16:43:12 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../manager/src/camera_framework_manager_unittest.cpp | 4 ++-- .../session/include/capture_session_unittest.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp index ff3994574..c8f64aadf 100644 --- a/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp +++ b/frameworks/native/camera/test/unittest/framework_native/manager/src/camera_framework_manager_unittest.cpp @@ -2554,11 +2554,11 @@ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_083, Test /* * Feature: Framework - * Function: Test two calling methods for Create Camera Switch Session + * Function: Test two calling methods for Create Camera Switch Session * SubFunction: NA * FunctionPoints: NA * EnvConditions: NA - * CaseDescription: Test two calling methods for Create Camera Switch Session + * CaseDescription: Test two calling methods for Create Camera Switch Session */ HWTEST_F(CameraFrameWorkManagerUnit, camera_framework_manager_unittest_084, TestSize.Level0) { diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index f6c28e46d..d1f1da624 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -134,7 +134,7 @@ class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitc class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, - const CaptureSessionInfo &sessionInfo) override {}; + const CaptureSessionInfo &sessionInfo) override {}; void OnCameraUnactive(const std::string &cameraId) override {}; void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {}; }; -- Gitee From 4678a7a03808fc2676715253aedd2c210662e544 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 17:05:41 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../session/include/capture_session_unittest.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index d1f1da624..5ec98cf8a 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -134,9 +134,9 @@ class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitc class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, - const CaptureSessionInfo &sessionInfo) override {}; - void OnCameraUnactive(const std::string &cameraId) override {}; - void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {}; + const CaptureSessionInfo &sessionInfo) override {} + void OnCameraUnactive(const std::string &cameraId) override {} + void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {} }; } } -- Gitee From 44173861d60bd2ae9dd8a6615a735f9a323d3412 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 17:18:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../session/include/capture_session_unittest.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 5ec98cf8a..139e5719a 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -133,11 +133,12 @@ class MockCameraSwitchRequestCallback : public OHOS::CameraStandard::CameraSwitc }; class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallback { - void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, + void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, const CaptureSessionInfo &sessionInfo) override {} void OnCameraUnactive(const std::string &cameraId) override {} void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {} }; + } } #endif -- Gitee From c70c6fe8778bdeec7d4c7f8670006c013539a6b5 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 17:20:58 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../framework_native/session/include/capture_session_unittest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 139e5719a..348cf64a7 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -136,7 +136,7 @@ class MockCameraSwitchCallback : public OHOS::CameraStandard::CameraSwitchCallba void OnCameraActive(const std::string &cameraId, bool isRegisterCameraSwitchCallback, const CaptureSessionInfo &sessionInfo) override {} void OnCameraUnactive(const std::string &cameraId) override {} - void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {} + void OnCameraSwitch(const std::string &oriCameraId, const std::string &destCameraId, bool status) override {} }; } -- Gitee From b282a888a46bb14551059bfe37fc09b4e16d6a94 Mon Sep 17 00:00:00 2001 From: guoysh Date: Wed, 10 Sep 2025 18:03:00 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guoysh --- .../framework_native/session/include/capture_session_unittest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h index 348cf64a7..5f7808e0d 100644 --- a/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h +++ b/frameworks/native/camera/test/unittest/framework_native/session/include/capture_session_unittest.h @@ -22,6 +22,7 @@ #include "camera_manager_for_sys.h" #include "camera_log.h" #include "icapture_session_callback.h" +#include "session/cameraSwitch_session.h" namespace OHOS { namespace CameraStandard { -- Gitee