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

Commit 82700932 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Minor fixes to TypeConverter tests 

Fix issues discovered after re-reviewing the code:

- add missing checks;

- prefer to use enums from code generated from XSD or their
  conversions to strings instead of strings, to avoid typos.

Bug: 142480271
Test: atest libmedia_helper_tests
Change-Id: Ia681df71bd9aeca65281d8049aacde87b5d44490
Merged-In: Ia681df71bd9aeca65281d8049aacde87b5d44490
parent 52915ac7

media/libmediahelper/tests/typeconverter_tests.cpp

+10 −5
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ TEST(TypeConverter, ParseChannelMasks) { 
    for (const auto enumVal : xsdc_enum_range<xsd::AudioChannelMask>{}) {

        const std::string stringVal = toString(enumVal);

        audio_channel_mask_t channelMask = channelMaskFromString(stringVal);

        EXPECT_EQ(stringVal != "AUDIO_CHANNEL_NONE", audio_channel_mask_is_valid(channelMask))

        EXPECT_EQ(enumVal != xsd::AudioChannelMask::AUDIO_CHANNEL_NONE,

                audio_channel_mask_is_valid(channelMask))

                << "Validity of \"" << stringVal << "\" is not as expected";

    }

}
@@ -67,7 +68,7 @@ TEST(TypeConverter, ParseInputOutputIndexChannelMask) { 
            EXPECT_TRUE(ChannelIndexConverter::toString(channelMask, stringValBack))

                    << "Conversion of indexed channel mask " << channelMask << " failed";

            EXPECT_EQ(stringVal, stringValBack);

        } else if (stringVal == "AUDIO_CHANNEL_NONE") {

        } else if (stringVal == toString(xsd::AudioChannelMask::AUDIO_CHANNEL_NONE)) {

            EXPECT_FALSE(InputChannelConverter::fromString(stringVal, channelMask))

                    << "Conversion of \"" << stringVal << "\" succeeded (as input channel mask)";

            EXPECT_FALSE(OutputChannelConverter::fromString(stringVal, channelMask))
@@ -86,6 +87,8 @@ TEST(TypeConverter, ParseInputOutputIndexChannelMask) { 
            EXPECT_TRUE(ChannelIndexConverter::toString(channelMask, stringValBack))

                    << "Conversion of indexed channel mask " << channelMask << " failed";

            EXPECT_EQ(stringVal, stringValBack);

        } else {

            FAIL() << "Unrecognized channel mask \"" << stringVal << "\"";

        }

    }

}
@@ -107,7 +110,7 @@ TEST(TypeConverter, ParseDevices) { 
        std::string stringValBack;

        EXPECT_TRUE(DeviceConverter::fromString(stringVal, device))

                << "Conversion of \"" << stringVal << "\" failed";

        if (stringVal != "AUDIO_DEVICE_NONE") {

        if (enumVal != xsd::AudioDevice::AUDIO_DEVICE_NONE) {

            EXPECT_TRUE(audio_is_input_device(device) || audio_is_output_device(device))

                    << "Device \"" << stringVal << "\" is neither input, nor output device";

        } else {
@@ -144,12 +147,14 @@ TEST(TypeConverter, ParseInOutDevices) { 
            EXPECT_TRUE(OutputDeviceConverter::fromString(stringValBack, deviceBack))

                    << "Conversion of \"" << stringValBack << "\" failed";

            EXPECT_EQ(device, deviceBack);

        } else if (stringVal == "AUDIO_DEVICE_NONE") {

        } else if (stringVal == toString(xsd::AudioDevice::AUDIO_DEVICE_NONE)) {

            EXPECT_FALSE(InputDeviceConverter::fromString(stringVal, device))

                    << "Conversion of \"" << stringVal << "\" succeeded (as input device)";

            EXPECT_FALSE(OutputDeviceConverter::fromString(stringVal, device))

                    << "Conversion of \"" << stringVal << "\" succeeded (as output device)";

            EXPECT_EQ(stringVal, toString(device));

        } else {

            FAIL() << "Unrecognized audio device \"" << stringVal << "\"";

        }

    }

}