diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp index e2a881d23cabc5b45fe3d1f9d9c73fc2ebc0721a..886f4a2ab07e2938583c3a957f272aebd911e5fa 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp @@ -221,7 +221,7 @@ HWTEST_F(DistributedCameraSinkServiceTest, dcamera_sink_service_test_007, TestSi DHLOGI("dcamera_sink_service_test_007"); EXPECT_EQ(sinkService_ == nullptr, false); - int32_t fd = 0; + int32_t fd = 1; std::vector args; std::u16string str(u""); args.push_back(str); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp index eb8982a678c993acbd3d11094eec687628540662..d45a0144b715e4a3ddede900afec0081afbbf122 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_service_test.cpp @@ -115,7 +115,7 @@ HWTEST_F(DistributedCameraSourceServiceTest, dcamera_source_service_test_003, Te DHLOGI("DistributedCameraSourceServiceTest::dcamera_source_service_test_003"); EXPECT_EQ(false, testSrcService_ == nullptr); - int32_t fd = 0; + int32_t fd = 1; std::vector args; std::u16string str(u""); args.push_back(str); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp index faea89d9c60928072fc6d7da96d2fd7cd31912f4..1cb1a4c70bd839097181ee9b6b7898bfda2f5c0a 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp @@ -404,7 +404,7 @@ HWTEST_F(DCameraSourceInputTest, dcamera_source_input_test_014, TestSize.Level1) { int32_t rc = testInput_->Init(); rc = testInput_->EstablishContinuousFrameSession(g_camIndexs); - EXPECT_EQ(rc, DCAMERA_BAD_OPERATE); + EXPECT_NE(rc, DCAMERA_OK); } /** @@ -419,7 +419,7 @@ HWTEST_F(DCameraSourceInputTest, dcamera_source_input_test_015, TestSize.Level1) testInput_->FinshFrameAsyncTrace(DCStreamType::CONTINUOUS_FRAME); testInput_->FinshFrameAsyncTrace(DCStreamType::SNAPSHOT_FRAME); rc = testInput_->EstablishSnapshotFrameSession(g_camIndexs); - EXPECT_EQ(rc, DCAMERA_BAD_OPERATE); + EXPECT_NE(rc, DCAMERA_OK); } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/data_process/test/unittest/common/pipeline/dcamera_pipeline_sink_test.cpp b/services/data_process/test/unittest/common/pipeline/dcamera_pipeline_sink_test.cpp index c2194a82f4baad38b93890afacd26559d79c6b94..45cc0030deeced09a0d348ffd2d2905d73286a56 100644 --- a/services/data_process/test/unittest/common/pipeline/dcamera_pipeline_sink_test.cpp +++ b/services/data_process/test/unittest/common/pipeline/dcamera_pipeline_sink_test.cpp @@ -81,6 +81,7 @@ HWTEST_F(DCameraPipelineSinkTest, dcamera_pipeline_sink_test_001, TestSize.Level TEST_HEIGTH); int32_t rc = testSinkPipeline_->CreateDataProcessPipeline(PipelineType::VIDEO, srcParams, destParams, listener); EXPECT_EQ(rc, DCAMERA_OK); + usleep(SLEEP_TIME); } /** @@ -141,6 +142,7 @@ HWTEST_F(DCameraPipelineSinkTest, dcamera_pipeline_sink_test_003, TestSize.Level int32_t rc = testSinkPipeline_->CreateDataProcessPipeline( PipelineType::PHOTO_JPEG, srcParams, destParams, listener); EXPECT_EQ(rc, DCAMERA_NOT_FOUND); + usleep(SLEEP_TIME); } /** @@ -170,6 +172,7 @@ HWTEST_F(DCameraPipelineSinkTest, dcamera_pipeline_sink_test_004, TestSize.Level std::vector> buffers; rc = testSinkPipeline_->ProcessData(buffers); EXPECT_EQ(rc, DCAMERA_BAD_VALUE); + usleep(SLEEP_TIME); } /** @@ -188,6 +191,7 @@ HWTEST_F(DCameraPipelineSinkTest, dcamera_pipeline_sink_test_005, TestSize.Level buffers.push_back(db); int32_t rc = testSinkPipeline_->ProcessData(buffers); EXPECT_EQ(rc, DCAMERA_INIT_ERR); + usleep(SLEEP_TIME); } } // namespace DistributedHardware } // namespace OHOS