Fix tests when compiled with clang on Linux

diff --git a/tests/test_apetag.cpp b/tests/test_apetag.cpp
index 0c63f0b6f26f3fe055dd00f2b342fde32856c3c3..c93b2a7ebe1a9ce6d32dff5bb8235ca4601ab8a4 100644 (file)
--- a/tests/test_apetag.cpp
+++ b/tests/test_apetag.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -7,6 +6,7 @@
 #include <tpropertymap.h>
 #include <apetag.h>
 #include <tdebug.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_asf.cpp b/tests/test_asf.cpp
index 51981342b549b1fb5f865163397c0457f03a6b71..0cd1f3d705d53e7672f71cf12a4eaf2ead4f1eff 100644 (file)
--- a/tests/test_asf.cpp
+++ b/tests/test_asf.cpp
@@ -1,10 +1,10 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <tstringlist.h>
 #include <tbytevectorlist.h>
 #include <asffile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
index 2ac78b34c188c7658645394f2a5c4bee4f119f36..dd433456c57e6eb0d4575576793f5aec73400fe6 100644 (file)
--- 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 <cppunit/extensions/HelperMacros.h>
 #include <tbytevector.h>
 #include <tbytevectorlist.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_bytevectorlist.cpp b/tests/test_bytevectorlist.cpp
index f090fcdcbe18076680b248ee566f9f6be5990ad6..7e4a9fd73b44355c20d49ca31c8411018c952cbf 100644 (file)
--- a/tests/test_bytevectorlist.cpp
+++ b/tests/test_bytevectorlist.cpp
@@ -1,6 +1,6 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <tbytevector.h>
 #include <tbytevectorlist.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_bytevectorstream.cpp b/tests/test_bytevectorstream.cpp
index b5114679844e67875481f48ff13363c0a9af33ce..b0fec90b15d51fa1bdcdd0a66d8a0d55c9cd99d3 100644 (file)
--- a/tests/test_bytevectorstream.cpp
+++ b/tests/test_bytevectorstream.cpp
@@ -1,5 +1,5 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <tbytevectorstream.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index d0c8a3a507847c7aeefe4220b9bd86bd6d3cd322..5500ae7fec297e9f07bbd490715dc8826bb79ef6 100644 (file)
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -1,10 +1,10 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <fileref.h>
 #include <oggflacfile.h>
 #include <vorbisfile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
index 992a02b87e7e2f114303f5fdb539648080b6df4a..3d31f33cb404f34b59630501e663be2b43d45e14 100644 (file)
--- a/tests/test_flac.cpp
+++ b/tests/test_flac.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -7,6 +6,7 @@
 #include <tpropertymap.h>
 #include <flacfile.h>
 #include <xiphcomment.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_flacpicture.cpp b/tests/test_flacpicture.cpp
index 5ed13951b0b71c8f2692ad9377a7fd1d955bdb67..0ba9452fb171e7b1711bac40ebd70555ab963307 100644 (file)
--- a/tests/test_flacpicture.cpp
+++ b/tests/test_flacpicture.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -6,6 +5,7 @@
 #include <tbytevectorlist.h>
 #include <flacfile.h>
 #include <flacmetadatablock.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_flacunknownmetadatablock.cpp b/tests/test_flacunknownmetadatablock.cpp
index 2a99a1eec5eba433c4e9637bf4563363a1f8217c..881078ddd242e421c31c20673e740796160b54a3 100644 (file)
--- a/tests/test_flacunknownmetadatablock.cpp
+++ b/tests/test_flacunknownmetadatablock.cpp
@@ -1,10 +1,10 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <tstringlist.h>
 #include <tbytevectorlist.h>
 #include <flacunknownmetadatablock.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_id3v1.cpp b/tests/test_id3v1.cpp
index 308225c2f8493469c1a251725d58d7d1296b625d..1d0a4974ad25bb7b1793a1cd4df09ac4afe90c24 100644 (file)
--- a/tests/test_id3v1.cpp
+++ b/tests/test_id3v1.cpp
@@ -1,7 +1,7 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <id3v1tag.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index d3fbfee956d05368af84a8740c21f7f59483b5d6..99f77101cf3354dd1b0c5b7369ea61462b1d78e2 100644 (file)
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 // so evil :(
@@ -18,6 +17,7 @@
 #include <ownershipframe.h>
 #include <tdebug.h>
 #include <tpropertymap.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_it.cpp b/tests/test_it.cpp
index 53d8ea0eb86c1b2383b68f9b54a78376ccd43e67..be5680ec448df3ff9f578e5e182297e39e2f7bcb 100644 (file)
--- a/tests/test_it.cpp
+++ b/tests/test_it.cpp
@@ -19,9 +19,9 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include <cppunit/extensions/HelperMacros.h>
 #include <itfile.h>
 #include <tstringlist.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_mod.cpp b/tests/test_mod.cpp
index 05657c1318bc8f80cfee8f45bae5be1230758388..0a233c97e27e7cf4a4c7f0ac5a68f2114df9d8b5 100644 (file)
--- a/tests/test_mod.cpp
+++ b/tests/test_mod.cpp
@@ -19,9 +19,9 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include <cppunit/extensions/HelperMacros.h>
 #include <modfile.h>
 #include <tpropertymap.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_mp4.cpp b/tests/test_mp4.cpp
index 14a4df8e81a8fd43e169c816725cc092ae089647..d6830a61252cedf5798ba15f989136a05ab1cf27 100644 (file)
--- a/tests/test_mp4.cpp
+++ b/tests/test_mp4.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -6,6 +5,7 @@
 #include <tbytevectorlist.h>
 #include <mp4atom.h>
 #include <mp4file.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_mp4coverart.cpp b/tests/test_mp4coverart.cpp
index 75c6ad038093a0f1f44b2d29a7242148ff1d5113..812a2e5dfd0c470ba22e37ec83d7f61e3e3b22ab 100644 (file)
--- a/tests/test_mp4coverart.cpp
+++ b/tests/test_mp4coverart.cpp
@@ -1,8 +1,8 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <mp4coverart.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_mp4item.cpp b/tests/test_mp4item.cpp
index 68ba0c8d94067d893b79b444a0621f1bf2b74965..37d3f7191b19901ba5cebb1fb0463bfe7c77d406 100644 (file)
--- a/tests/test_mp4item.cpp
+++ b/tests/test_mp4item.cpp
@@ -1,9 +1,9 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <mp4coverart.h>
 #include <mp4item.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_mpeg.cpp b/tests/test_mpeg.cpp
index 18724728ade5de09da6a375450173337640e954e..ad6acc49069630adc0dec39554835afe530387a6 100644 (file)
--- a/tests/test_mpeg.cpp
+++ b/tests/test_mpeg.cpp
@@ -1,8 +1,9 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
+#include <tstring.h>
 #include <mpegfile.h>
 #include <id3v2tag.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_ogg.cpp b/tests/test_ogg.cpp
index fb7a262adddd5b0e0c50629c33962aa222d3d5eb..c89586aa327af2a59f1c3d1cc2c1ad063f640014 100644 (file)
--- a/tests/test_ogg.cpp
+++ b/tests/test_ogg.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -8,6 +7,7 @@
 #include <oggfile.h>
 #include <vorbisfile.h>
 #include <oggpageheader.h>
+#include <cppunit/extensions/HelperMacros.h>
 #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 c1837175362cad2c966f2e8aea134dfbaa499f29..1cdb24b035f874ad95f7db6275337dcdc99c5c62 100644 (file)
--- a/tests/test_oggflac.cpp
+++ b/tests/test_oggflac.cpp
@@ -1,4 +1,3 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
@@ -6,6 +5,7 @@
 #include <tbytevectorlist.h>
 #include <oggfile.h>
 #include <oggflacfile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_opus.cpp b/tests/test_opus.cpp
index 35ee3b3d286b2cd3166f7b221d833abe4bf9d10d..769d3985dc01367ea07eecc4ff726a74ac6962b6 100644 (file)
--- a/tests/test_opus.cpp
+++ b/tests/test_opus.cpp
@@ -1,9 +1,9 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <tbytevectorlist.h>
 #include <opusfile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_riff.cpp b/tests/test_riff.cpp
index 43b2f8bbe299af5900a9be5458d1a9f4c8832d4d..8e120d064eef586b5e4587f5ca318d7dc0d6317b 100644 (file)
--- a/tests/test_riff.cpp
+++ b/tests/test_riff.cpp
@@ -1,9 +1,9 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <tag.h>
 #include <tbytevectorlist.h>
 #include <rifffile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_s3m.cpp b/tests/test_s3m.cpp
index a6ecc084c8a55445aa99efa0a2569b2ec5840531..24a4c6e416c84e8b3579b4b30339d505f51f0523 100644 (file)
--- a/tests/test_s3m.cpp
+++ b/tests/test_s3m.cpp
@@ -19,8 +19,8 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include <cppunit/extensions/HelperMacros.h>
 #include <s3mfile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_string.cpp b/tests/test_string.cpp
index 79b32c3ad85ec0381544747047c22c9d685dd5c0..1e37d7a2fdc71bf334e6a8c76707d1bc717ee0f7 100644 (file)
--- 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 <cppunit/extensions/HelperMacros.h>
 #include <tstring.h>
 #include <string.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_synchdata.cpp b/tests/test_synchdata.cpp
index 1113ee430817c72dc03a661d3ae2d359588cd468..2e3021eaaade3a99b862398b91dec306b554cf4b 100644 (file)
--- 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 <cppunit/extensions/HelperMacros.h>
 #include <id3v2synchdata.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/test_xiphcomment.cpp b/tests/test_xiphcomment.cpp
index a98aea6169b8056a6972c5bbb6a2d6664e6a5bbe..6526229bef5dcfee27e8b8ff0766eae2f225c255 100644 (file)
--- a/tests/test_xiphcomment.cpp
+++ b/tests/test_xiphcomment.cpp
@@ -1,9 +1,9 @@
-#include <cppunit/extensions/HelperMacros.h>
 #include <string>
 #include <stdio.h>
 #include <xiphcomment.h>
 #include <tpropertymap.h>
 #include <tdebug.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;

diff --git a/tests/test_xm.cpp b/tests/test_xm.cpp
index 70b3967ee7329b426be680bd523ab926d4746228..280865334c123d8f0bc59ccdec6c98769a6f843f 100644 (file)
--- a/tests/test_xm.cpp
+++ b/tests/test_xm.cpp
@@ -19,8 +19,8 @@
  *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-#include <cppunit/extensions/HelperMacros.h>
 #include <xmfile.h>
+#include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
 
 using namespace std;