From fe92f3dffef91685414cb007b43f7796b475bee7 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Sat, 9 Jan 2016 13:30:00 +0900
Subject: [PATCH] Add a test for broken MPEG audio frames.

---
 .../{invalid-frames.mp3 => invalid-frames1.mp3} | Bin
 tests/data/invalid-frames3.mp3                  | Bin 0 -> 8192 bytes
 tests/test_mpeg.cpp                             |  16 +++++++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename tests/data/{invalid-frames.mp3 => invalid-frames1.mp3} (100%)
 create mode 100644 tests/data/invalid-frames3.mp3

diff --git a/tests/data/invalid-frames.mp3 b/tests/data/invalid-frames1.mp3
similarity index 100%
rename from tests/data/invalid-frames.mp3
rename to tests/data/invalid-frames1.mp3
diff --git a/tests/data/invalid-frames3.mp3 b/tests/data/invalid-frames3.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..6bbd2d39720f4894cbea4358e5b85d6507ce0a0b
GIT binary patch
literal 8192
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

literal 0
HcmV?d00001

diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index b9f463a4..129fcc3c 100644
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -24,6 +24,7 @@ class TestMPEG : public CppUnit::TestFixture
   CPPUNIT_TEST(testAudioPropertiesNoVBRHeaders);
   CPPUNIT_TEST(testSkipInvalidFrames1);
   CPPUNIT_TEST(testSkipInvalidFrames2);
+  CPPUNIT_TEST(testSkipInvalidFrames3);
   CPPUNIT_TEST(testVersion2DurationWithXingHeader);
   CPPUNIT_TEST(testSaveID3v24);
   CPPUNIT_TEST(testSaveID3v24WrongParam);
@@ -107,7 +108,7 @@ public:
 
   void testSkipInvalidFrames1()
   {
-    MPEG::File f(TEST_FILE_PATH_C("invalid-frames.mp3"));
+    MPEG::File f(TEST_FILE_PATH_C("invalid-frames1.mp3"));
     CPPUNIT_ASSERT(f.audioProperties());
     CPPUNIT_ASSERT_EQUAL(0, f.audioProperties()->length());
     CPPUNIT_ASSERT_EQUAL(0, f.audioProperties()->lengthInSeconds());
@@ -131,6 +132,19 @@ public:
     CPPUNIT_ASSERT(!f.audioProperties()->xingHeader());
   }
 
+  void testSkipInvalidFrames3()
+  {
+    MPEG::File f(TEST_FILE_PATH_C("invalid-frames3.mp3"));
+    CPPUNIT_ASSERT(f.audioProperties());
+    CPPUNIT_ASSERT_EQUAL(0, f.audioProperties()->length());
+    CPPUNIT_ASSERT_EQUAL(0, f.audioProperties()->lengthInSeconds());
+    CPPUNIT_ASSERT_EQUAL(176, f.audioProperties()->lengthInMilliseconds());
+    CPPUNIT_ASSERT_EQUAL(320, f.audioProperties()->bitrate());
+    CPPUNIT_ASSERT_EQUAL(2, f.audioProperties()->channels());
+    CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
+    CPPUNIT_ASSERT(!f.audioProperties()->xingHeader());
+  }
+
   void testVersion2DurationWithXingHeader()
   {
     MPEG::File f(TEST_FILE_PATH_C("mpeg2.mp3"));