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

Commit 6086e20a authored by Dan Shi's avatar Dan Shi Committed by Automerger Merge Worker
Browse files

Merge "Suppress gtest error for tests without any instance" am: de3f15ad am: acfabe65 

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

Change-Id: I8b25839bef2f81a02590357dc7c3658ea4499f76
parents 3eb011c4 acfabe65

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

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ TEST_P(DualMonoModeAccessorHidlTest, DualMonoModeTest) { 
                            &IStreamOut::setDualMonoMode, &IStreamOut::getDualMonoMode);

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DualMonoModeAccessorHidlTest);

INSTANTIATE_TEST_CASE_P(DualMonoModeHidl, DualMonoModeAccessorHidlTest,

                        ::testing::ValuesIn(getOutputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);
@@ -166,6 +167,7 @@ TEST_P(AudioDescriptionMixLevelHidlTest, AudioDescriptionMixLevelTest) { 
            {48.5f, 1000.0f, std::numeric_limits<float>::infinity()});

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioDescriptionMixLevelHidlTest);

INSTANTIATE_TEST_CASE_P(AudioDescriptionMixLevelHidl, AudioDescriptionMixLevelHidlTest,

                        ::testing::ValuesIn(getOutputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);
@@ -200,6 +202,7 @@ TEST_P(PlaybackRateParametersHidlTest, PlaybackRateParametersTest) { 
                          TimestretchFallbackMode::FAIL}});

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PlaybackRateParametersHidlTest);

INSTANTIATE_TEST_CASE_P(PlaybackRateParametersHidl, PlaybackRateParametersHidlTest,

                        ::testing::ValuesIn(getOutputDeviceConfigParameters()),

                        &DeviceConfigParameterToString);

broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ TEST_P(BroadcastRadioHidlTest, IbImagesOnly) { 
    }

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BroadcastRadioHidlTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, BroadcastRadioHidlTest,

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(

broadcastradio/1.1/vts/functional/VtsHalBroadcastradioV1_1TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ TEST_P(BroadcastRadioHalTest, VerifyIdentifiersFormat) { 
    } while (nextBand());

}



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BroadcastRadioHalTest);

INSTANTIATE_TEST_CASE_P(

        PerInstance, BroadcastRadioHalTest,

        testing::Combine(testing::ValuesIn(android::hardware::getAllHalInstanceNames(

drm/1.0/vts/functional/drm_hal_test_main.cpp

+3 −0
Original line number Diff line number Diff line
@@ -51,14 +51,17 @@ static const std::vector<DrmHalTestParam> kAllInstances = [] { 
    return allInstanceUuidCombos;

}();



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorFactoryTest);

INSTANTIATE_TEST_CASE_P(DrmHalVendorFactoryTestCases, DrmHalVendorFactoryTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorPluginTest);

INSTANTIATE_TEST_CASE_P(DrmHalVendorPluginTestCases, DrmHalVendorPluginTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorDecryptTest);

INSTANTIATE_TEST_CASE_P(DrmHalVendorDecryptTestCases, DrmHalVendorDecryptTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);

drm/1.3/vts/functional/drm_hal_test_main.cpp

+3 −0
Original line number Diff line number Diff line
@@ -81,12 +81,15 @@ static const std::vector<DrmHalTestParam> kAllInstances = [] { 
    return allInstanceUuidCombos;

}();



GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorFactoryTest);

INSTANTIATE_TEST_CASE_P(PerInstanceUuidV1_0, DrmHalVendorFactoryTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorPluginTest);

INSTANTIATE_TEST_CASE_P(PerInstanceUuidV1_0, DrmHalVendorPluginTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DrmHalVendorDecryptTest);

INSTANTIATE_TEST_CASE_P(PerInstanceUuidV1_0, DrmHalVendorDecryptTest,

                        testing::ValuesIn(kAllInstances),

                        drm_vts::PrintParamInstanceToString);