tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix UninstantiatedParameterizedTestSuite errors in Audio HAL" am: 5d62b1774b am: f328694977 am: 7bb4cf7c71

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1552733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf9464e6ad19fbb28f597380eb938cbec3a6d0fa
This commit is contained in:
Mikhail Naganov 2021-01-21 03:42:47 +00:00 committed by Automerger Merge Worker
commit 7176367d02
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp
View file

@ -128,7 +128,7 @@ TEST_P(SingleConfigOutputStreamTest, CloseDeviceWithOpenedOutputStreams) {
INSTANTIATE_TEST_CASE_P(SingleConfigOutputStream, SingleConfigOutputStreamTest, INSTANTIATE_TEST_CASE_P(SingleConfigOutputStream, SingleConfigOutputStreamTest,
::testing::ValuesIn(getOutputDeviceSingleConfigParameters()), ::testing::ValuesIn(getOutputDeviceSingleConfigParameters()),
&DeviceConfigParameterToString); &DeviceConfigParameterToString);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigOutputStream); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigOutputStreamTest);
class SingleConfigInputStreamTest : public InputStreamTest {}; class SingleConfigInputStreamTest : public InputStreamTest {};
TEST_P(SingleConfigInputStreamTest, CloseDeviceWithOpenedInputStreams) { TEST_P(SingleConfigInputStreamTest, CloseDeviceWithOpenedInputStreams) {
@ -142,7 +142,7 @@ TEST_P(SingleConfigInputStreamTest, CloseDeviceWithOpenedInputStreams) {
INSTANTIATE_TEST_CASE_P(SingleConfigInputStream, SingleConfigInputStreamTest, INSTANTIATE_TEST_CASE_P(SingleConfigInputStream, SingleConfigInputStreamTest,
::testing::ValuesIn(getInputDeviceSingleConfigParameters()), ::testing::ValuesIn(getInputDeviceSingleConfigParameters()),
&DeviceConfigParameterToString); &DeviceConfigParameterToString);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigInputStream); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SingleConfigInputStreamTest);
TEST_P(AudioPatchHidlTest, UpdatePatchInvalidHandle) { TEST_P(AudioPatchHidlTest, UpdatePatchInvalidHandle) {
doc::test("Verify that passing an invalid handle to updateAudioPatch is checked"); doc::test("Verify that passing an invalid handle to updateAudioPatch is checked");

9
audio/core/all-versions/vts/functional/7.0/AudioPrimaryHidlHalTest.cpp
View file

@ -296,7 +296,7 @@ INSTANTIATE_TEST_CASE_P(
InputBufferSizeInvalidConfig, InvalidInputConfigNoFlagsTest, InputBufferSizeInvalidConfig, InvalidInputConfigNoFlagsTest,
::testing::ValuesIn(getInputDeviceInvalidConfigParameters(false /*generateInvalidFlags*/)), ::testing::ValuesIn(getInputDeviceInvalidConfigParameters(false /*generateInvalidFlags*/)),
&DeviceConfigParameterToString); &DeviceConfigParameterToString);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputBufferSizeInvalidConfig); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InvalidInputConfigNoFlagsTest);
static const DeviceAddress& getValidInputDeviceAddress() { static const DeviceAddress& getValidInputDeviceAddress() {
static const DeviceAddress valid = { static const DeviceAddress valid = {
@ -682,9 +682,7 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(getValidInputDeviceAddress()), ::testing::Values(getValidInputDeviceAddress()),
::testing::ValuesIn(wrapMetadata(getInvalidSinkMetadatas()))), ::testing::ValuesIn(wrapMetadata(getInvalidSinkMetadatas()))),
&StreamOpenParameterToString); &StreamOpenParameterToString);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidConfig); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(StreamOpenTest);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidAddress);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamInvalidMetadata);
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
OutputStreamInvalidConfig, StreamOpenTest, OutputStreamInvalidConfig, StreamOpenTest,
@ -706,9 +704,6 @@ INSTANTIATE_TEST_CASE_P(
::testing::Values(getValidOutputDeviceAddress()), ::testing::Values(getValidOutputDeviceAddress()),
::testing::ValuesIn(wrapMetadata(getInvalidSourceMetadatas()))), ::testing::ValuesIn(wrapMetadata(getInvalidSourceMetadatas()))),
&StreamOpenParameterToString); &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) \ #define TEST_SINGLE_CONFIG_IO_STREAM(test_name, documentation, code) \
TEST_P(SingleConfigInputStreamTest, test_name) { \ TEST_P(SingleConfigInputStreamTest, test_name) { \