1 files changed, 36 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 18739cb4e1..410b34e894 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -2000,6 +2000,9 @@ void tst_QByteArray::toUpperLower_data()
     QTest::addColumn<QByteArray>("lower");
 
     QTest::newRow("empty") << QByteArray() << QByteArray() << QByteArray();
+    QTest::newRow("literal") << QByteArrayLiteral("Hello World")
+                             << QByteArrayLiteral("HELLO WORLD")
+                             << QByteArrayLiteral("hello world");
     QTest::newRow("ascii") << QByteArray("Hello World, this is a STRING")
                            << QByteArray("HELLO WORLD, THIS IS A STRING")
                            << QByteArray("hello world, this is a string");
@@ -2014,8 +2017,34 @@ void tst_QByteArray::toUpperLower()
     QFETCH(QByteArray, input);
     QFETCH(QByteArray, upper);
     QFETCH(QByteArray, lower);
+    QCOMPARE(lower.toLower(), lower);
+    QCOMPARE(upper.toUpper(), upper);
     QCOMPARE(input.toUpper(), upper);
     QCOMPARE(input.toLower(), lower);
+
+    QByteArray copy = input;
+    QCOMPARE(qMove(copy).toUpper(), upper);
+    copy = input;
+    copy.detach();
+    QCOMPARE(qMove(copy).toUpper(), upper);
+
+    copy = input;
+    QCOMPARE(qMove(copy).toLower(), lower);
+    copy = input;
+    copy.detach();
+    QCOMPARE(qMove(copy).toLower(), lower);
+
+    copy = lower;
+    QCOMPARE(qMove(copy).toLower(), lower);
+    copy = lower;
+    copy.detach();
+    QCOMPARE(qMove(copy).toLower(), lower);
+
+    copy = upper;
+    QCOMPARE(qMove(copy).toUpper(), upper);
+    copy = upper;
+    copy.detach();
+    QCOMPARE(qMove(copy).toUpper(), upper);
 }
 
 void tst_QByteArray::macTypes()