diff options
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qmltest/selftests/tst_stringify.qml | 47 |
2 files changed, 50 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index f1558a6837..3f91ce85a8 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -496,7 +496,9 @@ void QuickTestResult::stringify(QQmlV4Function *args) } else { result = QLatin1String("Object"); } - } else { + } + + if (result.isEmpty()) { QString tmp = value->toQStringNoThrow(); if (value->asArrayObject()) result.append(QString::fromLatin1("[%1]").arg(tmp)); diff --git a/tests/auto/qmltest/selftests/tst_stringify.qml b/tests/auto/qmltest/selftests/tst_stringify.qml new file mode 100644 index 0000000000..920f59eec2 --- /dev/null +++ b/tests/auto/qmltest/selftests/tst_stringify.qml @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** 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. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** 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 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 +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.1 + +TestCase { + name: "SelfTests_stringify" + + function test_stringify_rect() { + var rect = Qt.rect(0, 1, 2, 3) + var stringifiedRect = qtest_results.stringify(rect) + verify(stringifiedRect.length > 0) + compare(stringifiedRect, rect.toString()) + } +} + |