git.iko.soy/unity8
on xenial help sign in
moved test wait to front
458df7eNick Dedekind
tests/qmltests/Panel/tst_Panel.qml+4−2
compare with xenial
unifiedsplit
@@ -284,8 +284,9 @@ PanelTest {
284
284
285 function waitForAllAnimationToComplete(state) {
285 function waitForAllAnimationToComplete(state) {
286
286
287+ waitUntilTransitionsEnd(panel);
287 tryCompare(panel.indicators.hideAnimation, "running", false);
288 tryCompare(panel.indicators.hideAnimation, "running", false);
288− tryCompare(panel.indicators .showAnimation, "running", false);
289+ tryCompare(panel.indicators.showAnimation, "running", false);
289 tryCompare(panel.indicators, "state", state);
290 tryCompare(panel.indicators, "state", state);
290
291
291 for (var i = 0; i < root.originalModelData.length; i++) {
292 for (var i = 0; i < root.originalModelData.length; i++) {
@@ -352,6 +353,8 @@ PanelTest {
352 tryCompareFunction(function() { return panelArea.y }, data.y);
353 tryCompareFunction(function() { return panelArea.y }, data.y);
353
354
354 for (var i = 0; i < root.originalModelData.length; i++) {
355 for (var i = 0; i < root.originalModelData.length; i++) {
356+ waitForAllAnimationToComplete("initial");
357+
355 var indicatorItem = get_indicator_item(i);
358 var indicatorItem = get_indicator_item(i);
356
359
357 var startXPosition = panel.mapFromItem(indicatorItem, indicatorItem.width / 2, 0).x;
360 var startXPosition = panel.mapFromItem(indicatorItem, indicatorItem.width / 2, 0).x;
@@ -374,7 +377,6 @@ PanelTest {
374
377
375 // init for next indicatorItem
378 // init for next indicatorItem
376 panel.indicators.hide();
379 panel.indicators.hide();
377− waitForAllAnimationToComplete("initial");
378 }
380 }
379 }
381 }
380
382