]> granicus.if.org Git - taglib/commitdiff
Revert "Add a test to show a problem with properties() and duplication."
authorMichael Helmling <supermihi@web.de>
Thu, 20 Dec 2012 16:30:19 +0000 (17:30 +0100)
committerMichael Helmling <supermihi@web.de>
Thu, 20 Dec 2012 16:30:19 +0000 (17:30 +0100)
This reverts commit 6e3391a846655d898280c60aa52f6b27164412c9. The "problem" demonstrated in there won't be fixed due to lack of significance.

tests/data/id3v1_neq_v2.mp3 [deleted file]
tests/test_id3v2.cpp

diff --git a/tests/data/id3v1_neq_v2.mp3 b/tests/data/id3v1_neq_v2.mp3
deleted file mode 100644 (file)
index 984cb1d..0000000
Binary files a/tests/data/id3v1_neq_v2.mp3 and /dev/null differ
index f2a420a88491f0d385e70d6226418d6ef49ec916..48faf306bd6add2f4e429f1899170612d61c1e69 100644 (file)
@@ -75,7 +75,6 @@ class TestID3v2 : public CppUnit::TestFixture
   CPPUNIT_TEST(testW000);
   CPPUNIT_TEST(testPropertyInterface);
   CPPUNIT_TEST(testPropertyInterface2);
-  CPPUNIT_TEST(testBothID3Versions);
   CPPUNIT_TEST(testDeleteFrame);
   CPPUNIT_TEST(testSaveAndStripID3v1ShouldNotAddFrameFromID3v1ToId3v2);
   CPPUNIT_TEST_SUITE_END();
@@ -697,22 +696,6 @@ public:
     CPPUNIT_ASSERT_EQUAL(frame6, ID3v2::UniqueFileIdentifierFrame::findByOwner(&tag, "http://musicbrainz.org"));
   }
 
-void testBothID3Versions()
-  {
-    ScopedFileCopy copy("id3v1_neq_v2", ".mp3");
-    string newname = copy.fileName();
-    MPEG::File f(newname.c_str());
-    PropertyMap dict = f.properties();
-    CPPUNIT_ASSERT(!dict.contains("ALBUM"));
-    CPPUNIT_ASSERT(dict.contains("ARTIST"));
-
-    f.save();
-    MPEG::File f2(newname.c_str());
-    PropertyMap dict2 = f.properties();
-    CPPUNIT_ASSERT(!dict2.contains("ALBUM"));
-    CPPUNIT_ASSERT(dict2.contains("ARTIST"));
-  }
-
   void testDeleteFrame()
   {
     ScopedFileCopy copy("rare_frames", ".mp3");