5778309 · unity8 · git.iko.soy

debian/unity8-tests.install+1

compare with xenial

unifiedsplit

@@ -3,6 +3,7 @@ usr/bin/unity-mock-indicator-service

3usr/lib/*/unity8/qml/mocks

4usr/lib/*/unity8/qml/nonmirplugins

5usr/lib/*/unity8/qml/scopefakes

6+usr/lib/*/unity8/qml/utils

6usr/lib/*/unity8/tests

7usr/lib/*/unity8/tests

7usr/lib/*/unity8/uqmlscene

8usr/lib/*/unity8/uqmlscene

8usr/share/unity8/mocks

9usr/share/unity8/mocks

tests/plugins/Ubuntu/CMakeLists.txt+1−1

@@ -1 +1 @@

1−#add_subdirectory(Gestures) #FIXME broken with qt 5.9

1+add_subdirectory(Gestures)

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+10−1

@@ -17,6 +17,7 @@

17#include "GestureTest.h"

18

19#include <qpa/qwindowsysteminterface.h>

20+#include <private/qquickanimatorcontroller_p.h>

20#include <private/qquickwindow_p.h>

21#include <private/qquickwindow_p.h>

21#include <QQmlEngine>

22#include <QQmlEngine>

22#include <QQuickView>

23#include <QQuickView>

@@ -108,7 +109,15 @@ void GestureTest::sendTouch(qint64 timestamp, int id, QPointF pos,

108 QCoreApplication::sendEvent(m_view, &touchEvent);

109 QCoreApplication::sendEvent(m_view, &touchEvent);

109

110

110 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

111 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

111− windowPrivate->flushDelayedTouchEvent();

112+ if (windowPrivate->delayedTouch) {

113+ windowPrivate->deliverDelayedTouchEvent();

114+

115+ // Touch events which constantly start animations (such as a behavior tracking

116+ // the mouse point) need animations to start.

117+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

118+ if (ut && ut->hasStartAnimationPending())

119+ ut->startAnimations();

120+ }

112}

121}

113

122

114void GestureTest::passTime(qint64 timeSpanMs)

123void GestureTest::passTime(qint64 timeSpanMs)

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+10−1

@@ -19,6 +19,7 @@

19#include <QQmlEngine>

20#include <QQuickView>

21#include <QSharedPointer>

22+#include <private/qquickanimatorcontroller_p.h>

22#include <private/qquickwindow_p.h>

23#include <private/qquickwindow_p.h>

23

24

24// C++ std lib

25// C++ std lib

@@ -191,7 +192,15 @@ void tst_TouchGate::holdsEventsUntilGainsOwnership()

191 if (!ownershipAfterTouchEnd) {

192 if (!ownershipAfterTouchEnd) {

192 touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);

193 touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);

193 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());

194 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());

194− wp->flushDelayedTouchEvent();

195+ if (wp->delayedTouch) {

196+ wp->deliverDelayedTouchEvent();

197+

198+ // Touch events which constantly start animations (such as a behavior tracking

199+ // the mouse point) need animations to start.

200+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

201+ if (ut && ut->hasStartAnimationPending())

202+ ut->startAnimations();

203+ }

195 // TouchGate should now open its flood gates and let testItem get all

204 // TouchGate should now open its flood gates and let testItem get all

196 // events from touch 0 produced so far

205 // events from touch 0 produced so far

197 QCOMPARE(testItem->touchEventsReceived.count(), 2);

206 QCOMPARE(testItem->touchEventsReceived.count(), 2);

tests/qmltests/CMakeLists.txt+1−1

@@ -1,5 +1,5 @@

1

2−#add_subdirectory(Components) #FIXME broken with qt 5.9

2+add_subdirectory(Components)

3

4add_unity8_qmltest(. OrientedShell)

5add_unity8_qmltest(. DisabledScreenNotice)

tests/qmltests/Components/tst_DragHandle.cpp+19−2

@@ -20,6 +20,7 @@

20#include <qpa/qwindowsysteminterface.h>

21#include <QtQuick/QQuickView>

22#include <QtQml/QQmlEngine>

23+#include <private/qquickanimatorcontroller_p.h>

23#include <private/qquickwindow_p.h>

24#include <private/qquickwindow_p.h>

24#include <UbuntuGestures/private/ucswipearea_p_p.h>

25#include <UbuntuGestures/private/ucswipearea_p_p.h>

25

26

@@ -179,7 +180,15 @@ void tst_DragHandle::flickAndHold(QQuickItem *dragHandle,

179 QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());

180 QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());

180

181

181 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

182 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(m_view);

182− windowPrivate->flushDelayedTouchEvent();

183+ if (windowPrivate->delayedTouch) {

184+ windowPrivate->deliverDelayedTouchEvent();

185+

186+ // Touch events which constantly start animations (such as a behavior tracking

187+ // the mouse point) need animations to start.

188+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

189+ if (ut && ut->hasStartAnimationPending())

190+ ut->startAnimations();

191+ }

183}

192}

184

193

185void tst_DragHandle::drag(QPointF &touchPoint, const QPointF& direction, qreal distance,

194void tst_DragHandle::drag(QPointF &touchPoint, const QPointF& direction, qreal distance,

@@ -194,7 +203,15 @@ void tst_DragHandle::drag(QPointF &touchPoint, const QPointF& direction, qreal d

194 m_fakeTimeSource->m_msecsSinceReference += timeStep;

203 m_fakeTimeSource->m_msecsSinceReference += timeStep;

195 QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());

204 QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());

196

205

197− windowPrivate->flushDelayedTouchEvent();

206+ if (windowPrivate->delayedTouch) {

207+ windowPrivate->deliverDelayedTouchEvent();

208+

209+ // Touch events which constantly start animations (such as a behavior tracking

210+ // the mouse point) need animations to start.

211+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

212+ if (ut && ut->hasStartAnimationPending())

213+ ut->startAnimations();

214+ }

198 }

215 }

199}

216}

200

217

tests/utils/CMakeLists.txt+1−1

@@ -1 +1 @@

1−#add_subdirectory(modules) #FIXME broken with qt 5.9

1+add_subdirectory(modules)

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1

@@ -15,6 +15,7 @@

15 */

16

17#include "TouchEventSequenceWrapper.h"

18+#include <private/qquickanimatorcontroller_p.h>

18#include <private/qquickwindow_p.h>

19#include <private/qquickwindow_p.h>

19

20

20TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence eventSequence, QQuickItem *item)

21TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence eventSequence, QQuickItem *item)

@@ -34,7 +35,15 @@ void TouchEventSequenceWrapper::commit(bool processEvents)

34

35

35 if (window) {

36 if (window) {

36 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(window);

37 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(window);

37− wp->flushDelayedTouchEvent();

38+ if (wp->delayedTouch) {

39+ wp->deliverDelayedTouchEvent();

40+

41+ // Touch events which constantly start animations (such as a behavior tracking

42+ // the mouse point) need animations to start.

43+ QQmlAnimationTimer *ut = QQmlAnimationTimer::instance();

44+ if (ut && ut->hasStartAnimationPending())

45+ ut->startAnimations();

46+ }

38 }

47 }

39}

48}

40

49