--- a/Resources/EncodingTests.h	Tue Aug 05 08:49:25 2014 +0200
+++ b/Resources/EncodingTests.h	Tue Aug 05 12:04:23 2014 +0200
@@ -1,40 +1,49 @@
-static const unsigned int testEncodingsCount = 11;
-static const Orthanc::Encoding testEncodings[] = {
-  Orthanc::Encoding_Latin5,
-  Orthanc::Encoding_Hebrew,
-  Orthanc::Encoding_Greek,
-  Orthanc::Encoding_Arabic,
-  Orthanc::Encoding_Cyrillic,
-  Orthanc::Encoding_Latin4,
-  Orthanc::Encoding_Latin3,
-  Orthanc::Encoding_Latin2,
-  Orthanc::Encoding_Latin1,
-  Orthanc::Encoding_Utf8,
-  Orthanc::Encoding_Ascii
+static const unsigned int testEncodingsCount = 14;
+static const ::Orthanc::Encoding testEncodings[] = {
+  ::Orthanc::Encoding_Latin5,
+  ::Orthanc::Encoding_Hebrew,
+  ::Orthanc::Encoding_Greek,
+  ::Orthanc::Encoding_Arabic,
+  ::Orthanc::Encoding_Cyrillic,
+  ::Orthanc::Encoding_Latin4,
+  ::Orthanc::Encoding_Latin3,
+  ::Orthanc::Encoding_Latin2,
+  ::Orthanc::Encoding_Latin1,
+  ::Orthanc::Encoding_Utf8,
+  ::Orthanc::Encoding_Thai,
+  ::Orthanc::Encoding_Japanese,
+  ::Orthanc::Encoding_Ascii,
+  ::Orthanc::Encoding_Chinese
 };
-static const char *testEncodingsEncoded[11] = {
-  "\xe9\xe4\xf6\xf2\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\xe3\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\xc8\x3f\x3f\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\xd5\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\xb4\x3f\x3f\x3f\x3f\x3f\xfb",
-  "\xe9\xe4\xf6\x3f\x3f\x3f\x3f\x3f\x3f\xf3\x3f",
-  "\xe9\xe4\xf6\xf2\x3f\x3f\xf8\x3f\x3f\x3f\x3f",
-  "\xe9\xe4\xf6\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\xe9\xe4\xf6\xf2\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xd0\x94\xce\x98\xc4\x9d\xd7\x93\xd8\xb5\xc4\xb7\xd1\x9b",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f"
+static const char *testEncodingsEncoded[14] = {
+  "\xe9\xe4\xf6\xf2\xdd",
+  "\xe3",
+  "\xc8",
+  "\xd5",
+  "\xb4\xfb",
+  "\xe9\xe4\xf6\xf3",
+  "\xe9\xe4\xf6\xf2\xf8\xa9",
+  "\xe9\xe4\xf6",
+  "\xe9\xe4\xf6\xf2",
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xd0\x94\xce\x98\xc4\x9d\xd7\x93\xd8\xb5\xc4\xb7\xd1\x9b\xe0\xb9\x9b\xef\xbe\x88\xc4\xb0",
+  "\xfb",
+  "\x84\x44\x83\xa6\xc8",
+  "",
+  "\x81\x30\x89\x37\x81\x30\x89\x38\xA8\xA4\xA8\xA2\x81\x30\x89\x39\x81\x30\x8A\x30"
 };
-static const char *testEncodingsExpected[11] = {
-  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\xd7\x93\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\xce\x98\x3f\x3f\x3f\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\xd8\xb5\x3f\x3f",
-  "\x3f\x3f\x3f\x3f\xd0\x94\x3f\x3f\x3f\x3f\x3f\xd1\x9b",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\x3f\x3f\x3f\x3f\x3f\x3f\xc4\xb7\x3f",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\x3f\x3f\xc4\x9d\x3f\x3f\x3f\x3f",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\x3f\x3f\x3f\x3f\x3f\x3f\x3f",
-  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xd0\x94\xce\x98\xc4\x9d\xd7\x93\xd8\xb5\xc4\xb7\xd1\x9b",
-  "\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f\x3f"
+static const char *testEncodingsExpected[14] = {
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xc4\xb0",
+  "\xd7\x93",
+  "\xce\x98",
+  "\xd8\xb5",
+  "\xd0\x94\xd1\x9b",
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc4\xb7",
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xc4\x9d\xc4\xb0",
+  "\xc3\xa9\xc3\xa4\xc3\xb6",
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2",
+  "\xc3\xa9\xc3\xa4\xc3\xb6\xc3\xb2\xd0\x94\xce\x98\xc4\x9d\xd7\x93\xd8\xb5\xc4\xb7\xd1\x9b\xe0\xb9\x9b\xef\xbe\x88\xc4\xb0",
+  "\xe0\xb9\x9b",
+  "\xd0\x94\xce\x98\xef\xbe\x88",
+  "",
+  "\xc3\x9e\xc3\x9f\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3"
 };