From d5b489a3de6dd87acd89d439b14f84e3d5de2ad0 Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Wed, 20 Jan 2021 15:15:15 -0800 Subject: [PATCH] Fix UninstantiatedParameterizedTestSuite errors in Audio HAL Fix the specification of the test suite name passed to GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST to avoid UninstantiatedParameterizedTestSuite errors. Bug: 177344488 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest Change-Id: I418a488faa61c3bee2b959747e97483428d624b0 --- .../vts/functional/6.0/AudioPrimaryHidlHalTest.cpp | 4 ++-- .../vts/functional/7.0/AudioPrimaryHidlHalTest.cpp | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp index 0f0cdcf28c..0ebe4c24ff 100644 --- a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp @@ -128,7 +128,7 @@ TEST_P(SingleConfigOutputStreamTest, CloseDeviceWithOpenedOutputStreams) { INSTANTIATE_TEST_CASE_P(SingleConfigOutputStream, SingleConfigOutputStreamTest, ::testing::ValuesIn(getOutputDeviceSingleConfigParameters()), &DeviceConfigParameterToString); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigOutputStream); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigOutputStreamTest); class SingleConfigInputStreamTest : public InputStreamTest {}; TEST_P(SingleConfigInputStreamTest, CloseDeviceWithOpenedInputStreams) { @@ -142,7 +142,7 @@ TEST_P(SingleConfigInputStreamTest, CloseDeviceWithOpenedInputStreams) { INSTANTIATE_TEST_CASE_P(SingleConfigInputStream, SingleConfigInputStreamTest, ::testing::ValuesIn(getInputDeviceSingleConfigParameters()), &DeviceConfigParameterToString); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigInputStream); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigInputStreamTest); TEST_P(AudioPatchHidlTest, UpdatePatchInvalidHandle) { doc::test("Verify that passing an invalid handle to updateAudioPatch is checked"); diff --git a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp index ef4dabae60..7fca61036d 100644 --- a/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp @@ -296,7 +296,7 @@ INSTANTIATE_TEST_CASE_P( InputBufferSizeInvalidConfig, InvalidInputConfigNoFlagsTest, ::testing::ValuesIn(getInputDeviceInvalidConfigParameters(false /*generateInvalidFlags*/)), &DeviceConfigParameterToString); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputBufferSizeInvalidConfig); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InvalidInputConfigNoFlagsTest); static const DeviceAddress& getValidInputDeviceAddress() { static const DeviceAddress valid = { @@ -682,9 +682,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(getValidInputDeviceAddress()), ::testing::ValuesIn(wrapMetadata(getInvalidSinkMetadatas()))), &StreamOpenParameterToString); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidConfig); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidAddress); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidMetadata); +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(StreamOpenTest); INSTANTIATE_TEST_CASE_P( OutputStreamInvalidConfig, StreamOpenTest, @@ -706,9 +704,6 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(getValidOutputDeviceAddress()), ::testing::ValuesIn(wrapMetadata(getInvalidSourceMetadatas()))), &StreamOpenParameterToString); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OutputStreamInvalidConfig); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OutputStreamInvalidAddress); -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OutputStreamInvalidMetadata); #define TEST_SINGLE_CONFIG_IO_STREAM(test_name, documentation, code) \ TEST_P(SingleConfigInputStreamTest, test_name) { \