git.iko.soy/unity8
on xenial help sign in
TODO--
ffc4735Albert Astals Cid
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+10−3
compare with xenial
unifiedsplit
@@ -59,13 +59,20 @@ void tst_FloatingFlickable::tapGoesThrough()
59 QCOMPARE(testItem->touchEventsReceived.count(), 1);
59 QCOMPARE(testItem->touchEventsReceived.count(), 1);
60}
60}
61
61
62+static void removeTimeConstraints(QQuickItem *floatingFlickable)
63+{
64+ QObject *swipeAreaPrivate = floatingFlickable->findChild<QObject*>("UCSwipeAreaPrivate");
65+
66+ QMetaObject::invokeMethod(swipeAreaPrivate, "setMaxTime", Q_ARG(int, 60 * 60 * 1000));
67+ QMetaObject::invokeMethod(swipeAreaPrivate, "setCompositionTime", Q_ARG(int, 0));
68+}
69+
62void tst_FloatingFlickable::flickChangesContentX()
70void tst_FloatingFlickable::flickChangesContentX()
63{
71{
64 QQuickItem *floatingFlickable =
72 QQuickItem *floatingFlickable =
65 m_view->rootObject()->findChild<QQuickItem*>("floatingFlickable");
73 m_view->rootObject()->findChild<QQuickItem*>("floatingFlickable");
66 QVERIFY(floatingFlickable != nullptr);
74 QVERIFY(floatingFlickable != nullptr);
67−
68−// TODO? floatingFlickable->m_dragArea->removeTimeConstraints();
75+ removeTimeConstraints(floatingFlickable);
69
76
70 qreal startContentX = floatingFlickable->property("contentX").toReal();
77 qreal startContentX = floatingFlickable->property("contentX").toReal();
71
78
@@ -93,7 +100,7 @@ void tst_FloatingFlickable::flickChangesContentY()
93 QVERIFY(floatingFlickable != nullptr);
100 QVERIFY(floatingFlickable != nullptr);
94
101
95 floatingFlickable->setProperty("direction", Direction::Vertical);
102 floatingFlickable->setProperty("direction", Direction::Vertical);
96−// TODO? floatingFlickable->m_dragArea->removeTimeConstraints();
103+ removeTimeConstraints(floatingFlickable);
97
104
98 qreal startContentY = floatingFlickable->property("contentY").toReal();
105 qreal startContentY = floatingFlickable->property("contentY").toReal();
99
106
tests/utils/modules/Unity/Test/UnityTestCase.qml+1−1
@@ -454,7 +454,7 @@ TestCase {
454 if (UT.Util.isInstanceOf(item, "UCSwipeArea")) {
454 if (UT.Util.isInstanceOf(item, "UCSwipeArea")) {
455 var privateSwipeArea = UT.Util.findQObjectChild(item, "UCSwipeAreaPrivate");
455 var privateSwipeArea = UT.Util.findQObjectChild(item, "UCSwipeAreaPrivate");
456 privateSwipeArea.setMaxTime(60 * 60 * 1000);
456 privateSwipeArea.setMaxTime(60 * 60 * 1000);
457− privateSwipeArea.compositionTime = 0;
457+ privateSwipeArea.setCompositionTime(0);
458 } else {
458 } else {
459 for (var i in item.children) {
459 for (var i in item.children) {
460 removeTimeConstraintsFromSwipeAreas(item.children[i]);
460 removeTimeConstraintsFromSwipeAreas(item.children[i]);