diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:20:47 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:21:06 +0100 |
commit | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (patch) | |
tree | 16e17d4c52d35f7e55fc2103db5c96850e9bdfff /tests/auto/qmltest/statemachine | |
parent | ce093497f2d4164fa8abc06cf976f9e36798e11e (diff) | |
parent | b60a5dc9405ce89d7a742abc81b906d5c8cf5f7d (diff) | |
download | qtdeclarative-f286db98ee41a8aa71b9a65a235b6d3e265d79f4.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
Diffstat (limited to 'tests/auto/qmltest/statemachine')
-rw-r--r-- | tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml | 79 | ||||
-rw-r--r-- | tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml | 80 |
2 files changed, 159 insertions, 0 deletions
diff --git a/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml b/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml new file mode 100644 index 0000000000..5d2e867da4 --- /dev/null +++ b/tests/auto/qmltest/statemachine/tst_triggeredArguments1.qml @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Ford Motor Company +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite module 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 QtTest 1.1 +import QtQml.StateMachine 1.0 + +TestCase { + id: testCase + + property string mystr + property bool mybool + property int myint + + StateMachine { + id: machine + initialState: startState + running: true + State { + id: startState + SignalTransition { + id: signalTrans + signal: testCase.mysignal + onTriggered: { + testCase.mystr = mystr + testCase.mybool = mybool + testCase.myint = myint + } + targetState: finalState + } + } + FinalState { + id: finalState + } + } + + signal mysignal(string mystr, bool mybool, int myint) + + name: "testTriggeredArguments1" + function test_triggeredArguments() + { + tryCompare(startState, "active", true) + + // Emit the signalTrans.signal + testCase.mysignal("test1", true, 2) + compare(testCase.mystr, "test1") + compare(testCase.mybool, true) + compare(testCase.myint, 2) + } +} diff --git a/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml b/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml new file mode 100644 index 0000000000..f60f2ff78c --- /dev/null +++ b/tests/auto/qmltest/statemachine/tst_triggeredArguments2.qml @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Ford Motor Company +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite module 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 QtTest 1.1 +import QtQml.StateMachine 1.0 + +TestCase { + id: testCase + + property string mystr + property bool mybool + property int myint + + StateMachine { + id: machine + initialState: startState + running: true + State { + id: startState + SignalTransition { + id: signalTrans + signal: testCase.mysignal + onTriggered: function(strarg, boolarg, intarg) { + testCase.mystr = strarg + testCase.mybool = boolarg + testCase.myint = intarg + } + targetState: finalState + } + } + FinalState { + id: finalState + } + } + + signal mysignal(string mystr, bool mybool, int myint) + + name: "testTriggeredArguments2" + function test_triggeredArguments() + { + tryCompare(startState, "active", true) + + // Emit the signalTrans.signal + testCase.mysignal("test1", true, 2) + expectFail("", "QTBUG-50328") + compare(testCase.mystr, "test1") + compare(testCase.mybool, true) + compare(testCase.myint, 2) + } +} |