git.iko.soy/unity8
on xenial help sign in
rework GenericScopeView PullToRefresh test
ebdb08fAndrea Cimitan
tests/qmltests/Dash/tst_GenericScopeView.qml+27−40
compare with xenial
unifiedsplit
@@ -570,53 +570,40 @@ Item {
570 genericScopeView.scope = !genericScopeView.scope;
570 genericScopeView.scope = !genericScopeView.scope;
571 }
571 }
572
572
573− function test_pullToRefresh() {
573+ function test_pullToRefresh_data() {
574− waitForRendering(genericScopeView)
574+ return [
575−
575+ { tag: "Tall window long flick", shellHeight: units.gu(100), flickLength: units.gu(70), refresh: true },
576− mouseFlick(genericScopeView,
576+ { tag: "Tall window short flick", shellHeight: units.gu(100), flickLength: units.gu(25), refresh: false },
577− genericScopeView.width/2, units.gu(10),
577+ { tag: "Short window", shellHeight: units.gu(30), flickLength: units.gu(25), refresh: true }
578− genericScopeView.width/2, units.gu(80),
578+ ];
579− true, false)
579+ }
580−
581− var pullToRefresh = findChild(genericScopeView, "pullToRefresh")
582− tryCompare(pullToRefresh, "releaseToRefresh", true)
583−
584− spy.target = genericScopeView.scope
585− spy.signalName = "refreshed"
586−
587− mouseRelease(genericScopeView)
588− tryCompare(pullToRefresh, "releaseToRefresh", false)
589
580
590− spy.wait()
581+ function test_pullToRefresh(data) {
591− compare(spy.count, 1)
582+ var initialHeight = shell.height;
583+ shell.height = data.shellHeight;
584+ waitForRendering(shell);
592
585
593− // test short swipe doesn't refresh on tall window
594− mouseFlick(genericScopeView,
595− genericScopeView.width/2, units.gu(10),
596− genericScopeView.width/2, units.gu(20),
597− true, false)
598− mouseRelease(genericScopeView)
599− compare(spy.count, 1)
600−
601− // resize window, repeat the test
602− var initialHeight = shell.height
603− shell.height = units.gu(30)
604− waitForRendering(shell)
605 mouseFlick(genericScopeView,
586 mouseFlick(genericScopeView,
606− genericScopeView.width/2, units.gu(10),
587+ genericScopeView.width/2, units.gu(6),
607− genericScopeView.width/2, units.gu(20),
588+ genericScopeView.width/2, units.gu(6) + data.flickLength,
608− true, false)
589+ true, false);
609
590
591+ var pullToRefresh = findChild(genericScopeView, "pullToRefresh");
610− tryCompare(pullToRefresh, "releaseToRefresh", true)
592+ tryCompare(pullToRefresh, "releaseToRefresh", data.refresh);
593+
594+ spy.target = genericScopeView.scope;
595+ spy.signalName = "refreshed";
611
596
612− mouseRelease(genericScopeView)
597+ mouseRelease(genericScopeView);
613− tryCompare(pullToRefresh, "releaseToRefresh", false)
598+ tryCompare(pullToRefresh, "releaseToRefresh", false);
614
599
600+ if (data.refresh) {
615− spy.wait()
601+ spy.wait();
616− compare(spy.count, 2)
602+ compare(spy.count, 1);
603+ }
617
604
618− shell.height = initialHeight
605+ shell.height = initialHeight;
619− waitForRendering(shell)
606+ waitForRendering(shell);
620 }
607 }
621
608
622 function test_item_noninteractive() {
609 function test_item_noninteractive() {