Fix webbrowser test

1 files changed, 8 insertions, 26 deletions

diff --git a/Qt/demos/declarative/webbrowser/sys_webbrowser/sys_webbrowser.qtt b/Qt/demos/declarative/webbrowser/sys_webbrowser/sys_webbrowser.qtt
index 601752b..21fc7d0 100644
--- a/Qt/demos/declarative/webbrowser/sys_webbrowser/sys_webbrowser.qtt
+++ b/Qt/demos/declarative/webbrowser/sys_webbrowser/sys_webbrowser.qtt
@@ -44,35 +44,17 @@ testcase = {
 
     web1: function()
     {
-        startDemo("webbrowser");
-
+        startApplication("qmlviewer", ["$QT_SRC_DIR/demos/declarative/webbrowser/webbrowser.qml"]);
+        print(getenv("QT_SRC_DIR"));
+        if(getenv("QT_SRC_DIR") == "") {
+            skip("Please set environment variable QT_SRC_DIR to source root", SkipAll);
+        }
         var url = findWidget( { qmlType: "TextInput" } );
         var title = findWidget( { qmlType: "Text" } )[0];
         var web = findWidget( { qmlType: "WebView" } );
-
-        enter("www.google.com", url);
-        waitFor() { return getProperty(web, "progress") == 1; }
-
-        print("Title: " + getText(title));
-        selectIndex( "[title=\"Google Search\"]", web);
-        enter("nokia qt", web);
-
-        var links = getList(web);
-        prompt(links);
-
-        for (var i=8; i<links.length; i++) {
-            print("Clicking " + links[i]);
-            select(links[i], web);
-        }
-
-        prompt(activeWidgetInfo());
+        expect(function(){ return getProperty(web, "progress") == 1 }, 5000, 1, "Page not loaded in time");
+        enter("http://www.google.com", url);
+        expect(function(){ return getProperty(web, "progress") == 1 }, 5000, 1, "Page not loaded in time");
     }
 }
 
-// Starts a demo QML file
-function startDemo(demo, demoQml) {
-    if (demoQml == undefined) {
-        demoQml = demo;
-    }
-    startApplication("qml", ["$QT_SRC_DIR/demos/declarative/" + demo + "/" + demoQml + ".qml"]);
-}