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

Commit f3286949 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Fix UninstantiatedParameterizedTestSuite errors in Audio HAL" am: 5d62b177 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a63052fd270c27d83b19d686153a327ac66f18c
parents 7ffa0164 5d62b177

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

+2 −2
Original line number Diff line number Diff line
@@ -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");

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

+2 −7
Original line number Diff line number Diff line
@@ -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) {                 \