← Back to branch summary

~feng-kylin/unity8/TapToReturnToCall

« back to all changes in this revision

Viewing changes to tests/qmltests/Dash/tst_DashContent.qml

  • Committer: CI Train Bot
  • Author(s): Albert Astals Cid
  • Date: 2015-05-18 23:04:31 UTC
  • mfrom: (1756.1.2 fixtestMainNavigation)
  • Revision ID: ci-train-bot@canonical.com-20150518230431-etrp568sivj8iuw3
Make the DashContent::test_mainNavigation test more stable Fixes: #1450809
Approved by: Michael Zanetti

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qmltests/Dash/tst_DashContent.qml
142
142
 
143
143
            var startX = dashContentList.width/2;
144
144
            var startY = dashContentList.height/2;
145
 
            touchFlick(dashContentList, startX - units.gu(2), startY, startX, startY);
 
145
            touchFlick(dashContentList, startX - units.gu(4), startY, startX, startY);
146
146
            tryCompare(categoryListView, "contentY", units.gu(15) - categoryListView.pageHeader.height);
147
147
        }
148
148
 
153
153
 
154
154
            tryCompare(scope, "status", Loader.Ready);
155
155
 
156
 
            var categoryListView = findChild(dashContentList, "categoryListView");
 
156
            var categoryListView = findChild(scope, "categoryListView");
157
157
            categoryListView.contentY = units.gu(10);
158
158
 
159
159
            compare(dashContentList.currentItem.item.objectName,  "MockScope1")
353
353
            compare(backButton.visible, true);
354
354
 
355
355
            tryCompare(navigationList1.navigation, "loaded", true);
 
356
            tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);
 
357
            tryCompare(navigationList1, "height", navigationList1.implicitHeight);
356
358
            navigation = findChild(dashNavigationButton, "navigation1child2");
357
359
            mouseClick(navigation);
358
360
            compare(dashNavigationButton.showList, false);
386
388
            mouseClick(dashNavigationButton);
387
389
            compare(dashNavigationButton.showList, true);
388
390
            tryCompare(navigationListView.currentItem.navigation, "loaded", true);
 
391
            var navigationList0 = findChild(dashNavigationButton, "navigation0");
 
392
            tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
 
393
            tryCompare(navigationList0, "height", navigationList0.implicitHeight);
389
394
            navigation = findChild(dashNavigationButton, "navigation0child2");
390
395
            mouseClick(navigation);
391
396
            compare(dashNavigationButton.showList, true);