From cf0e945ac2a3014499613cc983e527d66e8cac73 Mon Sep 17 00:00:00 2001 From: Changyeon Jo Date: Wed, 9 Dec 2020 17:32:29 -0800 Subject: [PATCH] Correct EVS VTS test case This change updates CameraOpenClean test case to handle logical camera devices properly when it attempts to set and get an extended info. Fix: 175260026 Test: atest VtsHalEvsV1_1TargetTest Change-Id: Ie18436afa722dd24abcaa1a4e0180955827ee499 --- .../functional/VtsHalEvsV1_1TargetTest.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp index 948d45ff85..f1c8f9f6c7 100644 --- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp +++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp @@ -305,11 +305,22 @@ TEST_P(EvsHidlTest, CameraOpenClean) { const auto id = 0xFFFFFFFF; // meaningless id hidl_vec values; auto err = pCam->setExtendedInfo_1_1(id, values); - ASSERT_NE(EvsResult::INVALID_ARG, err); + if (isLogicalCam) { + // Logical camera device does not support setExtendedInfo + // method. + ASSERT_EQ(EvsResult::INVALID_ARG, err); + } else { + ASSERT_NE(EvsResult::INVALID_ARG, err); + } - pCam->getExtendedInfo_1_1(id, [](const auto& result, const auto& data) { - ASSERT_NE(EvsResult::INVALID_ARG, result); - ASSERT_EQ(0, data.size()); + + pCam->getExtendedInfo_1_1(id, [&isLogicalCam](const auto& result, const auto& data) { + if (isLogicalCam) { + ASSERT_EQ(EvsResult::INVALID_ARG, result); + } else { + ASSERT_NE(EvsResult::INVALID_ARG, result); + ASSERT_EQ(0, data.size()); + } }); // Explicitly close the camera so resources are released right away