From 169edc78ae83b0ff129a4c5b725b9c062b8c0ea1 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Wed, 5 Aug 2015 13:27:41 +0200 Subject: Fix loadProgress QML auto test The minimum loading progress value has been changed that ruined the test. Improve the test by testing the order of the loading progress values instead of the minimum value. Change-Id: I3472323f2233e75cd8e334a1d442035a5ecac32e Reviewed-by: Andras Becsi --- tests/auto/quick/qmltests/data/tst_loadProgress.qml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'tests/auto/quick/qmltests') diff --git a/tests/auto/quick/qmltests/data/tst_loadProgress.qml b/tests/auto/quick/qmltests/data/tst_loadProgress.qml index 2a051d931..096861c4d 100644 --- a/tests/auto/quick/qmltests/data/tst_loadProgress.qml +++ b/tests/auto/quick/qmltests/data/tst_loadProgress.qml @@ -48,15 +48,32 @@ TestWebEngineView { width: 400 height: 300 + property var loadProgressArray: [] + + onLoadProgressChanged: { + loadProgressArray.push(webEngineView.loadProgress) + } + TestCase { name: "WebEngineViewLoadProgress" function test_loadProgress() { compare(webEngineView.loadProgress, 0) + loadProgressArray = [] + webEngineView.url = Qt.resolvedUrl("test1.html") - compare(webEngineView.loadProgress, 0) verify(webEngineView.waitForLoadSucceeded()) - compare(webEngineView.loadProgress, 100) + + // Test whether the chromium emits progress numbers in ascending order + var loadProgressMin = 0 + for (var i in loadProgressArray) { + var loadProgress = loadProgressArray[i] + verify(loadProgressMin <= loadProgress) + loadProgressMin = loadProgress + } + + // The progress must be 100% at the end + compare(loadProgressArray[loadProgressArray.length - 1], 100) } } } -- cgit v1.2.3