openharmony/xts_hats
1
0
Fork 0
mirror of https://gitee.com/openharmony/xts_hats synced 2025-02-22 11:21:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1189 camera用例适配设备

Browse Source 
Merge pull request !1189 from zhangxiaofei/hdf_20240713
This commit is contained in:
openharmony_ci 2024-07-16 11:05:06 +00:00 committed by Gitee
commit d5b66e844a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hdf/camera/cameraMg/v1_0/src/hdi_host_uttest.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -204,9 +204,11 @@ HWTEST_F(HdiHostUtTest, SUB_Driver_Camera_Merge_2400, TestSize.Level0)
EXPECT_EQ(true, cameraTest->cameraDevice == nullptr);
if (cameraTest->cameraDevice == nullptr) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
if (cameraTest->cameraIds.size() > 2) {
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
}
}
}
@ -255,9 +257,11 @@ HWTEST_F(HdiHostUtTest, SUB_Driver_Camera_Merge_2700, TestSize.Level0)
EXPECT_EQ(true, cameraTest->cameraDevice == nullptr);
if (cameraTest->cameraDevice == nullptr) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = false;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
if (cameraTest->cameraIds.size() > 2) {
cameraTest->status = false;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
}
}
}
@ -279,4 +283,40 @@ HWTEST_F(HdiHostUtTest, SUB_Driver_Camera_Merge_2800, TestSize.Level0)
EXPECT_EQ(cameraTest->rc, HDI::Camera::V1_0::NO_ERROR);
}
}
}
}
#ifdef DISPLAY_COMMUNITY
/**
* @tc.name: SetFlashlight
* @tc.desc: SetFlashlight, normal cameraId
* @tc.size: MediumTest
* @tc.type: Function
*/
HWTEST_F(HdiHostUtTest, SUB_Driver_Camera_MergeRK_2400, TestSize.Level0)
{
EXPECT_EQ(true, cameraTest->cameraDevice == nullptr);
if (cameraTest->cameraDevice == nullptr) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
}
}
/**
* @tc.name: SetFlashlight
* @tc.desc: SetFlashlight, status is false
* @tc.size: MediumTest
* @tc.type: Function
*/
HWTEST_F(HdiHostUtTest, SUB_Driver_Camera_MergeRK_2700, TestSize.Level0)
{
EXPECT_EQ(true, cameraTest->cameraDevice == nullptr);
if (cameraTest->cameraDevice == nullptr) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = false;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
}
}
#endif

3
hdf/camera/cameraMg/v1_1/include/hdi_common_v1_1.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -43,6 +43,7 @@ enum CameraUtConstants {
UT_TUNNEL_MODE = 5,
UT_DATA_SIZE = 8,
UT_PREVIEW_SIZE = 3112960,
CAMERA_ID_NUM = 2,
};
enum ImageDataSaveSwitch {

4
hdf/camera/cameraMg/v1_1/src/hdi_common_v1_1.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -93,7 +93,7 @@ void Test::Init()
hostCallback = new TestCameraHostCallback();
service->SetCallback(hostCallback);
service->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;

3
hdf/camera/cameraMg/v1_2/include/hdi_common_v1_2.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -46,6 +46,7 @@ enum CameraUtConstants {
UT_DATA_SIZE = 8,
UT_PREVIEW_SIZE = 3112960,
UT_MICROSECOND_TIMES = 500000,
CAMERA_ID_NUM = 2,
};
enum Numbers {

6
hdf/camera/cameraMg/v1_2/src/hdi_common_v1_2.cpp
View File

@ -87,7 +87,7 @@ void Test::Init()
ret = service->SetCallback(hostCallback);
EXPECT_EQ(ret, 0);
service->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;
@ -122,7 +122,7 @@ int32_t Test::DefferredImageTestInit()
void Test::Open(int cameraId)
{
if (cameraDevice == nullptr) {
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;
@ -149,7 +149,7 @@ void Test::OpenCameraV1_2(int cameraId)
{
if (cameraDevice == nullptr) {
service->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;

1
hdf/camera/cameraMg/v1_3/include/hdi_common_v1_3.h
View File

@ -44,6 +44,7 @@ enum CameraUtConstants {
UT_TUNNEL_MODE = 5,
UT_DATA_SIZE = 8,
UT_PREVIEW_SIZE = 3112960,
CAMERA_ID_NUM = 2,
};
enum Numbers {

6
hdf/camera/cameraMg/v1_3/src/hdi_common_v1_3.cpp
View File

@ -94,7 +94,7 @@ void Test::Init()
ret = serviceV1_3->SetCallback(hostCallback);
EXPECT_EQ(ret, 0);
serviceV1_3->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;
@ -104,7 +104,7 @@ void Test::Init()
void Test::Open(int cameraId)
{
if (cameraDeviceV1_3 == nullptr) {
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;
@ -130,7 +130,7 @@ void Test::OpenSecureCamera(int cameraId)
{
if (cameraDeviceV1_3 == nullptr) {
serviceV1_3->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;

20
hdf/camera/cameraMg_additional/v1_0/src/hdi_host_uttest.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -58,11 +58,13 @@ HWTEST_F(HdiHostUtTestAdditional, testOnFlashlightStatus001, Function | MediumTe
EXPECT_EQ(true, cameraTest->cameraDevice == nullptr);
if (cameraTest->cameraDevice == nullptr) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
if (cameraTest->cameraIds.size() > 2) {
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
EXPECT_EQ(g_onFlashlightStatusFlag, true);
}
}
EXPECT_EQ(g_onFlashlightStatusFlag, true);
}
/**
@ -108,9 +110,11 @@ HWTEST_F(HdiHostUtTestAdditional, testSetFlashLight003, Function | MediumTest |
if (cameraTest->cameraDevice == nullptr) {
for (int i = 0; i < 100; i++) {
cameraTest->service->GetCameraIds(cameraTest->cameraIds);
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
if (cameraTest->cameraIds.size() > 2) {
cameraTest->status = true;
cameraTest->rc = cameraTest->service->SetFlashlight(cameraTest->cameraIds.front(), cameraTest->status);
EXPECT_EQ(true, cameraTest->rc == HDI::Camera::V1_0::NO_ERROR);
}
}
}
}

3
hdf/camera/cameraMg_additional/v1_1/include/hdi_common_v1_1.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -43,6 +43,7 @@ enum CameraUtConstants {
UT_TUNNEL_MODE = 5,
UT_DATA_SIZE = 8,
UT_PREVIEW_SIZE = 3112960,
CAMERA_ID_NUM = 2,
};
enum ImageDataSaveSwitch {

4
hdf/camera/cameraMg_additional/v1_1/src/hdi_common_v1_1.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file expected in compliance with the License.
* You may obtain a copy of the License at
@ -93,7 +93,7 @@ void Test::Init()
hostCallback = new TestCameraHostCallback();
service->SetCallback(hostCallback);
service->GetCameraIds(cameraIds);
if (cameraIds.size() == 0) {
if (cameraIds.size() <= CAMERA_ID_NUM) {
CAMERA_LOGE("camera device list empty");
GTEST_SKIP() << "No Camera Available" << std::endl;
return;