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

Commit 68c09adf authored by Yifan Hong's avatar Yifan Hong
Browse files

health vts: implement GTEST_SKIP if not defined. 

gtest in Android P tree does not have GTEST_SKIP. Implement
a naive version of it.

Bug: 118852225
Test: manually undefine GTEST_SKIP, test with and without --force
Change-Id: I8df1154d8a94a67ae28e8024de6022fcfe76384d
Merged-In: I8df1154d8a94a67ae28e8024de6022fcfe76384d
(cherry picked from commit 03b2a347)
parent 0d48dc81

health/2.0/vts/functional/VtsHalHealthV2_0TargetTest.cpp

+38 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#define LOG_TAG "health_hidl_hal_test"



#include <mutex>

#include <set>

#include <string>



#include <VtsHalHidlTargetTestBase.h>

#include <android-base/logging.h>
@@ -32,6 +34,39 @@ using ::testing::VtsHalHidlTargetTestEnvBase; 


DEFINE_bool(force, false, "Force test healthd even when the default instance is present.");



// If GTEST_SKIP is not implemented, use our own skipping mechanism

#ifndef GTEST_SKIP

static std::mutex gSkippedTestsMutex;

static std::set<std::string> gSkippedTests;

static std::string GetCurrentTestName() {

    const auto& info = ::testing::UnitTest::GetInstance()->current_test_info();

#ifdef GTEST_REMOVE_LEGACY_TEST_CASEAPI_

    std::string test_suite = info->test_suite_name();

#else

    std::string test_suite = info->test_case_name();

#endif

    return test_suite + "." + info->name();

}



#define GTEST_SKIP()                                           \

    do {                                                       \

        std::unique_lock<std::mutex> lock(gSkippedTestsMutex); \

        gSkippedTests.insert(GetCurrentTestName());            \

        return;                                                \

    } while (0)



#define SKIP_IF_SKIPPED()                                                      \

    do {                                                                       \

        std::unique_lock<std::mutex> lock(gSkippedTestsMutex);                 \

        if (gSkippedTests.find(GetCurrentTestName()) != gSkippedTests.end()) { \

            std::cerr << "[  SKIPPED ] " << GetCurrentTestName() << std::endl; \

            return;                                                            \

        }                                                                      \

    } while (0)

#else

#define SKIP_IF_SKIPPED()

#endif



namespace android {

namespace hardware {

namespace health {
@@ -122,6 +157,7 @@ AssertionResult isAllOk(const Return<Result>& r) { 
 * unregisterCallback, and update.

 */

TEST_F(HealthHidlTest, Callbacks) {

    SKIP_IF_SKIPPED();

    using namespace std::chrono_literals;

    sp<Callback> firstCallback = new Callback();

    sp<Callback> secondCallback = new Callback();
@@ -158,6 +194,7 @@ TEST_F(HealthHidlTest, Callbacks) { 
}



TEST_F(HealthHidlTest, UnregisterNonExistentCallback) {

    SKIP_IF_SKIPPED();

    sp<Callback> callback = new Callback();

    auto ret = mHealth->unregisterCallback(callback);

    ASSERT_OK(ret);
@@ -239,6 +276,7 @@ bool verifyHealthInfo(const HealthInfo& health_info) { 
 * interface IHealth.

 */

TEST_F(HealthHidlTest, Properties) {

    SKIP_IF_SKIPPED();

    EXPECT_OK(mHealth->getChargeCounter([](auto result, auto value) {

        EXPECT_VALID_OR_UNSUPPORTED_PROP(result, std::to_string(value), value > 0);

    }));