Modified some tests to work with MSVC.

diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
index caec7153974b8cae97a9371d5e063840e5a5ed26..22bbc854d4251b79d10ffdfee67af0c71e6eb935 100644 (file)
--- a/tests/test_flac.cpp
+++ b/tests/test_flac.cpp
@@ -91,6 +91,7 @@ public:
     newpic->setData("JPEG data");
     f->addPicture(newpic);
     f->save();
+    delete f;
 
     f = new FLAC::File(newname.c_str());
     lst = f->pictureList();
@@ -115,6 +116,7 @@ public:
     CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), pic->mimeType());
     CPPUNIT_ASSERT_EQUAL(String("new image"), pic->description());
     CPPUNIT_ASSERT_EQUAL(ByteVector("JPEG data"), pic->data());
+    delete f;
   }
 
   void testReplacePicture()
@@ -138,6 +140,7 @@ public:
     f->removePictures();
     f->addPicture(newpic);
     f->save();
+    delete f;
 
     f = new FLAC::File(newname.c_str());
     lst = f->pictureList();
@@ -152,6 +155,7 @@ public:
     CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), pic->mimeType());
     CPPUNIT_ASSERT_EQUAL(String("new image"), pic->description());
     CPPUNIT_ASSERT_EQUAL(ByteVector("JPEG data"), pic->data());
+    delete f;
   }
 
   void testRemoveAllPictures()
@@ -165,10 +169,12 @@ public:
 
     f->removePictures();
     f->save();
+    delete f;
 
     f = new FLAC::File(newname.c_str());
     lst = f->pictureList();
     CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), lst.size());
+    delete f;
   }
 
   void testRepeatedSave()
@@ -185,10 +191,12 @@ public:
     tag->setTitle("NEW TITLE 2");
     f->save();
     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
+    delete f;
 
     f = new FLAC::File(newname.c_str());
     tag = f->tag();
     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
+    delete f;
   }
 
   void testSaveMultipleValues()
@@ -209,6 +217,7 @@ public:
     CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), m["ARTIST"].size());
     CPPUNIT_ASSERT_EQUAL(String("artist 1"), m["ARTIST"][0]);
     CPPUNIT_ASSERT_EQUAL(String("artist 2"), m["ARTIST"][1]);
+    delete f;
   }
 
   void testDict()
@@ -230,13 +239,14 @@ public:
     CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["ARTIST"].size());
     CPPUNIT_ASSERT_EQUAL(String("artøst 1"), dict["ARTIST"][0]);
     CPPUNIT_ASSERT_EQUAL(String("artöst 2"), dict["ARTIST"][1]);
+    delete f;
   }
 
   void testInvalid()
   {
     ScopedFileCopy copy("silence-44-s", ".flac");
     PropertyMap map;
-    map["HÄÖ"] = String("bla");
+    map[L"H\x00c4\x00d6"] = String("bla");
     FLAC::File f(copy.fileName().c_str());
     PropertyMap invalid = f.setProperties(map);
     CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), invalid.size());

diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index fadcae2fcefe57de3ac2a3f9fcb5a9fbe22de98f..b85d4a71965c0fe96b0b1bf3ad29e1d8b2b3e6d6 100644 (file)
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -4,12 +4,9 @@
 
 #include <string>
 #include <stdio.h>
-// so evil :(
-#define protected public
 #include <id3v2tag.h>
 #include <mpegfile.h>
 #include <id3v2frame.h>
-#undef protected
 #include <uniquefileidentifierframe.h>
 #include <textidentificationframe.h>
 #include <attachedpictureframe.h>
@@ -101,13 +98,23 @@ public:
 
   void testDowngradeUTF8ForID3v23()
   {
-    ID3v2::TextIdentificationFrame f(ByteVector("TPE1"), String::UTF8);
+    ScopedFileCopy copy("xing", ".mp3");
+    string newname = copy.fileName();
+
+    ID3v2::TextIdentificationFrame *f
+      = new ID3v2::TextIdentificationFrame(ByteVector("TPE1"), String::UTF8);
     StringList sl;
     sl.append("Foo");
-    f.setText(sl);
-    f.header()->setVersion(3);
-    ByteVector data = f.render();
+    f->setText(sl);
+
+    MPEG::File file(newname.c_str());
+    file.ID3v2Tag(true)->addFrame(f);
+    file.save(MPEG::File::ID3v2, true, 3);
+    CPPUNIT_ASSERT_EQUAL(true, file.hasID3v2Tag());
+
+    ByteVector data = f->render();
     CPPUNIT_ASSERT_EQUAL((unsigned int)(4+4+2+1+6+2), data.size());
+
     ID3v2::TextIdentificationFrame f2(data);
     CPPUNIT_ASSERT_EQUAL(sl, f2.fieldList());
     CPPUNIT_ASSERT_EQUAL(String::UTF16, f2.textEncoding());
@@ -293,13 +300,16 @@ public:
     f->setRating(200);
     f->setCounter(3);
 
-    MPEG::File foo(newname.c_str());
-    foo.ID3v2Tag()->addFrame(f);
-    foo.save();
-
-    MPEG::File bar(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(String("email@example.com"), dynamic_cast<ID3v2::PopularimeterFrame *>(bar.ID3v2Tag()->frameList("POPM").front())->email());
-    CPPUNIT_ASSERT_EQUAL(200, dynamic_cast<ID3v2::PopularimeterFrame *>(bar.ID3v2Tag()->frameList("POPM").front())->rating());
+    {
+      MPEG::File foo(newname.c_str());
+      foo.ID3v2Tag()->addFrame(f);
+      foo.save();
+    }
+    {
+      MPEG::File bar(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(String("email@example.com"), dynamic_cast<ID3v2::PopularimeterFrame *>(bar.ID3v2Tag()->frameList("POPM").front())->email());
+      CPPUNIT_ASSERT_EQUAL(200, dynamic_cast<ID3v2::PopularimeterFrame *>(bar.ID3v2Tag()->frameList("POPM").front())->rating());
+    }
   }
 
   // http://bugs.kde.org/show_bug.cgi?id=150481
@@ -400,7 +410,7 @@ public:
                  "http://example.com", 33),  // URL
       f.render());
   }
-  
+
   void testParseOwnershipFrame()
   {
     ID3v2::OwnershipFrame f(
@@ -545,13 +555,17 @@ public:
     ScopedFileCopy copy("xing", ".mp3");
     string newname = copy.fileName();
     ID3v2::FrameFactory::instance()->setDefaultTextEncoding(String::UTF16);
-    MPEG::File foo(newname.c_str());
-    foo.strip();
-    foo.tag()->setComment("Test comment!");
-    foo.save();
-    MPEG::File bar(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(String("Test comment!"), bar.tag()->comment());
-    ID3v2::FrameFactory::instance()->setDefaultTextEncoding(defaultEncoding);
+    {
+      MPEG::File foo(newname.c_str());
+      foo.strip();
+      foo.tag()->setComment("Test comment!");
+      foo.save();
+    }
+    {
+      MPEG::File bar(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(String("Test comment!"), bar.tag()->comment());
+      ID3v2::FrameFactory::instance()->setDefaultTextEncoding(defaultEncoding);
+    }
   }
 
   void testUpdateGenre23_1()
@@ -632,57 +646,60 @@ public:
     string newname = copy.fileName();
 
     ID3v2::TextIdentificationFrame *tf;
-    MPEG::File foo(newname.c_str());
-    tf = new ID3v2::TextIdentificationFrame("TDOR", String::Latin1);
-    tf->setText("2011-03-16");
-    foo.ID3v2Tag()->addFrame(tf);
-    tf = new ID3v2::TextIdentificationFrame("TDRC", String::Latin1);
-    tf->setText("2012-04-17T12:01");
-    foo.ID3v2Tag()->addFrame(tf);
-    tf = new ID3v2::TextIdentificationFrame("TMCL", String::Latin1);
-    tf->setText(StringList().append("Guitar").append("Artist 1").append("Drums").append("Artist 2"));
-    foo.ID3v2Tag()->addFrame(tf);
-    tf = new ID3v2::TextIdentificationFrame("TIPL", String::Latin1);
-    tf->setText(StringList().append("Producer").append("Artist 3").append("Mastering").append("Artist 4"));
-    foo.ID3v2Tag()->addFrame(tf);
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TDRL", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TDTG", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TMOO", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TPRO", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOA", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOT", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSST", String::Latin1));
-    foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOP", String::Latin1));
-    foo.save(MPEG::File::AllTags, true, 3);
-
-    MPEG::File bar(newname.c_str());
-    tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDOR").front());
-    CPPUNIT_ASSERT(tf);
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
-    CPPUNIT_ASSERT_EQUAL(String("2011"), tf->fieldList().front());
-    tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDRC").front());
-    CPPUNIT_ASSERT(tf);
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
-    CPPUNIT_ASSERT_EQUAL(String("2012"), tf->fieldList().front());
-    tf = dynamic_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TIPL").front());
-    CPPUNIT_ASSERT(tf);
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(8), tf->fieldList().size());
-    CPPUNIT_ASSERT_EQUAL(String("Guitar"), tf->fieldList()[0]);
-    CPPUNIT_ASSERT_EQUAL(String("Artist 1"), tf->fieldList()[1]);
-    CPPUNIT_ASSERT_EQUAL(String("Drums"), tf->fieldList()[2]);
-    CPPUNIT_ASSERT_EQUAL(String("Artist 2"), tf->fieldList()[3]);
-    CPPUNIT_ASSERT_EQUAL(String("Producer"), tf->fieldList()[4]);
-    CPPUNIT_ASSERT_EQUAL(String("Artist 3"), tf->fieldList()[5]);
-    CPPUNIT_ASSERT_EQUAL(String("Mastering"), tf->fieldList()[6]);
-    CPPUNIT_ASSERT_EQUAL(String("Artist 4"), tf->fieldList()[7]);
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TDRL"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TDTG"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TMOO"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TPRO"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOA"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOT"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSST"));
-    CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOP"));
+    {
+      MPEG::File foo(newname.c_str());
+      tf = new ID3v2::TextIdentificationFrame("TDOR", String::Latin1);
+      tf->setText("2011-03-16");
+      foo.ID3v2Tag()->addFrame(tf);
+      tf = new ID3v2::TextIdentificationFrame("TDRC", String::Latin1);
+      tf->setText("2012-04-17T12:01");
+      foo.ID3v2Tag()->addFrame(tf);
+      tf = new ID3v2::TextIdentificationFrame("TMCL", String::Latin1);
+      tf->setText(StringList().append("Guitar").append("Artist 1").append("Drums").append("Artist 2"));
+      foo.ID3v2Tag()->addFrame(tf);
+      tf = new ID3v2::TextIdentificationFrame("TIPL", String::Latin1);
+      tf->setText(StringList().append("Producer").append("Artist 3").append("Mastering").append("Artist 4"));
+      foo.ID3v2Tag()->addFrame(tf);
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TDRL", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TDTG", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TMOO", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TPRO", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOA", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOT", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSST", String::Latin1));
+      foo.ID3v2Tag()->addFrame(new ID3v2::TextIdentificationFrame("TSOP", String::Latin1));
+      foo.save(MPEG::File::AllTags, true, 3);
+    }
+    {
+      MPEG::File bar(newname.c_str());
+      tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDOR").front());
+      CPPUNIT_ASSERT(tf);
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
+      CPPUNIT_ASSERT_EQUAL(String("2011"), tf->fieldList().front());
+      tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDRC").front());
+      CPPUNIT_ASSERT(tf);
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
+      CPPUNIT_ASSERT_EQUAL(String("2012"), tf->fieldList().front());
+      tf = dynamic_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TIPL").front());
+      CPPUNIT_ASSERT(tf);
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(8), tf->fieldList().size());
+      CPPUNIT_ASSERT_EQUAL(String("Guitar"), tf->fieldList()[0]);
+      CPPUNIT_ASSERT_EQUAL(String("Artist 1"), tf->fieldList()[1]);
+      CPPUNIT_ASSERT_EQUAL(String("Drums"), tf->fieldList()[2]);
+      CPPUNIT_ASSERT_EQUAL(String("Artist 2"), tf->fieldList()[3]);
+      CPPUNIT_ASSERT_EQUAL(String("Producer"), tf->fieldList()[4]);
+      CPPUNIT_ASSERT_EQUAL(String("Artist 3"), tf->fieldList()[5]);
+      CPPUNIT_ASSERT_EQUAL(String("Mastering"), tf->fieldList()[6]);
+      CPPUNIT_ASSERT_EQUAL(String("Artist 4"), tf->fieldList()[7]);
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TDRL"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TDTG"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TMOO"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TPRO"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOA"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOT"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSST"));
+      CPPUNIT_ASSERT(!bar.ID3v2Tag()->frameListMap().contains("TSOP"));
+    }
   }
 
   void testCompressedFrameWithBrokenLength()
@@ -692,7 +709,7 @@ public:
 
 #ifdef HAVE_ZLIB
 
-    ID3v2::AttachedPictureFrame *frame 
+    ID3v2::AttachedPictureFrame *frame
       = dynamic_cast<TagLib::ID3v2::AttachedPictureFrame*>(f.ID3v2Tag()->frameListMap()["APIC"].front());
     CPPUNIT_ASSERT(frame);
     CPPUNIT_ASSERT_EQUAL(String("image/bmp"), frame->mimeType());
@@ -705,13 +722,13 @@ public:
     // Skip the test if ZLIB is not installed.
     // The message "Compressed frames are currently not supported." will be displayed.
 
-    ID3v2::UnknownFrame *frame 
+    ID3v2::UnknownFrame *frame
       = dynamic_cast<TagLib::ID3v2::UnknownFrame*>(f.ID3v2Tag()->frameListMap()["APIC"].front());
     CPPUNIT_ASSERT(frame);
 
 #endif
   }
-  
+
   void testW000()
   {
     MPEG::File f(TEST_FILE_PATH_C("w000.mp3"), false);
@@ -823,36 +840,40 @@ public:
   {
     ScopedFileCopy copy("rare_frames", ".mp3");
     string newname = copy.fileName();
-    MPEG::File f(newname.c_str());
-    ID3v2::Tag *t = f.ID3v2Tag();
-    ID3v2::Frame *frame = t->frameList("TCON")[0];
-    CPPUNIT_ASSERT_EQUAL(1u, t->frameList("TCON").size());
-    t->removeFrame(frame, true);
-    f.save(MPEG::File::ID3v2);
-    
-    MPEG::File f2(newname.c_str());
-    t = f2.ID3v2Tag();
-    CPPUNIT_ASSERT(t->frameList("TCON").isEmpty());
-  }
-  
+
+    {
+      MPEG::File f(newname.c_str());
+      ID3v2::Tag *t = f.ID3v2Tag();
+      ID3v2::Frame *frame = t->frameList("TCON")[0];
+      CPPUNIT_ASSERT_EQUAL(1u, t->frameList("TCON").size());
+      t->removeFrame(frame, true);
+      f.save(MPEG::File::ID3v2);
+    }
+    {
+      MPEG::File f2(newname.c_str());
+      ID3v2::Tag *t = f2.ID3v2Tag();
+      CPPUNIT_ASSERT(t->frameList("TCON").isEmpty());
+    }
+  }
+
   void testSaveAndStripID3v1ShouldNotAddFrameFromID3v1ToId3v2()
   {
     ScopedFileCopy copy("xing", ".mp3");
     string newname = copy.fileName();
-    
+
     {
       MPEG::File foo(newname.c_str());
       foo.tag()->setArtist("Artist");
       foo.save(MPEG::File::ID3v1 | MPEG::File::ID3v2);
     }
-    
+
     {
       MPEG::File bar(newname.c_str());
       bar.ID3v2Tag()->removeFrames("TPE1");
       // Should strip ID3v1 here and not add old values to ID3v2 again
       bar.save(MPEG::File::ID3v2, true);
     }
-    
+
     MPEG::File f(newname.c_str());
     CPPUNIT_ASSERT(!f.ID3v2Tag()->frameListMap().contains("TPE1"));
   }

diff --git a/tests/test_mp4.cpp b/tests/test_mp4.cpp
index 56b60525aa1c9924bdaa33af2e529f9ba2bc038f..9b90eed3613d896fb1e12fd23f112aed9100194e 100644 (file)
--- a/tests/test_mp4.cpp
+++ b/tests/test_mp4.cpp
@@ -158,6 +158,7 @@ public:
 
     f->tag()->itemListMap()["pgap"] = true;
     f->save();
+    delete f;
 
     f = new MP4::File(filename.c_str());
     CPPUNIT_ASSERT_EQUAL(true, f->tag()->itemListMap()["cpil"].toBool());
@@ -167,6 +168,7 @@ public:
     moov = atoms->atoms[0];
     // original size + 'pgap' size + padding
     CPPUNIT_ASSERT_EQUAL(long(77 + 25 + 974), moov->length);
+    delete f;
   }
 
   void testGnre()
@@ -231,7 +233,7 @@ public:
   void testProperties()
   {
     MP4::File f(TEST_FILE_PATH_C("has-tags.m4a"));
-    
+
     PropertyMap tags = f.properties();
 
     CPPUNIT_ASSERT_EQUAL(StringList("Test Artist"), tags["ARTIST"]);

diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index ad6acc49069630adc0dec39554835afe530387a6..44925cac12bf380e5f82f2358bd673315b1476ba 100644 (file)
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -32,18 +32,21 @@ public:
     string newname = copy.fileName();
 
     String xxx = ByteVector(254, 'X');
-    MPEG::File f(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(false, f.hasID3v2Tag());
-
-    f.tag()->setTitle(xxx);
-    f.tag()->setArtist("Artist A");
-    f.save(MPEG::File::AllTags, true, 4);
-    CPPUNIT_ASSERT_EQUAL(true, f.hasID3v2Tag());
-
-    MPEG::File f2(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
-    CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
-    CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    {
+      MPEG::File f(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(false, f.hasID3v2Tag());
+
+      f.tag()->setTitle(xxx);
+      f.tag()->setArtist("Artist A");
+      f.save(MPEG::File::AllTags, true, 4);
+      CPPUNIT_ASSERT_EQUAL(true, f.hasID3v2Tag());
+    }
+    {
+      MPEG::File f2(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
+      CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
+      CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    }
   }
 
   void testSaveID3v24WrongParam()
@@ -52,15 +55,18 @@ public:
     string newname = copy.fileName();
 
     String xxx = ByteVector(254, 'X');
-    MPEG::File f(newname.c_str());
-    f.tag()->setTitle(xxx);
-    f.tag()->setArtist("Artist A");
-    f.save(MPEG::File::AllTags, true, 8);
-
-    MPEG::File f2(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
-    CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
-    CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    {
+      MPEG::File f(newname.c_str());
+      f.tag()->setTitle(xxx);
+      f.tag()->setArtist("Artist A");
+      f.save(MPEG::File::AllTags, true, 8);
+    }
+    {
+      MPEG::File f2(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
+      CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
+      CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    }
   }
 
   void testSaveID3v23()
@@ -69,18 +75,21 @@ public:
     string newname = copy.fileName();
 
     String xxx = ByteVector(254, 'X');
-    MPEG::File f(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(false, f.hasID3v2Tag());
-
-    f.tag()->setTitle(xxx);
-    f.tag()->setArtist("Artist A");
-    f.save(MPEG::File::AllTags, true, 3);
-    CPPUNIT_ASSERT_EQUAL(true, f.hasID3v2Tag());
-
-    MPEG::File f2(newname.c_str());
-    CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f2.ID3v2Tag()->header()->majorVersion());
-    CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
-    CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    {
+      MPEG::File f(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(false, f.hasID3v2Tag());
+
+      f.tag()->setTitle(xxx);
+      f.tag()->setArtist("Artist A");
+      f.save(MPEG::File::AllTags, true, 3);
+      CPPUNIT_ASSERT_EQUAL(true, f.hasID3v2Tag());
+    }
+    {
+      MPEG::File f2(newname.c_str());
+      CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f2.ID3v2Tag()->header()->majorVersion());
+      CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
+      CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
+    }
   }
 
 };

diff --git a/tests/test_propertymap.cpp b/tests/test_propertymap.cpp
index d0b2fbb7a69c2b2a544768d6b631c2588b4a1cf6..0ca7b72315556f551ede9375c639c579e22b62de 100644 (file)
--- a/tests/test_propertymap.cpp
+++ b/tests/test_propertymap.cpp
@@ -11,11 +11,11 @@ public:
   {
     TagLib::PropertyMap map1;
     CPPUNIT_ASSERT(map1.isEmpty());
-    map1["ÄÖÜ"].append("test");
+    map1[L"\x00c4\x00d6\x00dc"].append("test");
     CPPUNIT_ASSERT_EQUAL(map1.size(), 1u);
 
     TagLib::PropertyMap map2;
-    map2["ÄÖÜ"].append("test");
+    map2[L"\x00c4\x00d6\x00dc"].append("test");
     CPPUNIT_ASSERT(map1 == map2);
     CPPUNIT_ASSERT(map1.contains(map2));
 
@@ -23,7 +23,7 @@ public:
     CPPUNIT_ASSERT(map1 != map2);
     CPPUNIT_ASSERT(map2.contains(map1));
 
-    map2["ÄÖÜ"].append("test 2");
+    map2[L"\x00c4\x00d6\x00dc"].append("test 2");
     CPPUNIT_ASSERT(!map2.contains(map1));
 
   }

diff --git a/tests/test_string.cpp b/tests/test_string.cpp
index 1a20ed6f2033e255bf8aed0042c37013541efb30..40a21576692c30fe24dec45debcdd4cf7fc17947 100644 (file)
--- a/tests/test_string.cpp
+++ b/tests/test_string.cpp
@@ -82,7 +82,7 @@ public:
     String unicode5(L"\u65e5\u672c\u8a9e", String::UTF16LE);
     CPPUNIT_ASSERT(unicode5[1] == L'\u2c67');
 
-    wstring stduni = L"\u65e5\u672c\u8a9e";
+    std::wstring stduni = L"\u65e5\u672c\u8a9e";
 
     String unicode6(stduni, String::UTF16BE);
     CPPUNIT_ASSERT(unicode6[1] == L'\u672c');