summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangyeon Jo <changyeon@google.com>2022-05-02 21:57:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-05-02 21:57:32 +0000
commitdf2bcbe6e2950356165c8cc706daca9aef2f7cc9 (patch)
treea108becc551b95d16d8abf0c52ecda3db95b9cee
parentdd890b58457734d44e4e2af87fb1343d2348689e (diff)
parent0d814ce524770ef201c11ecb1ac57ec5328c13fa (diff)
Merge "Update CameraStreamBuffering test case" into tm-dev
-rw-r--r--automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp3
-rw-r--r--automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp2
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<EvsResult> badResult = pCam->setMaxFramesInFlight(0xFFFFFFFF);
+ Return<EvsResult> badResult =
+ pCam->setMaxFramesInFlight(std::numeric_limits<int32_t>::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<int32_t>::max());
EXPECT_TRUE(!badResult.isOk() && badResult.getServiceSpecificError() ==
static_cast<int>(EvsResult::INVALID_ARG));