Added UTF16-BE and UTF16-LE support

Change-Id: I4322a4b89ef9e8003c3b1951034aee8db64b5ffd
Reviewed-by: Andrew Christian <andrew.christian@nokia.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/tests/auto/jsonstream/testClient/main.cpp b/tests/auto/jsonstream/testClient/main.cpp
index a01fa35..79e9057 100644
--- a/tests/auto/jsonstream/testClient/main.cpp
+++ b/tests/auto/jsonstream/testClient/main.cpp
@@ -83,6 +83,10 @@ Container::Container()
         mClient->setFormat(FormatBSON);
     else if (gFormat == "utf" || gFormat == "utf8")
         mClient->setFormat(FormatUTF8);
+    else if (gFormat == "utf16be")
+        mClient->setFormat(FormatUTF16BE);
+    else if (gFormat == "utf16le")
+        mClient->setFormat(FormatUTF16LE);
 
     if (!mClient->connectLocal(gSocketname)) {
         qWarning() << "Unable to connect to" << gSocketname;
diff --git a/tests/auto/jsonstream/tst_jsonstream.cpp b/tests/auto/jsonstream/tst_jsonstream.cpp
index 39b20ff..14f3b08 100644
--- a/tests/auto/jsonstream/tst_jsonstream.cpp
+++ b/tests/auto/jsonstream/tst_jsonstream.cpp
@@ -367,7 +367,7 @@ void tst_JsonStream::formatTest()
 {
     QString socketname = "/tmp/tst_socket";
 
-    QStringList formats = QStringList() << "qbjs" << "bson" << "utf8";
+    QStringList formats = QStringList() << "qbjs" << "bson" << "utf8" << "utf16be" << "utf16le";
 
     foreach (const QString& format, formats) {
         BasicServer server(socketname);
@@ -392,6 +392,10 @@ void tst_JsonStream::formatTest()
             QVERIFY(server.format() == FormatBSON);
         else if (format == "utf8")
             QVERIFY(server.format() == FormatUTF8);
+        else if (format == "utf16be")
+            QVERIFY(server.format() == FormatUTF16BE);
+        else if (format == "utf16le")
+            QVERIFY(server.format() == FormatUTF16LE);
         else
             QFAIL("Unrecognized format");
 
@@ -533,7 +537,7 @@ void tst_JsonStream::pipeTest()
 
 void tst_JsonStream::pipeFormatTest()
 {
-    QList<EncodingFormat> formats = QList<EncodingFormat>() << FormatUTF8 << FormatBSON << FormatQBJS;
+    QList<EncodingFormat> formats = QList<EncodingFormat>() << FormatUTF8 << FormatBSON << FormatQBJS << FormatUTF16BE << FormatUTF16LE;
 
     foreach (EncodingFormat format, formats) {
         Pipes pipes;