From 529c245d626b4fbcb204650fb2ee597e075b9542 Mon Sep 17 00:00:00 2001
From: w30042960 <wangyupan1@huawei.com>
Date: Wed, 19 Jun 2024 14:19:28 +0800
Subject: [PATCH] modify ut

Signed-off-by: w30042960 <wangyupan1@huawei.com>
---
 .../camera_source/callback/dcamera_source_callback_test.cpp | 2 +-
 .../common/pipeline_node/decode_data_process_test.cpp       | 6 +++---
 .../common/pipeline_node/scale_convert_process_test.cpp     | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp
index 7e97fb80..e0508530 100644
--- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp
+++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/callback/dcamera_source_callback_test.cpp
@@ -368,7 +368,7 @@ HWTEST_F(DCameraSourceCallbackTest, dcamera_source_callback_test_010, TestSize.L
     sourceCallback_->RegisterTriggerListener(listener);
     ret = sourceCallback_->OnDataSyncTrigger(devId);
     sourceCallback_->UnRegisterTriggerListener();
-    EXPECT_NE(DCAMERA_OK, ret);
+    EXPECT_EQ(DCAMERA_OK, ret);
 }
 }
 }
\ No newline at end of file
diff --git a/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp b/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp
index f8ed441a..847be900 100644
--- a/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp
+++ b/services/data_process/test/unittest/common/pipeline_node/decode_data_process_test.cpp
@@ -273,7 +273,7 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_008, TestSize.Level1)
     DHLOGI("DecodeDataProcessTest::decode_data_process_test_008.");
     EXPECT_EQ(false, testDecodeDataProcess_ == nullptr);
 
-    VideoConfigParams srcParams(VideoCodecType::CODEC_MPEG4_ES,
+    VideoConfigParams srcParams(VideoCodecType::CODEC_H264,
                                 Videoformat::NV12,
                                 DCAMERA_PRODUCER_FPS_DEFAULT,
                                 TEST_WIDTH,
@@ -285,10 +285,10 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_008, TestSize.Level1)
                                  TEST_HEIGTH);
     VideoConfigParams procConfig;
     int32_t rc = testDecodeDataProcess_->InitNode(srcParams, destParams, procConfig);
-    EXPECT_EQ(rc, DCAMERA_NOT_FOUND);
+    EXPECT_EQ(rc, DCAMERA_OK);
 
     rc = testDecodeDataProcess_->InitDecoderMetadataFormat();
-    EXPECT_EQ(rc, DCAMERA_NOT_FOUND);
+    EXPECT_EQ(rc, DCAMERA_OK);
 }
 
 /**
diff --git a/services/data_process/test/unittest/common/pipeline_node/scale_convert_process_test.cpp b/services/data_process/test/unittest/common/pipeline_node/scale_convert_process_test.cpp
index 888d9bd1..764a5728 100644
--- a/services/data_process/test/unittest/common/pipeline_node/scale_convert_process_test.cpp
+++ b/services/data_process/test/unittest/common/pipeline_node/scale_convert_process_test.cpp
@@ -601,6 +601,7 @@ HWTEST_F(ScaleConvertProcessTest, scale_convert_process_test_026, TestSize.Level
 {
     DHLOGI("ScaleConvertProcessTest scale_convert_process_test_026.");
     int32_t rc = testScaleConvertProcess_->InitNode(SRC_PARAMS1, DEST_PARAMS2, PROC_CONFIG);
+    testScaleConvertProcess_->isScaleConvert_.store(false);
     EXPECT_EQ(rc, DCAMERA_OK);
 
     size_t capacity = 3200000;
@@ -617,7 +618,7 @@ HWTEST_F(ScaleConvertProcessTest, scale_convert_process_test_026, TestSize.Level
     std::shared_ptr<DCameraPipelineSource> sourcePipeline = std::make_shared<DCameraPipelineSource>();
     testScaleConvertProcess_->callbackPipelineSource_ = sourcePipeline;
     rc = testScaleConvertProcess_->ProcessData(inputBuffers);
-    EXPECT_EQ(rc, DCAMERA_OK);
+    EXPECT_EQ(rc, DCAMERA_DISABLE_PROCESS);
 }
 
 /**
@@ -655,6 +656,7 @@ HWTEST_F(ScaleConvertProcessTest, scale_convert_process_test_028, TestSize.Level
 {
     DHLOGI("ScaleConvertProcessTest scale_convert_process_test_028.");
     int32_t rc = testScaleConvertProcess_->InitNode(SRC_PARAMS1, DEST_PARAMS3, PROC_CONFIG);
+    testScaleConvertProcess_->isScaleConvert_.store(false);
     EXPECT_EQ(rc, DCAMERA_OK);
 
     size_t capacity = 3200000;
@@ -671,7 +673,7 @@ HWTEST_F(ScaleConvertProcessTest, scale_convert_process_test_028, TestSize.Level
     std::shared_ptr<DCameraPipelineSource> sourcePipeline = std::make_shared<DCameraPipelineSource>();
     testScaleConvertProcess_->callbackPipelineSource_ = sourcePipeline;
     rc = testScaleConvertProcess_->ProcessData(inputBuffers);
-    EXPECT_EQ(rc, DCAMERA_OK);
+    EXPECT_EQ(rc, DCAMERA_DISABLE_PROCESS);
 }
 #endif
 } // namespace DistributedHardware
-- 
Gitee