[GWP-ASan] Stop using type aliases for ::testing:: types GitOrigin-RevId: b27f657f89c605f635f79ebcbacd8a729f8e1bff
diff --git a/tests/crash_handler_api.cpp b/tests/crash_handler_api.cpp index 598b7b8..d270ed8 100644 --- a/tests/crash_handler_api.cpp +++ b/tests/crash_handler_api.cpp
@@ -16,7 +16,7 @@ using AllocationMetadata = gwp_asan::AllocationMetadata; using AllocatorState = gwp_asan::AllocatorState; -class CrashHandlerAPITest : public Test { +class CrashHandlerAPITest : public ::testing::Test { public: void SetUp() override { setupState(); }
diff --git a/tests/harness.h b/tests/harness.h index 89f4e11..7129539 100644 --- a/tests/harness.h +++ b/tests/harness.h
@@ -13,12 +13,9 @@ #if defined(__Fuchsia__) #include <zxtest/zxtest.h> -using Test = ::zxtest::Test; -template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>; +namespace testing = zxtest; #else #include "gtest/gtest.h" -using Test = ::testing::Test; -template <typename T> using TestWithParam = ::testing::TestWithParam<T>; #endif #include "gwp_asan/guarded_pool_allocator.h" @@ -48,7 +45,7 @@ void CheckOnlyOneGwpAsanCrash(const std::string &OutputBuffer); -class DefaultGuardedPoolAllocator : public Test { +class DefaultGuardedPoolAllocator : public ::testing::Test { public: void SetUp() override { gwp_asan::options::Options Opts; @@ -67,7 +64,7 @@ MaxSimultaneousAllocations; }; -class CustomGuardedPoolAllocator : public Test { +class CustomGuardedPoolAllocator : public ::testing::Test { public: void InitNumSlots(decltype(gwp_asan::options::Options::MaxSimultaneousAllocations) @@ -91,7 +88,7 @@ }; class BacktraceGuardedPoolAllocator - : public TestWithParam</* Recoverable */ bool> { + : public ::testing::TestWithParam</* Recoverable */ bool> { public: void SetUp() override { gwp_asan::options::Options Opts;