git.iko.soy/unity8
on xenial help sign in
Use UbuntuTest.TestExtras.removeTimeConstraintsFromSwipeArea
commitd96491724e9431f4a60959df0c04d83ff4f0ebde authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 17 Dec 2015, 15:43 (11 years ago) parente557538
3 files changed+2−13
compare with xenial
unifiedsplit
tests/utils/modules/Unity/Test/UnityTestCase.qml+2−1 tests/utils/modules/Unity/Test/testutil.cpp−11 tests/utils/modules/Unity/Test/testutil.h−1
tests/utils/modules/Unity/Test/UnityTestCase.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
21+import Ubuntu.Test 1.0 as UbuntuTest
2122
2223TestCase {
2324 id: testCase
@@ -453,7 +454,7 @@ TestCase {
453454 */
454455 function removeTimeConstraintsFromSwipeAreas(item) {
455456 if (UT.Util.isInstanceOf(item, "UCSwipeArea")) {
456− var privateSwipeArea = UT.Util.removeTimeConstraintsFromSwipeArea(item);
457+ UbuntuTest.TestExtras.removeTimeConstraintsFromSwipeArea(item);
457458 } else {
458459 for (var i in item.children) {
459460 removeTimeConstraintsFromSwipeAreas(item.children[i]);
tests/utils/modules/Unity/Test/testutil.cpp−11
@@ -72,17 +72,6 @@ TouchEventSequenceWrapper *TestUtil::touchEvent(QQuickItem *item)
7272 QTest::touchEvent(m_targetWindow, m_touchDevice, /* autoCommit */ false), item);
7373}
7474
75−void TestUtil::removeTimeConstraintsFromSwipeArea(QObject *object)
76−{
77− auto children = object->findChildren<QObject*>();
78− Q_FOREACH(QObject *child, children) {
79− if (child->metaObject()->className() == QByteArray("UCSwipeAreaPrivate")) {
80− QMetaObject::invokeMethod(child, "setMaxTime", Q_ARG(int, 60 * 60 * 1000));
81− QMetaObject::invokeMethod(child, "setCompositionTime", Q_ARG(int, 0));
82− }
83− }
84−}
85−
8675void TestUtil::ensureTargetWindow()
8776{
8877 if (!m_targetWindow && !QGuiApplication::topLevelWindows().isEmpty())
tests/utils/modules/Unity/Test/testutil.h−1
@@ -34,7 +34,6 @@ public:
3434
3535 Q_INVOKABLE bool isInstanceOf(QObject*, QString);
3636 Q_INVOKABLE TouchEventSequenceWrapper *touchEvent(QQuickItem *item);
37− Q_INVOKABLE void removeTimeConstraintsFromSwipeArea(QObject *object);
3837
3938private:
4039 void ensureTargetWindow();