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

Commit 0a614efc authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clean up ID3 unit test"

parents 522e96f2 0c89ab2d

media/libstagefright/id3/test/ID3Test.cpp

+13 −11
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ TEST_P(ID3versionTest, VersionTest) { 
    ID3 tag(file.get());

    ASSERT_TRUE(tag.isValid()) << "No valid ID3 tag found for " << path.c_str() << "\n";

    ASSERT_TRUE(tag.version() >= versionNumber)

            << "Expected version: " << tag.version() << " Found version: " << versionNumber;

            << "Found version: " << tag.version() << " Expected version: " << versionNumber;

}



TEST_P(ID3textTagTest, TextTagTest) {
@@ -162,16 +162,18 @@ INSTANTIATE_TEST_SUITE_P(id3TestAll, ID3tagTest, 
                                           "bbb_44100hz_2ch_128kbps_mp3_5mins_largeSize.mp3",

                                           "bbb_44100hz_2ch_128kbps_mp3_30sec_moreTextFrames.mp3"));



// TODO: need some data that is not V2.3

INSTANTIATE_TEST_SUITE_P(

        id3TestAll, ID3versionTest,

        ::testing::Values(make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_1_image.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_2_image.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_1_image.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_2_image.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_largeSize.mp3", 4),

                          make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_moreTextFrames.mp3", 4)));

        ::testing::Values(

              make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_1_image.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_2_image.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_1_image.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_2_image.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_5mins_largeSize.mp3", ID3::ID3_V2_3),

              make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec_moreTextFrames.mp3", ID3::ID3_V2_3)));



INSTANTIATE_TEST_SUITE_P(

        id3TestAll, ID3textTagTest,