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

Commit fe0f98eb authored by Arthur Ishiguro's avatar Arthur Ishiguro
Browse files

Refactors VtsHalContexthubUtils.h 

Separates files that does/doesn't depend on HIDL.

Bug: 194285834
Test: Compile
Change-Id: I02e406f13b8459c80904454564ef34a143aa7075
parent 1e23e773

contexthub/1.0/vts/functional/VtsHalContexthubV1_0TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include "ContexthubCallbackBase.h"

#include "ContexthubHidlTestBase.h"

#include "VtsHalContexthubUtils.h"

#include "VtsHalContexthubUtilsCommon.h"

#include "VtsHalContexthubUtilsHidl.h"



#include <android-base/logging.h>

#include <android/hardware/contexthub/1.0/IContexthub.h>

contexthub/1.1/vts/functional/VtsHalContexthubV1_1TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include "ContexthubCallbackBase.h"

#include "ContexthubHidlTestBase.h"

#include "VtsHalContexthubUtils.h"

#include "VtsHalContexthubUtilsCommon.h"

#include "VtsHalContexthubUtilsHidl.h"



#include <android-base/logging.h>

#include <android/hardware/contexthub/1.0/IContexthub.h>

contexthub/1.2/vts/functional/VtsHalContexthubV1_2TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include "ContexthubCallbackBase.h"

#include "ContexthubHidlTestBase.h"

#include "VtsHalContexthubUtils.h"

#include "VtsHalContexthubUtilsCommon.h"

#include "VtsHalContexthubUtilsHidl.h"



#include <android-base/logging.h>

#include <android/hardware/contexthub/1.0/IContexthub.h>

contexthub/common/vts/VtsHalContexthubUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "VtsHalContexthubUtils.h"

#include "VtsHalContexthubUtilsHidl.h"



#include <chrono>

#include <future>

contexthub/common/vts/VtsHalContexthubUtilsCommon.h

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/**

 * Utils file for any Context Hub VTS code (i.e. not specific to e.g. HIDL).

 */



#pragma once



#include <chrono>

#include <future>



namespace android {

namespace hardware {

namespace contexthub {

namespace vts_utils {



// App ID with vendor "GoogT" (Google Testing), app identifier 0x555555. This

// app ID is reserved and must never appear in the list of loaded apps.

constexpr uint64_t kNonExistentAppId = 0x476f6f6754555555;



// Helper that does explicit conversion of an enum class to its underlying/base

// type. Useful for stream output of enum values.

template <typename EnumType>

inline constexpr typename std::underlying_type<EnumType>::type asBaseType(EnumType value) {

    return static_cast<typename std::underlying_type<EnumType>::type>(value);

}



// Wait for a callback to occur (signaled by the given future) up to the

// provided timeout. If the future is invalid or the callback does not come

// within the given time, returns false.

template <class ReturnType>

bool waitForCallback(std::future<ReturnType> future, ReturnType* result,

                     std::chrono::milliseconds timeout = std::chrono::seconds(5)) {

    auto expiration = std::chrono::system_clock::now() + timeout;



    EXPECT_NE(result, nullptr);

    EXPECT_TRUE(future.valid());

    if (result != nullptr && future.valid()) {

        std::future_status status = future.wait_until(expiration);

        EXPECT_NE(status, std::future_status::timeout) << "Timed out waiting for callback";



        if (status == std::future_status::ready) {

            *result = future.get();

            return true;

        }

    }



    return false;

}



}  // namespace vts_utils

}  // namespace contexthub

}  // namespace hardware

}  // namespace android