diff --git a/audio/common/all-versions/test/utility/include/utility/PrettyPrintAudioTypes.h b/audio/common/all-versions/test/utility/include/utility/PrettyPrintAudioTypes.h deleted file mode 100644 index 3833fd072e..0000000000 --- a/audio/common/all-versions/test/utility/include/utility/PrettyPrintAudioTypes.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2018 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. - */ - -#ifndef ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_PRETTY_PRINT_AUDIO_TYPES_H -#define ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_PRETTY_PRINT_AUDIO_TYPES_H - -#include -#include - -/** @file Use HIDL generated toString methods to pretty print gtest errors - * Unfortunately Gtest does not offer a template to specialize, only - * overloading PrintTo. - * @note that this overload can NOT be template because - * the fallback is already template, resulting in ambiguity. - * @note that the overload MUST be in the exact namespace - * the type is declared in, as per the ADL rules. - */ - -namespace android { -namespace hardware { -namespace audio { - -#define DEFINE_GTEST_PRINT_TO(T) \ - inline void PrintTo(const T& val, ::std::ostream* os) { *os << toString(val); } - -namespace CPP_VERSION { -DEFINE_GTEST_PRINT_TO(IPrimaryDevice::TtyMode) -DEFINE_GTEST_PRINT_TO(Result) -} // namespace CPP_VERSION - -namespace common { -namespace CPP_VERSION { -DEFINE_GTEST_PRINT_TO(AudioConfig) -DEFINE_GTEST_PRINT_TO(AudioMode) -DEFINE_GTEST_PRINT_TO(AudioDevice) -DEFINE_GTEST_PRINT_TO(AudioFormat) -DEFINE_GTEST_PRINT_TO(AudioChannelMask) -} // namespace CPP_VERSION -} // namespace common - -#undef DEFINE_GTEST_PRINT_TO - -} // namespace audio -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_PRETTY_PRINT_AUDIO_TYPES_H diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h index 468f9b2da6..e76e24e725 100644 --- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h +++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h @@ -58,7 +58,6 @@ #include "utility/AssertOk.h" #include "utility/Documentation.h" -#include "utility/PrettyPrintAudioTypes.h" #include "utility/ReturnIn.h" #include "utility/ValidateXml.h"