fixing bugs in system tests

fixing bugs in system tests

Change-Id: I4616be5df0f1f9bcdc6e47c4aec3a0711d17e7b5
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>

5 files changed, 113 insertions, 117 deletions

diff --git a/tests/system/geocode/sys_geocode.qtt b/tests/system/geocode/sys_geocode.qtt
index ffe865a9..c120f653 100644
--- a/tests/system/geocode/sys_geocode.qtt
+++ b/tests/system/geocode/sys_geocode.qtt
@@ -71,7 +71,7 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Geocode menu item | |
-        | Select Clear All button | |
+        | Select Clear button | |
         | Fill in " + street + " in Street field | |
         | Fill in " + city + " in City field | |
         | Fill in " + country + " in Country field | |
@@ -81,7 +81,7 @@ testcase = {
     },
 
     qml_geocode_not_unique_location_data: {
-        request:["Moscow", "Idaho","USA", "http://loc.desktop.maps.svc.ovi.com/geocoder/gc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&lg=eng&country=France&city=The Best City",
+        request:["Moscow", "Idaho","USA", "http://loc.desktop.maps.svc.ovi.com/geocoder/gc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&lg=eng&country=USA&city=Moscow",
                  "http://loc.desktop.maps.svc.ovi.com/geocoder/gc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&lg=eng&country=USA&state=Idaho&city=Moscow"]
     },
 
@@ -108,6 +108,7 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Geocode menu item | |
+        | Select Clear button | |
         | Fill in " + city + " in City field | |
         | Fill in " + country + " in Country field | |
         | Select Go! button | |
@@ -121,10 +122,10 @@ testcase = {
     },
 
     qml_geocode_request_with_post_code_data: {
-        request:["4113", "Australia", "http://loc.desktop.maps.svc.ovi.com/geocoder/gc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&lg=eng&country=Australia&zip=4113"]
+        request:["Brandl St", "4113", "Australia", "http://loc.desktop.maps.svc.ovi.com/geocoder/gc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&lg=eng&country=Australia&zip=4113&street=Brandl St"]
     },
 
-    qml_geocode_request_with_post_code: function(postcode, country, url)
+    qml_geocode_request_with_post_code: function(street, postcode, country, url)
     {
         // Test meta data
         testTitle = "QML: Maps and Navigation - Geocode post code";
@@ -147,7 +148,8 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Geocode menu item | |
-        | Select Clear All button | |
+        | Select Clear button | |
+        | Fill in " + street + " in Street field | |
         | Fill in " + postcode + " in Post Code field | |
         | Fill in " + country + " in Country field | |
         | Select Go! button | |
@@ -158,7 +160,7 @@ testcase = {
     qml_reverse_geocode_data: {
         australian_place:["-27.575", "153.088", "http://loc.desktop.maps.svc.ovi.com/geocoder/rgc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&long=153.088&lat=-27.575&lg=eng"],
         russian_place:["56.3264", "44.0048", "http://loc.desktop.maps.svc.ovi.com/geocoder/rgc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&long=44.0048&lat=56.3264&lg=eng"],
-        uninhabited_place:["-26.8890", "154.6696", "http://loc.desktop.maps.svc.ovi.com/geocoder/rgc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&long=154.6696&lat=-26.889&lg=eng"]
+        uninhabited_place:["-27", "155", "http://loc.desktop.maps.svc.ovi.com/geocoder/rgc/2.0?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&long=155&lat=-27&lg=eng"]
     },
 
     qml_reverse_geocode: function(latitude, longitude, url)
@@ -184,6 +186,7 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Reverse Geocode | |
+        | Select Clear button | |
         | Fill in " + latitude + " in Latitude field | |
         | Fill in " + longitude + " in Longitude field | |
         | Select Go! button | |
@@ -191,7 +194,8 @@ testcase = {
         ));
     },
     qml_geocoding_and_locale_data: {
-        greek_place:["38", "24", "el", "Greek"]
+        english:["38", "24", "en", "English"],
+        greek:["38", "24", "el", "Greek"]
     },
 
     qml_geocoding_and_locale: function(latitude, longitude, locale, language)
@@ -214,16 +218,14 @@ testcase = {
 
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally |
-        | Select Reverse geocode | |
-        | Fill in " + latitude + " in Latitude field | |
-        | Fill in " + longitude + " in Longitude field | |
-        | Select Go! | |
-        | Wait for success geocode message | Verify that address is in English|
-        | Select *en* button | |
+        | Select en button | |
         | Select Other | |
         | Fill in " + locale + " in Language field | |
         | Select Go! | |
+        | Select Tools button | |
         | Select Reverse geocode | |
+        | Fill in " + latitude + " in Latitude field | |
+        | Fill in " + longitude + " in Longitude field | |
         | Select Go! | |
         | Wait for success geocode message | Verify that address is in " + language + " |"
         ));
diff --git a/tests/system/location/sys_location.qtt b/tests/system/location/sys_location.qtt
index 00012060..3e7fc439 100644
--- a/tests/system/location/sys_location.qtt
+++ b/tests/system/location/sys_location.qtt
@@ -89,9 +89,9 @@ testcase = {
         | Launch " + testBinary + " | App launches normally. |
         | Select Provider button | |
         | Select nokia provider | Map is displayed on the screen |
-        | Zoom in the map to see *Brisbane* | |
+        | Zoom in the map to see Brisbane | |
         | Press and Hold on the square which represents Brisbane | |
-        | Select *Get coordinate* menu item | Verify that dialog with coordinates appears on the screen. Latitude is about *-27.46*, longitude is about *153.02* |"
+        | Select 'Get coordinate' menu item | Verify that dialog with coordinates appears on the screen. Latitude is about -27.46, longitude is about 153.02 |"
         ));
     },
 
@@ -276,28 +276,28 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally |
         | Long press on the map | |
-        | Select Add Marker menu item | |
-        | Create another Marker via Long Press | |
-        | Long Press on the first marker | |
-        | Select Move To menu item | |
+        | Select 'Add Marker' menu item | |
+        | Long Press on the marker | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create another Marker via Long Press | |
         | Long Press on the second marker | |
-        | Select Move To menu item | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
         | Long Press on the first marker | |
-        | Select *Distance to the next point* | Verify that distance is " + distance + " |"
+        | Select 'Distance to the next point' | Verify that distance is " + distance + " |"
         ));
     },
 
-    qml_border_wrapping_for_map_data: {
+    qml_border_wrapping_data: {
         markers:["-27", "150", "-27", "-170"]
     },
 
-    qml_border_wrapping_for_map: function(lat1, long1, lat2, long2)
+    qml_border_wrapping: function(lat1, long1, lat2, long2)
     {
         // Test meta data
         testTitle = "QML: Maps and Navigation - Border wrapping";
@@ -319,15 +319,15 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Zoom out map to about level 3 | |
         | Long press on the map | |
-        | Select Add Marker menu item | |
-        | Create another Marker via Long Press | |
-        | Long Press on the first marker | |
-        | Select Move To menu item | |
+        | Select 'Add Marker' menu item | |
+        | Long Press on the marker | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create another Marker via Long Press | |
         | Long Press on the second marker | |
-        | Select Move To menu item | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
diff --git a/tests/system/mapobjects/sys_mapobjects.qtt b/tests/system/mapobjects/sys_mapobjects.qtt
index 8b2b5fdb..68e07a0a 100644
--- a/tests/system/mapobjects/sys_mapobjects.qtt
+++ b/tests/system/mapobjects/sys_mapobjects.qtt
@@ -95,21 +95,21 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
-        | Create second Marker | |
-        | Create third Marker | |
-        | Press and Hold on the first marker | |
-        | Select Move To button | |
+        | Select 'Add Marker' button | |
+        | Press and Hold on the marker | |
+        | Select 'Move to' button | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create second Marker | |
         | Press and Hold on the second marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
+        | Create third Marker | |
         | Press and Hold on the third marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat3 + " in Latitude field | |
         | Fill in " + long3 + " in Longitude | |
         | Select Go! button | |
@@ -146,33 +146,33 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
-        | Create second Marker | |
-        | Create third Marker | |
-        | Create fourth Marker | |
-        | Create fifth Marker | |
-        | Press and Hold on the first marker | |
-        | Select Move To button | |
+        | Select 'Add Marker' button | |
+        | Press and Hold on the marker | |
+        | Select 'Move to' button | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create second Marker | |
         | Press and Hold on the second marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
+        | Create third Marker | |
         | Press and Hold on the third marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat3 + " in Latitude field | |
         | Fill in " + long3 + " in Longitude | |
         | Select Go! button | |
+        | Create fourth Marker | |
         | Press and Hold on the fourth marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat4 + " in Latitude field | |
         | Fill in " + long4 + " in Longitude | |
         | Select Go! button | |
+        | Create fifth Marker | |
         | Press and Hold on the fifth marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat5 + " in Latitude field | |
         | Fill in " + long5 + " in Longitude | |
         | Select Go! button | |
@@ -208,15 +208,15 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
-        | Create second Marker | |
-        | Press and Hold on the first marker | |
-        | Select Move To button | |
+        | Select 'Add Marker' button | |
+        | Press and Hold on the marker | |
+        | Select 'Move to' button | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create second Marker | |
         | Press and Hold on the second marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
@@ -252,9 +252,9 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Press and Hold on the marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + latitude + " in Latitude field | |
         | Fill in " + longitude + " in Longitude | |
         | Select Go! button | |
@@ -290,9 +290,9 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Press and Hold on the marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + latitude + " in Latitude field | |
         | Fill in " + longitude + " in Longitude | |
         | Select Go! button | |
@@ -328,15 +328,16 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Press and Hold on the marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + latitude + " in Latitude field | |
         | Fill in " + longitude + " in Longitude | |
         | Select Go! button | |
         | Press and Hold on the marker | |
         | Select Draw... button | |
-        | Select 3D QML Item button | Verify that rotating cube is on the map. |"
+        | Select '3D QML Item' button | Verify that rotating cube is on the map. |
+        | Wait for a minute | Verify that cube is rotating. |"
         ));
     },
 
@@ -361,7 +362,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Create second Marker | |
         | Create third Marker | |
         | Create fourth Marker | |
@@ -382,7 +383,7 @@ testcase = {
         | Select Circle | |
         | Press and Hold on the third marker | |
         | Select Draw... button | |
-        | Select 3D QML Item | |
+        | Select '3D QML Item' | |
         | Press and Hold on the fourth marker | |
         | Select Draw... button | |
         | Select Video | |
@@ -416,9 +417,9 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Press and Hold on the marker | |
-        | Select Move To button | |
+        | Select 'Move to' button | |
         | Fill in " + latitude + " in Latitude field | |
         | Fill in " + longitude + " in Longitude | |
         | Select Go! button | Verify that marker places next to " + city + " |
@@ -447,7 +448,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
         | Press and Hold on the map | |
-        | Select Add Marker button | |
+        | Select 'Add Marker' button | |
         | Press and Hold on the marker | Verify that popup menu appears |
         | Press on the map | Verify that popup menu disappears | |
         | Pan the map | Verify that marker doesn't change it's coordinate. |
@@ -553,8 +554,8 @@ testcase = {
     },
 
 
-    qml_mapitem_border_interaction:{
-        nodes:["-27.1144", "152.6594", "-27.7434", "153.3021"],
+    qml_mapitem_border_interaction_data:{
+        nodes:["-27.1144", "152.6594", "-27.7434", "153.3021"]
     },
 
     qml_mapitem_border_interaction:function(rectlat1, rectlong1, rectlat2, rectlong2)
@@ -577,17 +578,17 @@ testcase = {
 
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally. Map is displayed on the screen |
-        | Press and Hold on the map | |
-//        | Select Add Marker button | |
-        | Press and Hold on the map | |
-        | Select Add Marker button | |
-        | Press and Hold on the first marker | |
-        | Select Move To button | |
+        | Long Press on the map | |
+        | Select 'Add Marker' button | |
+        | Long Press on the marker | |
+        | Select 'Move to' button | |
         | Fill in " + rectlat1 + " in Latitude field | |
         | Fill in " + rectlong1 + " in Longitude | |
         | Select Go! button | |
-        | Press and Hold on the second marker | |
-        | Select Move To button | |
+        | Long Press on the map | |
+        | Select 'Add Marker' button | |
+        | Long Press on the second marker | |
+        | Select 'Move to' button | |
         | Fill in " + rectlat2 + " in Latitude field | |
         | Fill in " + rectlong2 + " in Longitude | |
         | Select Go! button | |
diff --git a/tests/system/places/sys_places.qtt b/tests/system/places/sys_places.qtt
index 37b21f7b..57449ad8 100644
--- a/tests/system/places/sys_places.qtt
+++ b/tests/system/places/sys_places.qtt
@@ -91,7 +91,7 @@ testcase = {
 
     qml_searching_for_places_by_text_string_for_given_position_data: {
         search_string:["48.9", "2.4", "pizza", "http://where.desktop.mos.svc.ovi.com/NOSe/json?vi=where&dv=oviMaps&lat=48.9&lon=2.4&of=0&dym=5&q=pizza"],
-        search_string_with_typo:["-27.5", "153", "pizzs", "http://where.desktop.mos.svc.ovi.com/NOSe/json?vi=where&dv=oviMaps&lat=-27.5&lon=153&of=0&dym=5&q=pizzs"]
+        search_string_with_typo:["48.9", "2.4", "pizzs", "http://where.desktop.mos.svc.ovi.com/NOSe/json?vi=where&dv=oviMaps&lat=48.9&lon=2.4&of=0&dym=5&q=pizzs"]
     },
 
     qml_searching_for_places_by_text_string_for_given_position: function(latitude, longitude, search_string, url)
@@ -129,7 +129,7 @@ testcase = {
     },
 
     qml_recomendations_for_places_data: {
-        data:["48.9", "2.4", "La Romantica", "La Romantica 6996m", "http://places.maps.ovi.com/rest/v1/places/250u09wh-8412aba7c3f8475da0a7ebc5fa713ec4/recommendations/nearby"]
+        data:["48.9", "2.4", "La Romantica", "La Romantica 6988m", "http://places.maps.ovi.com/rest/v1/places/250u09wh-8412aba7c3f8475da0a7ebc5fa713ec4/recommendations/nearby"]
     },
 
     qml_recomendations_for_places: function(latitude, longitude, search_string, place, url)
@@ -164,7 +164,7 @@ testcase = {
         | Select Search button | |
         | Expand panel with results | |
         | Select " + place + " | |
-        | Select “Find Similar” | Verify that number of found places corresponds to the open web page. Verify that distance to reccommended places is the same. |"
+        | Select 'Find Similar' | Verify that number of found places corresponds to the open web page. Verify that distance to recommended places is the same. |"
         ));
     },
 
@@ -531,7 +531,7 @@ testcase = {
         | Select nokia provider | |
         | Select Search button | |
         | Select Search Options button | |
-        | Fill in " + locale + " in Locale(s) field |
+        | Fill in " + locale + " in Locale(s) field | |
         | Select OK button | |
         | Select Search button | |
         | Select Search Center button | |
diff --git a/tests/system/routing/sys_routing.qtt b/tests/system/routing/sys_routing.qtt
index a2a263e9..21ce7421 100644
--- a/tests/system/routing/sys_routing.qtt
+++ b/tests/system/routing/sys_routing.qtt
@@ -73,6 +73,7 @@ testcase = {
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Route menu item | |
+        | Select Clear button | |
         | Fill in " + lat1 + " in From Latitude field | |
         | Fill in " + long1 + " in From Longitude field | |
         | Fill in " + lat2 + " in To Latitude field | |
@@ -111,6 +112,7 @@ testcase = {
         | Select Tools button | |
         | Select Route menu item | |
         | Select second option group to enter start and end points as address | |
+        | Select Clear button | |
         | Fill in " + city1 + " in From City field | |
         | Fill in " + country1 + " in From Country field | |
         | Fill in " + city2 + " in To City field | |
@@ -146,37 +148,38 @@ testcase = {
         | Open " + url + " url in a desktop browser | |
         | Launch " + testBinary + " | App launches normally |
         | Long press on the map | |
-        | Select Add Marker menu item | |
-        | Create another Marker via Long Press | |
-        | Create third Marker | |
-        | Long Press on the first marker | |
-        | Select Move To menu item | |
+        | Select 'Add Marker' menu item | |
+        | Long Press on the marker | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat1 + " in Latitude field | |
         | Fill in " + long1 + " in Longitude | |
         | Select Go! button | |
+        | Create another Marker via Long Press | |
         | Long Press on the second marker | |
-        | Select Move To menu item | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat2 + " in Latitude field | |
         | Fill in " + long2 + " in Longitude | |
         | Select Go! button | |
+        | Create third Marker | |
         | Long Press on the third marker | |
-        | Select Move To menu item | |
+        | Select 'Move to' menu item | |
         | Fill in " + lat3 + " in Latitude field | |
         | Fill in " + long3 + " in Longitude | |
         | Press Go! button | |
         | Long press on the map | |
-        | Select Route To The Next Points | |
+        | Select 'Route to next points' | |
         | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |"
         ));
     },
 
     qml_travel_mode_data: {
-        point:["-27.5789", "153.0919", "-27.5792", "153.096",
-               "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5789,153.0919&waypoint1=-27.5792,153.096&mode0=fastestNow;car&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:07:16Z&instructionformat=text&language=en_AU",
+        car:["-27.5789", "153.0919", "-27.5792", "153.096", "Vehicle",
+               "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5789,153.0919&waypoint1=-27.5792,153.096&mode0=fastestNow;car&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:07:16Z&instructionformat=text&language=en_AU"],
+        pedestrian:["-27.5789", "153.0919", "-27.5792", "153.096", "Pedestrian",
                "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5789,153.0919&waypoint1=-27.5792,153.096&mode0=fastestNow;pedestrian&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:07:51Z&instructionformat=text&language=en_AU"]
     },
 
-    qml_travel_mode: function(lat1, long1, lat2, long2, url1, url2)
+    qml_travel_mode: function(lat1, long1, lat2, long2, mode, url)
     {
         // Test meta data
         testTitle = "QML: Maps and Navigation - Travel mode (Car and Pedestrian)";
@@ -195,33 +198,30 @@ testcase = {
         *Requirements:* " + testRequirements + "<br>
 
         | *Step* | *Verification* |
-        | Open " + url1 + " url in a desktop browser | |
+        | Open " + url + " url in a desktop browser | |
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Route menu item | |
         | Selec first option group | |
+        | Select Clear button | |
         | Fill in " + lat1 + " in From Latitude field | |
         | Fill in " + long1 + " in From Longitude field | |
         | Fill in " + lat2 + " in To Latitude field | |
         | Fill in " + long2 + " in To Longitude field | |
-        | Select Go! button | |
-        | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |
-        | Open " + url2 + " url in a desktop browser | |
-        | Select Tools button | |
-        | Select Route menu item | |
-        | Select *Pedestrian* option button | |
+        | Select " + mode + " option button | |
         | Select Go! button | |
         | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |"
         ));
     },
 
-    qml_travel_feature_type: {
-        points:["-27.5299", "153.0713", "-27.4395", "153.0504",
-                "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5299,153.0713&waypoint1=-27.4395,153.0504&mode0=fastestNow;car;tollroad:-1&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:16:14Z&instructionformat=text&language=en_AU",
+    qml_route_feature_type_data: {
+        tolls:["-27.5299", "153.0713", "-27.4395", "153.0504", "Avoid toll roads",
+                "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5299,153.0713&waypoint1=-27.4395,153.0504&mode0=fastestNow;car;tollroad:-1&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:16:14Z&instructionformat=text&language=en_AU"],
+        highways:["-27.5299", "153.0713", "-27.4395", "153.0504", "Avoid highways",
                 "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5299,153.0713&waypoint1=-27.4395,153.0504&mode0=fastestNow;car;tollroad:-1,motorway:-1&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2011-12-28T22:16:37Z&instructionformat=text&language=en_AU"]
     },
 
-    qml_route_feature_type: function(lat1, long1, lat2, long2, url1, url2)
+    qml_route_feature_type: function(lat1, long1, lat2, long2, feature, url)
     {
         // Test meta data
         testTitle = "QML: Maps and Navigation - Route features (Avoid Highways and Avoid Tool Road)";
@@ -240,33 +240,30 @@ testcase = {
         *Requirements:* " + testRequirements + "<br>
 
         | *Step* | *Verification* |
-        | Open " + url1 + " url in a desktop browser | |
+        | Open " + url + " url in a desktop browser | |
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Route menu item | |
         | Selec first option group | |
+        | Select Clear button | |
         | Fill in " + lat1 + " in From Latitude field | |
         | Fill in " + long1 + " in From Longitude field | |
         | Fill in " + lat2 + " in To Latitude field | |
         | Fill in " + long2 + " in To Longitude field | |
-        | Select *Avoid toll roads* checkbox | |
-        | Select Go! button | |
-        | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |
-        | Select Tools button | |
-        | Select Route menu item | |
-        | Select *Avoid highways* checkbox | |
+        | Select '" +feature + "' checkbox | |
         | Select Go! button | |
         | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |"
         ));
     },
 
     qml_route_optimization_data: {
-        points:["-27.5374", "153.084", "-27.4391", "153.0488",
-                "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5374,153.084&waypoint1=-27.4391,153.0488&mode0=fastestNow;car&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2012-02-20T00:28:38Z&instructionformat=text&language=en_AU",
+        fastest:["-27.5374", "153.084", "-27.4391", "153.0488", "Fastest",
+                "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5374,153.084&waypoint1=-27.4391,153.0488&mode0=fastestNow;car&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2012-02-20T00:28:38Z&instructionformat=text&language=en_AU"],
+        shortest:["-27.5374", "153.084", "-27.4391", "153.0488", "Shortest",
                 "http://prd.lbsp.navteq.com/routing/6.2/calculateroute.xml?referer=qtlocationapi&token=152022572f0e44e07489c35cd46fa246&waypoint0=-27.5374,153.084&waypoint1=-27.4391,153.0488&mode0=shortest;car&alternatives=0&linkattributes=sh,le&maneuverattributes=po,tt,le,di,li&routeattributes=sm,sh,bb,lg&legattributes=links,maneuvers&departure=2012-02-20T00:28:45Z&instructionformat=text&language=en_AU"]
     },
 
-    qml_route_optimization: function(lat1, long1, lat2, long2, url1, url2)
+    qml_route_optimization: function(lat1, long1, lat2, long2, optimization, url)
     {
         // Test meta data
         testTitle = "QML: Maps and Navigation - Route optimization (Shortest and Fastest)";
@@ -285,21 +282,17 @@ testcase = {
         *Requirements:* " + testRequirements + "<br>
 
         | *Step* | *Verification* |
-        | Open " + url1 + " url in a desktop browser | |
+        | Open " + url + " url in a desktop browser | |
         | Launch " + testBinary + " | App launches normally |
         | Select Tools button | |
         | Select Route menu item | |
         | Selec first option group | |
+        | Select Clear button | |
         | Fill in " + lat1 + " in From Latitude field | |
         | Fill in " + long1 + " in From Longitude field | |
         | Fill in " + lat2 + " in To Latitude field | |
         | Fill in " + long2 + " in To Longitude field | |
-        | Select Go! button | |
-        | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |
-        | Open " + url2 + " url in a desktop browser | |
-        | Select Tools button | |
-        | Select Route menu item | |
-        | Select *Shortest* option button | |
+        | Select '" + optimization + "' option button | |
         | Select Go! button | |
         | Wait for the route to be calculated. Expand route info if there were no errors | Verify route information corresponds to the open web page |"
         ));
@@ -330,7 +323,7 @@ testcase = {
 
         | *Step* | *Verification* |
         | Launch " + testBinary + " | App launches normally |
-        | Select Language button| |
+        | Select Language button | |
         | Select Other | |
         | Fill in " +  locale + " in Language field | |
         | Select Go! button | |