From 0d814ce524770ef201c11ecb1ac57ec5328c13fa Mon Sep 17 00:00:00 2001 From: Changyeon Jo Date: Sat, 23 Apr 2022 05:26:16 -0700 Subject: [PATCH] Update CameraStreamBuffering test case CameraStreamBuffering test case intentionally calls setMaxFramesInFight() with very large integer value to verify that API handles unreasonaly large value properly. A type of its parameter is changed from unsigned 32-bit integer to signed 32-bit integer in the latest EVS interface definition written in the stable AIDL. To adapt a test case, this CL updates it to use std::numeric_limits::max() instead of 0xFFFFFFFF, which is translated as -1 in signed 32-bit integer format. Bug: 226628778 Test: atest VtsHalEvsV1_1TargetTest atest VtsHalEvsTargetTest Change-Id: Ic35c6c962617825bc271cec8544770340db7728a --- automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp | 3 ++- automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp index 84323ead10..623438f70e 100644 --- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp +++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp @@ -563,7 +563,8 @@ TEST_P(EvsHidlTest, CameraStreamBuffering) { activeCameras.push_back(pCam); // Ask for a very large number of buffers in flight to ensure it errors correctly - Return badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF); + Return badResult = + pCam->setMaxFramesInFlight(std::numeric_limits::max()); EXPECT_EQ(EvsResult::BUFFER_NOT_AVAILABLE, badResult); // Now ask for exactly two buffers in flight as we'll test behavior in that case diff --git a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp index a442368c4e..09e1088ee4 100644 --- a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp +++ b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp @@ -526,7 +526,7 @@ TEST_P(EvsAidlTest, CameraStreamBuffering) { mActiveCameras.push_back(pCam); // Ask for a very large number of buffers in flight to ensure it errors correctly - auto badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF); + auto badResult = pCam->setMaxFramesInFlight(std::numeric_limits::max()); EXPECT_TRUE(!badResult.isOk() && badResult.getServiceSpecificError() == static_cast(EvsResult::INVALID_ARG));