From 0b573c6e4a7d207126e78bc7df335f76278f25bb Mon Sep 17 00:00:00 2001 From: chen0088 Date: Mon, 13 Jan 2025 20:10:34 +0800 Subject: [PATCH] modify ut Signed-off-by: chen0088 --- .../callback/dcamera_sink_callback_test.cpp | 17 ----------------- .../common/base/dcamera_protocol_test.cpp | 14 +------------- .../dcamera_source_state_machine_test.cpp | 5 ++++- .../pipeline_node/decode_data_process_test.cpp | 17 ----------------- 4 files changed, 5 insertions(+), 48 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/callback/dcamera_sink_callback_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/callback/dcamera_sink_callback_test.cpp index 8a1d83ab..fd73fb22 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/callback/dcamera_sink_callback_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/callback/dcamera_sink_callback_test.cpp @@ -80,23 +80,6 @@ HWTEST_F(DCameraSinkCallbackTest, dcamera_sink_callback_test_001, TestSize.Level DHLOGI("DCameraSinkCallbackTest dcamera_sink_callback_test_001."); EXPECT_EQ(false, sinkCallback_ == nullptr); - int32_t ret = DCAMERA_OK; - std::shared_ptr callback = std::make_shared(); - sinkCallback_->PushPrivacyResCallback(callback); - EXPECT_EQ(DCAMERA_OK, ret); -} - -/** - * @tc.name: dcamera_sink_callback_test_002 - * @tc.desc: Verify the OnNotifyRegResult function. - * @tc.type: FUNC - * @tc.require: issue - */ -HWTEST_F(DCameraSinkCallbackTest, dcamera_sink_callback_test_002, TestSize.Level1) -{ - DHLOGI("DCameraSinkCallbackTest dcamera_sink_callback_test_002."); - EXPECT_EQ(false, sinkCallback_ == nullptr); - ResourceEventType type = ResourceEventType::EVENT_TYPE_QUERY_RESOURCE; const std::string subType = "camera"; const std::string networkId = "networkId"; diff --git a/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp b/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp index 26192f4f..ed336e4c 100755 --- a/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp +++ b/services/cameraservice/base/test/unittest/common/base/dcamera_protocol_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -98,18 +98,6 @@ void DCameraProtocolTest::TearDown(void) { } -/** - * @tc.name: dcamera_protocol_test_001 - * @tc.desc: Verify Get ServiceAbility. - * @tc.type: FUNC - * @tc.require: AR000GK6MH - */ -HWTEST_F(DCameraProtocolTest, dcamera_protocol_test_001, TestSize.Level1) -{ - int32_t ret = DCAMERA_OK; - EXPECT_EQ(DCAMERA_OK, ret); -} - /** * @tc.name: dcamera_protocol_test_002 * @tc.desc: Verify CaptureInfoCmd Json. diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp index 2daa91ae..466bdecc 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp @@ -376,7 +376,10 @@ HWTEST_F(DCameraSourceStateMachineTest, dcamera_source_state_machine_test_006, T stateMachine_ ->UpdateState(DCAMERA_STATE_CONFIG_STREAM); stateMachine_ ->UpdateState(DCAMERA_STATE_CAPTURE); stateMachine_ ->UpdateState(static_cast(-1)); - EXPECT_EQ(DCAMERA_OK, ret); + stateMachine_ ->UpdateState(DCAMERA_STATE_INIT); + DCameraSourceEvent event0(DCAMERA_EVENT_REGIST, g_camIndex); + ret = stateMachine_ ->Execute(DCAMERA_EVENT_REGIST, event0); + EXPECT_EQ(DCAMERA_NOT_FOUND, ret); } /** 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 847be900..7dbd0e5d 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 @@ -484,23 +484,6 @@ HWTEST_F(DecodeDataProcessTest, decode_data_process_test_013, TestSize.Level1) EXPECT_EQ(rc, DCAMERA_OK); } -/** - * @tc.name: decode_data_process_test_014 - * @tc.desc: Verify decode data process func. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(DecodeDataProcessTest, decode_data_process_test_014, TestSize.Level1) -{ - DHLOGI("DecodeDataProcessTest decode_data_process_test_014"); - EXPECT_EQ(false, testDecodeDataProcess_ == nullptr); - - int32_t rc = DCAMERA_OK; - std::shared_ptr outputBuffer; - testDecodeDataProcess_->PostOutputDataBuffers(outputBuffer); - EXPECT_EQ(rc, DCAMERA_OK); -} - /** * @tc.name: decode_data_process_test_015 * @tc.desc: Verify decode data process func. -- Gitee