Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0202146a authored by Ayush Jain's avatar Ayush Jain Committed by Automerger Merge Worker
Browse files

Merge "uwb: Keep VTS timeout to be consistent with UWB stack" into main am:... 

Merge "uwb: Keep VTS timeout to be consistent with UWB stack" into main am: e63e8657 am: c809659a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3002136



Change-Id: I4b5bb783c5b04d4f9613014c7e604b22c5ffa504
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 379d7c1e c809659a

uwb/aidl/vts/VtsHalUwbTargetTest.cpp

+8 −5
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ using ndk::SpAIBinder; 


namespace {

constexpr static int kCallbackTimeoutMs = 250;

// this timeout should be same as AOSP stack timeout (HAL_OPEN_TIMEOUT_MS)

constexpr static int kOpenCallbackTimeoutMs = 20000;

}  // namespace



class UwbClientCallback : public BnUwbClientCallback {
@@ -105,7 +107,7 @@ class UwbAidl : public testing::TestWithParam<std::string> { 
                        open_cb_promise.set_value();

                    }

                });

        std::chrono::milliseconds timeout{kCallbackTimeoutMs};

        std::chrono::milliseconds timeout{kOpenCallbackTimeoutMs};

        const auto iuwb_chip = getAnyChip();

        EXPECT_TRUE(iuwb_chip->open(callback).isOk());

        EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready);
@@ -137,7 +139,7 @@ TEST_P(UwbAidl, ChipOpen) { 
                    open_cb_promise.set_value();

                }

            });

    std::chrono::milliseconds timeout{kCallbackTimeoutMs};

    std::chrono::milliseconds timeout{kOpenCallbackTimeoutMs};

    const auto iuwb_chip = getAnyChip();

    EXPECT_TRUE(iuwb_chip->open(callback).isOk());

    EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready);
@@ -158,12 +160,13 @@ TEST_P(UwbAidl, ChipClose) { 
                    close_cb_promise.set_value();

                }

            });

    std::chrono::milliseconds timeout{kCallbackTimeoutMs};

    std::chrono::milliseconds open_timeout{kOpenCallbackTimeoutMs};

    std::chrono::milliseconds close_timeout{kCallbackTimeoutMs};

    const auto iuwb_chip = getAnyChip();

    EXPECT_TRUE(iuwb_chip->open(callback).isOk());

    EXPECT_EQ(open_cb_future.wait_for(timeout), std::future_status::ready);

    EXPECT_EQ(open_cb_future.wait_for(open_timeout), std::future_status::ready);

    EXPECT_TRUE(iuwb_chip->close().isOk());

    EXPECT_EQ(close_cb_future.wait_for(timeout), std::future_status::ready);

    EXPECT_EQ(close_cb_future.wait_for(close_timeout), std::future_status::ready);

}



TEST_P(UwbAidl, ChipCoreInit) {