Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-quality into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-quality:
  update files

5 files changed, 12 insertions, 12 deletions

diff --git a/tests/systemtests/sys_bearer/sys_bearer.qtt b/tests/systemtests/sys_bearer/sys_bearer.qtt
index 80193b3b6b..fce0128330 100644
--- a/tests/systemtests/sys_bearer/sys_bearer.qtt
+++ b/tests/systemtests/sys_bearer/sys_bearer.qtt
@@ -69,7 +69,7 @@ testcase = {
    1. On S60 device: use Menu->Settings->Connectivity settings application.<br>
    1. linux/Mac: ifconfig (as superuser)<br>
    1. Windows: ipconfig<br><br>";
-        testGroups = "BAT_MOBILITY";
+        testGroups = "";
 
          // Test Steps
         prompt(twiki("---+++ " + testApplication + "<br><br>
@@ -91,7 +91,7 @@ testcase = {
           testSource = "$MOBILITYDIR/examples/bearermonitor";
           testGoal = "Verify that network interfaces can be added";
           testPreconditions = "No network access points are defined on the device; a WLAN is available";
-          testGroups = "BAT_MOBILITY";
+          testGroups = "";
           testRequirements = "";
 
           // Test steps
@@ -120,7 +120,7 @@ testcase = {
         testSource = "$MOBILITYDIR/examples/bearercloud";
         testGoal = "Verify that removal of a network connection is detected correctly";
         testPreconditions = "A connection to a WLAN exists";
-        testGroups = "BAT_MOBILITY";
+        testGroups = "";
         testRequirements = "";
 
         // Test steps
@@ -149,7 +149,7 @@ testcase = {
        testSource = "$MOBILITYDIR/examples/bearercloud";
        testGoal = "Verify that network status changes are detected correctly";
        testPreconditions = "no network access points are defined on the device; a WLAN is available";
-       testGroups = "BAT_MOBILITY";
+       testGroups = "";
        testRequirements = "";
 
        // Test steps
@@ -192,7 +192,7 @@ testcase = {
         testGoal = "Verify that network interfaces are used in order of priority";
         testPreconditions = "   1. GPRS is available to the device<br>
    1. WLAN is available to the device";
-        testGroups = "BAT_MOBILITY";
+        testGroups = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testApplication + "<br><br>
diff --git a/tests/systemtests/sys_location/sys_location.qtt b/tests/systemtests/sys_location/sys_location.qtt
index d6afa33bef..883da3af73 100644
--- a/tests/systemtests/sys_location/sys_location.qtt
+++ b/tests/systemtests/sys_location/sys_location.qtt
@@ -607,11 +607,11 @@ testcase = {
    },
 
     // \groups BAT,1.1,MOBILITY-538
-    displaying_a_map: function()
+    display_a_map: function()
     {
         // Test meta data
         testTitle = "Maps and Navigation - Display a Map";
-        testBinary = "geoservicedemo";
+        testBinary = "mapsdemo";
         testSource = "$MOBILITYDIR/tests/manual/location-testing-tools/geoservicedemo";
         testGoal = "Verify that a map can be displayed";
         testPreconditions = "None";
@@ -786,8 +786,8 @@ testcase = {
     {
         // Test meta data
         testTitle = "Location - Map Display";
-        testBinary = "testqtlocation";
-        testSource = "$MOBILITYDIR/tests/applications/location/testqtlocation";
+        testBinary = "qml_mapviewer";
+        testSource = "$MOBILITYDIR/tests/examples/declarative-location/mapviewer";
         testGoal = "Verify that a map can be loaded for a given position.";
         testPreconditions = "Internet connection is required for this test case.";
         testGroups = "BAT_MOBILITY";
diff --git a/tests/systemtests/sys_multimedia/sys_multimedia.qtt b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
index 79a044fe6e..1a19d9698a 100755
--- a/tests/systemtests/sys_multimedia/sys_multimedia.qtt
+++ b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
@@ -506,7 +506,7 @@ A device specific headset is required to be connected to device for radio testin
             | *Step* | *Verification* |
             | Launch " + testBinary + " | App launches normally |
             | If device has lens cover, make sure it is open | |
-            | Select Video tab to put camera in video mode |  Verify the intended scene is reproduced in the preview/viewfinder |
+            | Select Video tab to put camera in video mode | Verify the intended scene is reproduced in the preview/viewfinder |
             | Select Record Video | Verify that video is shown on screen for preview |
             | Select Pause | Verify that the Recorded counter has stopped |
             | Select Record again | Verify that the Recorded counter has continued counting |
diff --git a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
index a4db08ae95..f9ae397fa5 100644
--- a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
+++ b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
@@ -204,7 +204,7 @@ testcase = {
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
         testGoal = "Verify that overview of contact names is correct";
         testPreconditions = "There are some contact examples";
-        testGroups = " ";
+        testGroups = "BAT_MOBILITY";
         testRequirements = "";
 
         // Test Steps
diff --git a/tests/systemtests/sys_versit/sys_versit.qtt b/tests/systemtests/sys_versit/sys_versit.qtt
index d700331eb9..ce4c90bf77 100755
--- a/tests/systemtests/sys_versit/sys_versit.qtt
+++ b/tests/systemtests/sys_versit/sys_versit.qtt
@@ -88,7 +88,7 @@ testcase = {
         testSource = "$MOBILITYDIR/example/samplephonebook";
         testGoal = "Verify that vCard contacts can be imported";
         testPreconditions = "There is an testimport1.vcf onto a location on the target";
-        testGroups = " ";
+        testGroups = "BAT_MOBILITY";
         testRequirements = ""
             
         var promptText = "| *Name* | *Phone Number* | *Email* | *Address* | *Avatar* |\n";