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

Commit aed72e54 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Update unit test for ID3tests" am: 72c69ede 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1686285

Change-Id: Ie2eab870bca430629f5e6ccb588f63b10bb4931b
parents 37f8a499 72c69ede

media/libstagefright/id3/test/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        <option name="cleanup" value="true" />

        <option name="push" value="ID3Test->/data/local/tmp/ID3Test" />

        <option name="push-file"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/id3/test/ID3Test-1.1.zip?unzip=true"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/id3/test/ID3Test-1.2.zip?unzip=true"

            value="/data/local/tmp/ID3TestRes/" />

    </target_preparer>

media/libstagefright/id3/test/ID3Test.cpp

+8 −3
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ TEST_P(ID3albumArtTest, AlbumArtTest) { 
    } else {

        ASSERT_EQ(data, nullptr) << "Found album art when expected none!";

    }



#if (LOG_NDEBUG == 0)

    hexdump(data, dataSize > 128 ? 128 : dataSize);

#endif
@@ -186,7 +187,8 @@ INSTANTIATE_TEST_SUITE_P(id3TestAll, ID3tagTest, 
                                           "bbb_1sec_v23_3tags.mp3",

                                           "bbb_1sec_v1_5tags.mp3",

                                           "bbb_2sec_v24_unsynchronizedOneFrame.mp3",

                                           "bbb_2sec_v24_unsynchronizedAllFrames.mp3"));

                                           "bbb_2sec_v24_unsynchronizedAllFrames.mp3",

                                           "idv24_unsynchronized.mp3"));



INSTANTIATE_TEST_SUITE_P(

        id3TestAll, ID3versionTest,
@@ -201,7 +203,8 @@ INSTANTIATE_TEST_SUITE_P( 
                          make_pair("bbb_1sec_v1_5tags.mp3", ID3::ID3_V1_1),

                          make_pair("bbb_1sec_v1_3tags.mp3", ID3::ID3_V1_1),

                          make_pair("bbb_2sec_v24_unsynchronizedOneFrame.mp3", ID3::ID3_V2_4),

                          make_pair("bbb_2sec_v24_unsynchronizedAllFrames.mp3", ID3::ID3_V2_4)));

                          make_pair("bbb_2sec_v24_unsynchronizedAllFrames.mp3", ID3::ID3_V2_4),

                          make_pair("idv24_unsynchronized.mp3", ID3::ID3_V2_4)));



INSTANTIATE_TEST_SUITE_P(

        id3TestAll, ID3textTagTest,
@@ -227,7 +230,9 @@ INSTANTIATE_TEST_SUITE_P(id3TestAll, ID3albumArtTest, 
                                           make_pair("bbb_2sec_1_image.mp3", true),

                                           make_pair("bbb_2sec_2_image.mp3", true),

                                           make_pair("bbb_2sec_largeSize.mp3", true),

                                           make_pair("bbb_1sec_v1_5tags.mp3", false)));

                                           make_pair("bbb_1sec_v1_5tags.mp3", false),

                                           make_pair("idv24_unsynchronized.mp3", true)

                                           ));



INSTANTIATE_TEST_SUITE_P(id3TestAll, ID3multiAlbumArtTest,

                         ::testing::Values(make_pair("bbb_1sec_v23.mp3", 0),