From 9e788bb8c2a195a7bbb300321dd4d721c58eb74d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sun, 11 Nov 2012 14:26:10 +0100 Subject: [PATCH] Fix tests when compiled with clang on Linux --- tests/test_apetag.cpp | 2 +- tests/test_asf.cpp | 2 +- tests/test_bytevector.cpp | 2 +- tests/test_bytevectorlist.cpp | 2 +- tests/test_bytevectorstream.cpp | 2 +- tests/test_fileref.cpp | 2 +- tests/test_flac.cpp | 2 +- tests/test_flacpicture.cpp | 2 +- tests/test_flacunknownmetadatablock.cpp | 2 +- tests/test_id3v1.cpp | 2 +- tests/test_id3v2.cpp | 2 +- tests/test_it.cpp | 2 +- tests/test_mod.cpp | 2 +- tests/test_mp4.cpp | 2 +- tests/test_mp4coverart.cpp | 2 +- tests/test_mp4item.cpp | 2 +- tests/test_mpeg.cpp | 3 ++- tests/test_ogg.cpp | 8 ++++---- tests/test_oggflac.cpp | 2 +- tests/test_opus.cpp | 2 +- tests/test_riff.cpp | 2 +- tests/test_s3m.cpp | 2 +- tests/test_string.cpp | 2 +- tests/test_synchdata.cpp | 2 +- tests/test_xiphcomment.cpp | 2 +- tests/test_xm.cpp | 2 +- 26 files changed, 30 insertions(+), 29 deletions(-) diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp index 0c63f0b6..c93b2a7e 100644 --- a/tests/test_apetag.cpp +++ b/tests/test_apetag.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -7,6 +6,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_asf.cpp b/tests/test_asf.cpp index 51981342..0cd1f3d7 100644 --- a/tests/test_asf.cpp +++ b/tests/test_asf.cpp @@ -1,10 +1,10 @@ -#include #include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp index 2ac78b34..dd433456 100644 --- a/tests/test_bytevector.cpp +++ b/tests/test_bytevector.cpp @@ -22,9 +22,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_bytevectorlist.cpp b/tests/test_bytevectorlist.cpp index f090fcdc..7e4a9fd7 100644 --- a/tests/test_bytevectorlist.cpp +++ b/tests/test_bytevectorlist.cpp @@ -1,6 +1,6 @@ -#include #include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_bytevectorstream.cpp b/tests/test_bytevectorstream.cpp index b5114679..b0fec90b 100644 --- a/tests/test_bytevectorstream.cpp +++ b/tests/test_bytevectorstream.cpp @@ -1,5 +1,5 @@ -#include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp index d0c8a3a5..5500ae7f 100644 --- a/tests/test_fileref.cpp +++ b/tests/test_fileref.cpp @@ -1,10 +1,10 @@ -#include #include #include #include #include #include #include +#include #include "utils.h" #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp index 992a02b8..3d31f33c 100644 --- a/tests/test_flac.cpp +++ b/tests/test_flac.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -7,6 +6,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_flacpicture.cpp b/tests/test_flacpicture.cpp index 5ed13951..0ba9452f 100644 --- a/tests/test_flacpicture.cpp +++ b/tests/test_flacpicture.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,6 +5,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_flacunknownmetadatablock.cpp b/tests/test_flacunknownmetadatablock.cpp index 2a99a1ee..881078dd 100644 --- a/tests/test_flacunknownmetadatablock.cpp +++ b/tests/test_flacunknownmetadatablock.cpp @@ -1,10 +1,10 @@ -#include #include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_id3v1.cpp b/tests/test_id3v1.cpp index 308225c2..1d0a4974 100644 --- a/tests/test_id3v1.cpp +++ b/tests/test_id3v1.cpp @@ -1,7 +1,7 @@ -#include #include #include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp index d3fbfee9..99f77101 100644 --- a/tests/test_id3v2.cpp +++ b/tests/test_id3v2.cpp @@ -1,4 +1,3 @@ -#include #include #include // so evil :( @@ -18,6 +17,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_it.cpp b/tests/test_it.cpp index 53d8ea0e..be5680ec 100644 --- a/tests/test_it.cpp +++ b/tests/test_it.cpp @@ -19,9 +19,9 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_mod.cpp b/tests/test_mod.cpp index 05657c13..0a233c97 100644 --- a/tests/test_mod.cpp +++ b/tests/test_mod.cpp @@ -19,9 +19,9 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_mp4.cpp b/tests/test_mp4.cpp index 14a4df8e..d6830a61 100644 --- a/tests/test_mp4.cpp +++ b/tests/test_mp4.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,6 +5,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_mp4coverart.cpp b/tests/test_mp4coverart.cpp index 75c6ad03..812a2e5d 100644 --- a/tests/test_mp4coverart.cpp +++ b/tests/test_mp4coverart.cpp @@ -1,8 +1,8 @@ -#include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_mp4item.cpp b/tests/test_mp4item.cpp index 68ba0c8d..37d3f719 100644 --- a/tests/test_mp4item.cpp +++ b/tests/test_mp4item.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp index 18724728..ad6acc49 100644 --- a/tests/test_mpeg.cpp +++ b/tests/test_mpeg.cpp @@ -1,8 +1,9 @@ -#include #include #include +#include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_ogg.cpp b/tests/test_ogg.cpp index fb7a262a..c89586aa 100644 --- a/tests/test_ogg.cpp +++ b/tests/test_ogg.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -8,6 +7,7 @@ #include #include #include +#include #include "utils.h" using namespace std; @@ -88,12 +88,12 @@ public: CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), tags["UNUSUALTAG"].size()); CPPUNIT_ASSERT_EQUAL(String("usual value"), tags["UNUSUALTAG"][0]); CPPUNIT_ASSERT_EQUAL(String("another value"), tags["UNUSUALTAG"][1]); - CPPUNIT_ASSERT_EQUAL(String(L"öäüoΣø"), tags["UNICODETAG"][0]); + CPPUNIT_ASSERT_EQUAL(String("öäüoΣø", String::UTF8), tags["UNICODETAG"][0]); - tags["UNICODETAG"][0] = L"νεω ναλυε"; + tags["UNICODETAG"][0] = String("νεω ναλυε", String::UTF8); tags.erase("UNUSUALTAG"); f->tag()->setProperties(tags); - CPPUNIT_ASSERT_EQUAL(String(L"νεω ναλυε"), f->tag()->properties()["UNICODETAG"][0]); + CPPUNIT_ASSERT_EQUAL(String("νεω ναλυε", String::UTF8), f->tag()->properties()["UNICODETAG"][0]); CPPUNIT_ASSERT_EQUAL(false, f->tag()->properties().contains("UNUSUALTAG")); delete f; diff --git a/tests/test_oggflac.cpp b/tests/test_oggflac.cpp index c1837175..1cdb24b0 100644 --- a/tests/test_oggflac.cpp +++ b/tests/test_oggflac.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -6,6 +5,7 @@ #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_opus.cpp b/tests/test_opus.cpp index 35ee3b3d..769d3985 100644 --- a/tests/test_opus.cpp +++ b/tests/test_opus.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_riff.cpp b/tests/test_riff.cpp index 43b2f8bb..8e120d06 100644 --- a/tests/test_riff.cpp +++ b/tests/test_riff.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_s3m.cpp b/tests/test_s3m.cpp index a6ecc084..24a4c6e4 100644 --- a/tests/test_s3m.cpp +++ b/tests/test_s3m.cpp @@ -19,8 +19,8 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_string.cpp b/tests/test_string.cpp index 79b32c3a..1e37d7a2 100644 --- a/tests/test_string.cpp +++ b/tests/test_string.cpp @@ -22,9 +22,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_synchdata.cpp b/tests/test_synchdata.cpp index 1113ee43..2e3021ea 100644 --- a/tests/test_synchdata.cpp +++ b/tests/test_synchdata.cpp @@ -22,8 +22,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include using namespace std; using namespace TagLib; diff --git a/tests/test_xiphcomment.cpp b/tests/test_xiphcomment.cpp index a98aea61..6526229b 100644 --- a/tests/test_xiphcomment.cpp +++ b/tests/test_xiphcomment.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include "utils.h" using namespace std; diff --git a/tests/test_xm.cpp b/tests/test_xm.cpp index 70b3967e..28086533 100644 --- a/tests/test_xm.cpp +++ b/tests/test_xm.cpp @@ -19,8 +19,8 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include #include +#include #include "utils.h" using namespace std;