Merge loadProgressSignal qml test into loadProgress

tst_loadProgressSignal.qml is a duplicate of tst_loadProgress.qml.
Move loadProgressChanged signal check to tst_loadProgress.qml
and delete tst_loadProgressSignal.qml.

Change-Id: I14821d4979def7b9f1985859384224b8f8111bd6
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 17 insertions, 4 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_loadProgress.qml b/tests/auto/quick/qmltests/data/tst_loadProgress.qml
index 32cd91418..bb85ed8e3 100644
--- a/tests/auto/quick/qmltests/data/tst_loadProgress.qml
+++ b/tests/auto/quick/qmltests/data/tst_loadProgress.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -41,15 +41,31 @@ TestWebEngineView {
         loadProgressArray.push(webEngineView.loadProgress)
     }
 
+    SignalSpy {
+        id: spyProgress
+        target: webEngineView
+        signalName: "loadProgressChanged"
+    }
+
     TestCase {
         name: "WebEngineViewLoadProgress"
 
         function test_loadProgress() {
             compare(webEngineView.loadProgress, 0)
+            compare(spyProgress.count, 0)
             loadProgressArray = []
 
             webEngineView.url = Qt.resolvedUrl("test1.html")
+            // Wait for the first loadProgressChanged signal, which have to be non-negative
+            spyProgress.wait()
+            verify(loadProgressArray[0] >= 0)
+            verify(webEngineView.loadProgress >= 0)
+
+            // Wait for the last loadProgressChanged signal, which have to be 100%
             verify(webEngineView.waitForLoadSucceeded())
+            spyProgress.wait()
+            compare(loadProgressArray[loadProgressArray.length - 1], 100)
+            compare(webEngineView.loadProgress, 100)
 
             // Test whether the chromium emits progress numbers in ascending order
             var loadProgressMin = 0
@@ -58,9 +74,6 @@ TestWebEngineView {
                 verify(loadProgressMin <= loadProgress)
                 loadProgressMin = loadProgress
             }
-
-            // The progress must be 100% at the end
-            compare(loadProgressArray[loadProgressArray.length - 1], 100)
         }
     }
 }