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

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

Audio VTS: Suppress empty parameter list failures am: b9743d47 am:... 

Audio VTS: Suppress empty parameter list failures am: b9743d47 am: 948929d0 am: 4084fa17 am: cc4656f5 am: 59ca8e29

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

Change-Id: I530a1388a3cb11e101f2e9dfb3df6cf44857a16b
parents 05eaa975 59ca8e29

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

+35 −0
Original line number Diff line number Diff line
@@ -331,6 +331,9 @@ TEST_P(AudioPolicyConfigTest, HasPrimaryModule) { 
INSTANTIATE_TEST_CASE_P(AudioHidl, AudioPolicyConfigTest,

                        ::testing::ValuesIn(getDeviceParametersForFactoryTests()),

                        &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioPolicyConfigTest);



//////////////////////////////////////////////////////////////////////////////

////////////////////// getService audio_devices_factory //////////////////////
@@ -366,6 +369,9 @@ TEST_P(AudioHidlTest, OpenDeviceInvalidParameter) { 
INSTANTIATE_TEST_CASE_P(AudioHidl, AudioHidlTest,

                        ::testing::ValuesIn(getDeviceParametersForFactoryTests()),

                        &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioHidlTest);



//////////////////////////////////////////////////////////////////////////////

/////////////////////////////// openDevice ///////////////////////////////////
@@ -391,6 +397,9 @@ TEST_P(AudioHidlDeviceTest, Init) { 


INSTANTIATE_TEST_CASE_P(AudioHidlDevice, AudioHidlDeviceTest,

                        ::testing::ValuesIn(getDeviceParameters()), &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioHidlDeviceTest);



//////////////////////////////////////////////////////////////////////////////

/////////////////////////////// openDevice primary ///////////////////////////
@@ -418,6 +427,9 @@ TEST_P(AudioPrimaryHidlTest, OpenPrimaryDevice) { 
INSTANTIATE_TEST_CASE_P(AudioPrimaryHidl, AudioPrimaryHidlTest,

                        ::testing::ValuesIn(getDeviceParametersForPrimaryDeviceTests()),

                        &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioPrimaryHidlTest);



//////////////////////////////////////////////////////////////////////////////

///////////////////// {set,get}{Master,Mic}{Mute,Volume} /////////////////////
@@ -513,6 +525,10 @@ INSTANTIATE_TEST_CASE_P(BoolAccessorHidl, BoolAccessorHidlTest, 
INSTANTIATE_TEST_CASE_P(BoolAccessorPrimaryHidl, BoolAccessorPrimaryHidlTest,

                        ::testing::ValuesIn(getDeviceParametersForPrimaryDeviceTests()),

                        &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BoolAccessorHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BoolAccessorPrimaryHidlTest);



using FloatAccessorHidlTest = AccessorHidlTest<float>;

TEST_P(FloatAccessorHidlTest, MasterVolumeTest) {
@@ -525,6 +541,9 @@ TEST_P(FloatAccessorHidlTest, MasterVolumeTest) { 


INSTANTIATE_TEST_CASE_P(FloatAccessorHidl, FloatAccessorHidlTest,

                        ::testing::ValuesIn(getDeviceParameters()), &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FloatAccessorHidlTest);



//////////////////////////////////////////////////////////////////////////////

//////////////////////////////// AudioPatches ////////////////////////////////
@@ -547,6 +566,9 @@ TEST_P(AudioPatchHidlTest, AudioPatches) { 


INSTANTIATE_TEST_CASE_P(AudioPatchHidl, AudioPatchHidlTest,

                        ::testing::ValuesIn(getDeviceParameters()), &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioPatchHidlTest);



// Nesting a tuple in another tuple allows to use GTest Combine function to generate

// all combinations of devices and configs.
@@ -717,11 +739,15 @@ INSTANTIATE_TEST_CASE_P( 
                ::testing::ValuesIn(ConfigHelper::getRecommendedSupportCaptureAudioConfig()),

                ::testing::Values(AudioInputFlag::NONE)),

        &DeviceConfigParameterToString);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OptionalInputBufferSizeTest);

#elif MAJOR_VERSION >= 6

INSTANTIATE_TEST_CASE_P(SupportedInputBufferSize, RequiredInputBufferSizeTest,

                        ::testing::ValuesIn(getInputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);

#endif

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(RequiredInputBufferSizeTest);



//////////////////////////////////////////////////////////////////////////////

/////////////////////////////// setScreenState ///////////////////////////////
@@ -960,6 +986,9 @@ INSTANTIATE_TEST_CASE_P(DeclaredOutputStreamConfigSupport, OutputStreamTest, 
                        ::testing::ValuesIn(getOutputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);

#endif

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OutputStreamTest);



////////////////////////////// openInputStream //////////////////////////////
@@ -1015,6 +1044,9 @@ INSTANTIATE_TEST_CASE_P(DeclaredInputStreamConfigSupport, InputStreamTest, 
                        ::testing::ValuesIn(getInputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);

#endif

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(InputStreamTest);



//////////////////////////////////////////////////////////////////////////////

////////////////////////////// IStream getters ///////////////////////////////
@@ -1553,6 +1585,9 @@ TEST_P(TtyModeAccessorPrimaryHidlTest, setGetTtyMode) { 
INSTANTIATE_TEST_CASE_P(TtyModeAccessorPrimaryHidl, TtyModeAccessorPrimaryHidlTest,

                        ::testing::ValuesIn(getDeviceParametersForPrimaryDeviceTests()),

                        &DeviceParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TtyModeAccessorPrimaryHidlTest);



TEST_P(BoolAccessorPrimaryHidlTest, setGetHac) {

    doc::test("Query and set the HAC state");

audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp

+6 −0
Original line number Diff line number Diff line
@@ -845,3 +845,9 @@ INSTANTIATE_TEST_SUITE_P( 
                                   IEffectsFactory::descriptor)),

                           ::testing::Values(LOUDNESS_ENHANCER_EFFECT_TYPE)),

        EffectParameterToString);

// When the VTS test runs on a device lacking the corresponding HAL version the parameter

// list is empty, this isn't a problem.

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioEffectsFactoryHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioEffectHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EqualizerAudioEffectHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(LoudnessEnhancerAudioEffectHidlTest);