git.iko.soy/unity8
on xenial help sign in
Fix tests with refactor
commit88cdf92fd1e7bec01dcd1cc8ddc3ff7e5213c7e6 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 25 Aug 2014, 18:06 (12 years ago) parent446556a
3 files changed+10−10
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+3−7 qml/Dash/PreviewListView.qml+2−2 tests/qmltests/Dash/tst_GenericScopeView.qml+5−1
qml/Dash/GenericScopeView.qml+3−7
@@ -474,14 +474,13 @@ FocusScope {
474474
475475 function openSubPage(page) {
476476 subPage = page;
477− open = true;
478477 }
479478
480479 function closeSubPage() {
481480 open = false;
482481 }
483482
484− source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
483+ source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
485484
486485 onLoaded: {
487486 if (status === Loader.Ready) {
@@ -492,16 +491,13 @@ FocusScope {
492491 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
493492 item.model = Qt.binding(function() { return subPageLoader.model } )
494493 }
494+ open = true;
495495 }
496496 }
497497
498498 onOpenChanged: pageHeaderLoader.item.unfocus();
499499
500− onVisibleChanged: {
501− if (!visible) {
502− subPage = "";
503− }
504− }
500+ onVisibleChanged: if (!visible) subPage = "";
505501
506502 Connections {
507503 target: subPageLoader.item
qml/Dash/PreviewListView.qml+2−2
@@ -82,9 +82,9 @@ Item {
8282 }
8383
8484 onCountChanged: {
85− if (count > 0) {
85+ if (count > 0 && initialIndex >= 0) {
8686 currentIndex = initialIndex;
87− if (initialIndex >= 0) initialIndex = -1;
87+ initialIndex = -1;
8888 }
8989 }
9090
tests/qmltests/Dash/tst_GenericScopeView.qml+5−1
@@ -283,10 +283,12 @@ Item {
283283 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
284284
285285 tryCompare(testCase.subPageLoader, "open", false);
286+ tryCompare(testCase.subPageLoader, "visible", false);
286287 }
287288
288289 function test_previewOpenClose() {
289290 tryCompare(testCase.subPageLoader, "open", false);
291+ tryCompare(testCase.subPageLoader, "visible", false);
290292
291293 var categoryListView = findChild(genericScopeView, "categoryListView");
292294 categoryListView.positionAtBeginning();
@@ -371,11 +373,12 @@ Item {
371373
372374 // open
373375 tryCompare(testCase.subPageLoader, "open", false);
376+ tryCompare(testCase.subPageLoader, "visible", false);
374377 var settings = findChild(innerHeader, "settings_header_button");
375378 mouseClick(settings, settings.width / 2, settings.height / 2);
376379 tryCompare(testCase.subPageLoader, "open", true);
377380 tryCompareFunction(function() { return ("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1; }, true);
378− compare(genericScopeView.subPageShown, true);
381+ tryCompare(genericScopeView, "subPageShown", true);
379382 compare(testCase.subPageLoader.subPage, "settings");
380383 tryCompare(testCase.subPageLoader, "x", 0);
381384
@@ -386,6 +389,7 @@ Item {
386389 tryCompare(genericScopeView, "subPageShown", false);
387390 var categoryListView = findChild(genericScopeView, "categoryListView");
388391 tryCompare(categoryListView, "x", 0);
392+ tryCompare(testCase.subPageLoader, "visible", false);
389393 }
390394
391395 function test_header_style_data() {