git.iko.soy/unity8
on xenial help sign in
Fix some tst_OrientedShell tests
commit4765af496dbc4434df3005e9c8a45b2ffe3d3a82 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 2 Dec 2016, 16:15 (10 years ago) parent08cbe5e
3 files changed+12−6
compare with xenial
unifiedsplit
plugins/WindowManager/Window.cpp+1−1 tests/mocks/Unity/Application/MirSurface.cpp+1−1 tests/qmltests/tst_OrientedShell.qml+10−4
plugins/WindowManager/Window.cpp+1−1
@@ -156,7 +156,7 @@ void Window::setSurface(unityapi::MirSurfaceInterface *surface)
156156 if (m_positionRequested) {
157157 m_surface->setRequestedPosition(m_requestedPosition);
158158 }
159− if (m_stateRequested) {
159+ if (m_stateRequested && m_surface->state() == Mir::RestoredState) {
160160 m_surface->requestState(m_state);
161161 }
162162
tests/mocks/Unity/Application/MirSurface.cpp+1−1
@@ -91,7 +91,7 @@ MirSurface::MirSurface(const QString& name,
9191 , m_slowToResize(false)
9292 , m_shellChrome(Mir::NormalChrome)
9393{
94− DEBUG_MSG("");
94+ DEBUG_MSG("state=" << stateToStr(state));
9595
9696 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
9797
tests/qmltests/tst_OrientedShell.qml+10−4
@@ -980,6 +980,11 @@ Rectangle {
980980 function test_launchLandscapeOnlyAppOverPortraitOnlyDashThenSwitchToDash() {
981981 loadShell("mako");
982982
983+ var dashSurfaceId = topLevelSurfaceList.nextId;
984+ var dashApp = ApplicationManager.startApplication("unity8-dash");
985+ verify(dashApp);
986+ waitUntilAppWindowIsFullyLoaded(dashSurfaceId);
987+
983988 // starts as portrait, as unity8-dash is portrait only
984989 tryCompare(shell, "transformRotationAngle", 0);
985990
@@ -999,7 +1004,10 @@ Rectangle {
9991004 var rotationStates = findInvisibleChild(orientedShell, "rotationStates");
10001005 waitUntilTransitionsEnd(rotationStates);
10011006
1002− performLeftEdgeSwipeToSwitchToDash();
1007+ performLeftEdgeSwipe();
1008+
1009+ // should have switched to dash
1010+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
10031011
10041012 // Should be back to portrait
10051013 tryCompare(shell, "transformRotationAngle", 0);
@@ -1391,7 +1399,7 @@ Rectangle {
13911399 waitUntilTransitionsEnd(rotationStates);
13921400 }
13931401
1394− function performLeftEdgeSwipeToSwitchToDash() {
1402+ function performLeftEdgeSwipe() {
13951403 var swipeLength = shell.width * 0.7;
13961404
13971405 var touchStartX = 1;
@@ -1399,8 +1407,6 @@ Rectangle {
13991407 touchFlick(shell,
14001408 touchStartX, touchStartY,
14011409 touchStartX + swipeLength, touchStartY);
1402−
1403− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
14041410 }
14051411
14061412 function performEdgeSwipeToSwitchToPreviousApp() {