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:
  modify sys_location.qtt
  modify file
  rewrite this file
  modify multimedia file
  commit function run_test_application in sys_qmlcontacts.qtt
  add sys_publish_and_subscribe
  add import_ical_data_format and import_vcal_data_format in sys_versitorganizer.qtt
  add sys_docgallery.qtt

9 files changed, 778 insertions, 365 deletions

diff --git a/tests/systemtests/sys_docgallery/sys_docgallery.pro b/tests/systemtests/sys_docgallery/sys_docgallery.pro
new file mode 100644
index 0000000000..e39eac4a5c
--- /dev/null
+++ b/tests/systemtests/sys_docgallery/sys_docgallery.pro
@@ -0,0 +1,11 @@
+CONFIG+=systemtest
+SOURCES = sys_docgallery.qtt
+
+unix:!symbian {
+    maemo5 {
+        target.path = /opt/usr/bin
+    } else {
+        target.path = /usr/local/bin
+    }
+    INSTALLS += target
+}
diff --git a/tests/systemtests/sys_docgallery/sys_docgallery.qtt b/tests/systemtests/sys_docgallery/sys_docgallery.qtt
new file mode 100644
index 0000000000..882e95a9f2
--- /dev/null
+++ b/tests/systemtests/sys_docgallery/sys_docgallery.qtt
@@ -0,0 +1,261 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//TESTED_COMPONENT=src/gallery
+
+testcase = {
+
+    artists_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Artists view shows properly";
+        testBinary = "mediabrowser";
+        testSource = "$MOBILITYDIR/examples/mediabrowser"
+        testGoal = "Verify that media files can be displayed according to artists ";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Artists' in menu | Verify that media files can be displayed according to artists |
+        "));
+    },
+
+    album_artists_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Album artists view shows properly";
+        testBinary = "mediabrowser";
+        testSource = "$MOBILITYDIR/examples/mediabrowser"
+        testGoal = "Verify that media files can be displayed according to album artists ";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Album Artists' in menu | Verify that media files can be displayed according to album artists |
+        "));
+    },
+
+    songs_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Songs view shows properly";
+        testBinary = "mediabrowser";
+        testSource = "$MOBILITYDIR/examples/mediabrowser"
+        testGoal = "Verify that media files can be displayed according to songs ";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Songs' in menu | Verify that media files can be displayed according to songs |
+        "));
+    },
+
+    photos_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Photos view shows properly";
+        testBinary = "mediabrowser";
+        testSource = "$MOBILITYDIR/examples/mediabrowser"
+        testGoal = "Verify that media files can be displayed according to photos ";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Photos' in menu | Verify that media files can be displayed according to photos |
+        "));
+    },
+
+    albums_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Album view shows properly";
+        testBinary = "mediabrowser";
+        testSource = "$MOBILITYDIR/examples/mediabrowser"
+        testGoal = "Verify that media files can be displayed according to albums ";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Albums' in menu | Verify that media files can be displayed according to albums |
+        "));
+    },
+
+    document_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Document view shows properly";
+        testBinary = "documentproperties";
+        testSource = "$MOBILITYDIR/examples/documentproperties"
+        testGoal = "Verify that document files can be displayed";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Documents' in menu | Verify that document files can be displayed |
+        "));
+    },
+
+    music_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Music view shows properly";
+        testBinary = "documentproperties";
+        testSource = "$MOBILITYDIR/examples/documentproperties"
+        testGoal = "Verify that music files can be displayed";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Audio' in menu | Verify that music files can be displayed |
+        "));
+    },
+    
+    photo_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Photo view shows properly";
+        testBinary = "documentproperties";
+        testSource = "$MOBILITYDIR/examples/documentproperties"
+        testGoal = "Verify that photo files can be displayed";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Images' in menu | Verify that photo files can be displayed |
+        "));
+    },
+    
+    video_view_shows_properly: function()
+    {
+        // Test meta data
+        testTitle = "Gallery - Video view shows properly";
+        testBinary = "documentproperties";
+        testSource = "$MOBILITYDIR/examples/documentproperties"
+        testGoal = "Verify that video files can be displayed";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify app launches normally |
+            | Select 'Videos' in menu | Verify that video files can be displayed |
+        "));
+    },
+}
diff --git a/tests/systemtests/sys_location/sys_location.qtt b/tests/systemtests/sys_location/sys_location.qtt
index 7900eceeef..d6afa33bef 100644
--- a/tests/systemtests/sys_location/sys_location.qtt
+++ b/tests/systemtests/sys_location/sys_location.qtt
@@ -465,7 +465,8 @@ testcase = {
         select("Service Providers");
         select("nokia");
         select("Set Service Provider");
-
+        prompt("Verify selected service provider is indicated as current service provider");
+        /*
         prompt(twiki("---+++ " + testTitle + "<br><br>
             *Goal:* " + testGoal + "<br>
             *Pre-Requisites:* " + testPreconditions + "<br>
@@ -475,6 +476,7 @@ testcase = {
             | *Step* | *Verification* |
             | | Verify selected service provider is indicated as current service provider |
         "));
+        */
     },
 
     request_route_from_one_GPS_location_to_another_data: {
@@ -505,7 +507,8 @@ testcase = {
         enter(lat2);
         enter(long2);
         select("Ok");
-
+        prompt("Wait until the route is calculated (should be less than 10 seconds), verify the there are 8 segments, first and last instructions indicate to 'Head toward Logan rd' and 'Turn right onto Bartley St'");
+        /*
         prompt(twiki("---+++ " + testTitle + "<br><br>
             *Goal:* " + testGoal + "<br>
             *Pre-Requisites:* " + testPreconditions + "<br>
@@ -515,7 +518,7 @@ testcase = {
             | *Step* | *Verification* |
             | Wait until the route is calculated (should be less than 10 seconds) | Verify the there are 8 segments, first and last instructions indicate to 'Head toward Logan rd' and 'Turn right onto Bartley St' |
         "));
-
+        */
         select("routes/route");
         compare(getText("distance"), distance1);
         select("Request Route");
@@ -524,7 +527,8 @@ testcase = {
         enter(lat1);
         enter(long1);
         select("Ok");
-
+        prompt("Wait until the route is calculated (should be less than 10 seconds),verify the instructions for segments 1 and 2 indicate to Head towards Sedgebrook st and Turn right onto Sedgebrook st");
+        /*
         prompt(twiki("---+++ " + testTitle + "<br><br>
             *Goal:* " + testGoal + "<br>
             *Pre-Requisites:* " + testPreconditions + "<br>
@@ -534,7 +538,7 @@ testcase = {
             | *Step* | *Verification* |
             | Wait until the route is calculated (should be less than 10 seconds) | Verify the instructions for segments 1 and 2 indicate to Head towards Sedgebrook st and Turn right onto Sedgebrook st |
         "));
-
+        */
         compare(getText("distance"), distance2);
     },
     
diff --git a/tests/systemtests/sys_messaging/sys_messaging.qtt b/tests/systemtests/sys_messaging/sys_messaging.qtt
index c1ed32e470..3f5e866851 100755
--- a/tests/systemtests/sys_messaging/sys_messaging.qtt
+++ b/tests/systemtests/sys_messaging/sys_messaging.qtt
@@ -50,7 +50,7 @@ testcase = {
         testSource = "$MOBILITYDIR/demos/serviceactions";
         testGoal = "Verify that a message can be sent in plain text.";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -74,7 +74,7 @@ testcase = {
          testSource = "$MOBILITYDIR/demos/serviceactions";
          testGoal = "Verify that a message can be sent in HTML.";
          testPreconditions = "None";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -98,7 +98,7 @@ testcase = {
          testSource = "$MOBILITYDIR/demos/serviceactions";
          testGoal = "Verify that a message can be sent with an attachment.";
          testPreconditions = "None";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -123,7 +123,7 @@ testcase = {
         testSource = "$MOBILITYDIR/examples/querymessages";
         testGoal = "Verify that received messages can be queried.";
         testPreconditions = "*querymessage* is a console application, it must be launched from command line, and the results are shown on command line only<br>Currently the test is not available for Symbian platforms.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -150,7 +150,7 @@ testcase = {
      testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
      testGoal = "Verify that messages can be searched.";
      testPreconditions = "A set of test messages sent on a range of dates from various contacts to the phone using Nokia Ovi Suite or an equal tool are available on the device.";
-     testGroups = "BAT";
+     testGroups = "BAT_MOBILITY";
      testRequirements = " ";
 
      // Test steps
@@ -178,7 +178,7 @@ testcase = {
       testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
       testGoal = "Verify that messages can be received.";
       testPreconditions = "There are some messages in Email account, and network is available.";
-      testGroups = "BAT";
+      testGroups = "BAT_MOBILITY";
       testRequirements = " ";
 
       // Test steps
@@ -205,7 +205,7 @@ testcase = {
        testSource = "$MOBILITYDIR/examples/keepintouch";
        testGoal = "Verify that an messages can be shown.";
        testPreconditions = "A set of test messages sent on a range of dates from various contacts to the phone using Nokia Ovi Suite or an equal tool are available on the device.";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -232,7 +232,7 @@ testcase = {
          testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that messages can be deleted.";
          testPreconditions = "Some messages are available in Email account, and network available.";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -259,7 +259,7 @@ testcase = {
        testSource = "$MOBILITYDIR/examples/writemessage";
        testGoal = "Verify that an SMS message can be sent.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -284,7 +284,7 @@ testcase = {
        testSource = "$MOBILITYDIR/manual/messagingex";
        testGoal = "Verify that an SMS message can be saved.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -309,7 +309,7 @@ testcase = {
           testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
           testGoal = "Verify that an SMS message can be read.";
           testPreconditions = "Some messages in SMS account, and network available";
-          testGroups = "BAT";
+          testGroups = "BAT_MOBILITY";
           testRequirements = " ";
 
           // Test steps
@@ -337,7 +337,7 @@ testcase = {
          testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that an SMS messages can be composed and transferred to native client.";
          testPreconditions = "None";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -363,7 +363,7 @@ testcase = {
        testSource = "$MOBILITYDIR/examples/writemessage";
        testGoal = "Verify that an MMS message can be sent.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -392,7 +392,7 @@ testcase = {
        testSource = "$MOBILITYDIR/manual/messagingex";
        testGoal = "Verify that an MMS message can be saved.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -421,7 +421,7 @@ testcase = {
           testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
           testGoal = "Verify that an MMS message can be read.";
           testPreconditions = "Some messages in MMS account, and network available";
-          testGroups = "BAT";
+          testGroups = "BAT_MOBILITY";
           testRequirements = " ";
 
           // Test steps
@@ -449,7 +449,7 @@ testcase = {
          testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that an MMS message can be composed.";
          testPreconditions = "None";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -476,7 +476,7 @@ testcase = {
          testSource = "$MOBILITYDIR/examples/writemessage";
          testGoal = "Verify that an EMail message can be sent.";
          testPreconditions = "an Email account called *Email* exists on the device";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -509,7 +509,7 @@ testcase = {
        testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
        testGoal = "Verify that account settings can be send with various encoding formats.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -539,7 +539,7 @@ testcase = {
          testSource = "$MOBILITYDIR/manual/messagingex";
          testGoal = "Verify that an EMail message can be saved.";
          testPreconditions = "Email account called *Email* exists on the device";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -571,7 +571,7 @@ testcase = {
    1. Email account called *Email* exists on the device<br>
    1. Email accounts contains valid messages.<br>
    1. Network is available.<br>";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -599,7 +599,7 @@ testcase = {
         testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
         testGoal = "Verify that an messages can be composed.";
         testPreconditions = "At least one email account exists on the phone.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -627,7 +627,7 @@ testcase = {
         testSource = "$MOBILITYDIR/examples/keepintouch";
         testGoal = "Verify that contacts meeting specific parameters can be queried.";
         testPreconditions = "test messages received on a range of dates from various contacts are available on the phone.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -655,7 +655,7 @@ testcase = {
            testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
            testGoal = "Verify that accounts can be searched by name.";
            testPreconditions = "A set of accounts exist on the device.";
-           testGroups = "BAT";
+           testGroups = "BAT_MOBILITY";
            testRequirements = " ";
 
            // Test steps
@@ -679,7 +679,7 @@ testcase = {
          testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that messages can be searched by account ID.";
          testPreconditions = "A set of test messages sent on a range of dates from various contacts to the phone using Nokia Ovi Suite or an equal tool are available on the device.";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -703,7 +703,7 @@ testcase = {
        testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
        testGoal = "Verify that account settings can be set.";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
        testRequirements = " ";
 
        // Test steps
@@ -724,6 +724,32 @@ testcase = {
           "));
       },
 
+    filter_message : function() {
+        // Test meta data
+        testTitle = "Messaging - Filter Message";
+        testBinary = "testQtMessaging";
+        testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
+        testGoal = "Verify that messages can be filter by the filter proxy.";
+        testPreconditions = "There are different types of messages in the phone.";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Select Search Messsages tab | |
+            | Select a search type | |
+            | Fill in according parameters | |
+            | Click on Make Query (=Search) | Verify correct messages are shown follow the filter proxy |
+            | Repeat these steps with different search type | Verify correct messages are shown follow the filter proxy |
+  "));
+},
+
 /*
     New tests to be considered
       Search_Cross_Email_Account_Types
diff --git a/tests/systemtests/sys_multimedia/sys_multimedia.qtt b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
index b50e653350..4be691fe31 100755
--- a/tests/systemtests/sys_multimedia/sys_multimedia.qtt
+++ b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
@@ -73,7 +73,7 @@ A device specific headset is required to be connected to device for radio testin
         testSource = "$MOBILITYDIR/demos/player";
         testGoal = "Verify that Audio files can be played.";
         testPreconditions = "Audio files in " + extension + " format are available on device.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -103,14 +103,14 @@ A device specific headset is required to be connected to device for radio testin
          testSource = "$MOBILITYDIR/demos/player";
          testGoal = "Verify that Audio files can be controled.";
          testPreconditions = "a test "+extension+" file is available on device";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
-             *Goal:* " + testGoal + "<br>
-             *Pre-Requisites:* " + testPreconditions + "<br>
-             *Tested Binary:* " + testBinary + "<br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
 
             | *Step* | *Verification* |
             | Launch " + testBinary + " | App launches normally |
@@ -154,35 +154,35 @@ A device specific headset is required to be connected to device for radio testin
 
     seek_controls_for_audio: function(extension, filename, format)
     {
-         // Test meta data
-         testTitle = "Multimedia - Audio Seek Controls";
-         testBinary = "player";
-         testSource = "$MOBILITYDIR/demos/player";
-         testGoal = "Verify that audio files can be 'searched'";
-         testPreconditions = "a test "+extension+" file is available on device";
-         testGroups = "BAT";
-         testRequirements = " ";
+        // Test meta data
+        testTitle = "Multimedia - Audio Seek Controls";
+        testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
+        testGoal = "Verify that audio files can be 'searched'";
+        testPreconditions = "a test "+extension+" file is available on device";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
 
-         // Test steps
-         prompt(twiki("---+++ " + testTitle + "<br><br>
-             *Goal:* " + testGoal + "<br>
-             *Pre-Requisites:* " + testPreconditions + "<br>
-             *Tested Binary:* " + testBinary + "<br>
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
 
-            | *Step* | *Verification* |
-            | Launch " + testBinary + " | App launches normally |
-            | Select [Open] | |
-            | In [Open File] select the "+filename+extension+" file to return to player UI | |
-            | Select [Play] to play the file | |
-            | Select the [1.0] (Multiplier) control. | |
-            | Select [2.0] | |
-            | Verify that file is playing at double speed | |
-            | With multiplier control set on [2.0], select a new file from the playlist window | Verify that the  Multiplier control has reverted back to [1.0] |
-            | | Verify that the audio is playing at normal speed |
-            | Select [Multiplier] control. | |
-            | Select [0.5] | Verify that file is playing at half speed |
-            | With multiplier control set on [0.5], select a new file from the playlist window | Verify that the  Multiplier control has reverted back to [1.0] |
-            | | Verify that the audio is playing at normal speed |
+           | *Step* | *Verification* |
+           | Launch " + testBinary + " | App launches normally |
+           | Select [Open] | |
+           | In [Open File] select the "+filename+extension+" file to return to player UI | |
+           | Select [Play] to play the file | |
+           | Select the [1.0] (Multiplier) control. | |
+           | Select [2.0] | |
+           | Verify that file is playing at double speed | |
+           | With multiplier control set on [2.0], select a new file from the playlist window | Verify that the  Multiplier control has reverted back to [1.0] |
+           | | Verify that the audio is playing at normal speed |
+           | Select [Multiplier] control. | |
+           | Select [0.5] | Verify that file is playing at half speed |
+           | With multiplier control set on [0.5], select a new file from the playlist window | Verify that the  Multiplier control has reverted back to [1.0] |
+           | | Verify that the audio is playing at normal speed |
       "));
     },
 
@@ -192,28 +192,28 @@ A device specific headset is required to be connected to device for radio testin
 
     play_a_video_file: function(extension, filename, format)
     {
-      // Test meta data
-      testTitle = "Multimedia - Play Video File";
-      testBinary = "player";
-      testSource = "$MOBILITYDIR/demos/player";
-      testGoal = "Verify that video files can be played. ";
-      testPreconditions = "a test "+extension+" file is available on device.";
-      testGroups = "BAT";
-      testRequirements = " ";
-
-      // Test steps
-      prompt(twiki("---+++ " + testTitle + "<br><br>
-          *Goal:* " + testGoal + "<br>
-          *Pre-Requisites:* " + testPreconditions + "<br>
-          *Tested Binary:* " + testBinary + "<br>
-
-         | *Step* | *Verification* |
-         | Launch " + testBinary + " | App launches normally |
-         | Select [Open] | |
-         | In [Open File] select the "+filename+extension+" file to return to player UI | |
-         | Select [Play] to play the file | Verify selected file has populated playlist |
-         | Highlight file in playlist by clicking on it | |
-         | Select [Play] | Verify that .MP4 file is playing on device |
+        // Test meta data
+        testTitle = "Multimedia - Play Video File";
+        testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
+        testGoal = "Verify that video files can be played. ";
+        testPreconditions = "a test "+extension+" file is available on device.";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Select [Open] | |
+            | In [Open File] select the "+filename+extension+" file to return to player UI | |
+            | Select [Play] to play the file | Verify selected file has populated playlist |
+            | Highlight file in playlist by clicking on it | |
+            | Select [Play] | Verify that .MP4 file is playing on device |
       "));
     },
 
@@ -223,124 +223,124 @@ A device specific headset is required to be connected to device for radio testin
 
     basic_controls_for_video: function(extension, filename, format)
     {
-      // Test meta data
-      testTitle = "Multimedia - Video Controls";
-      testBinary = "player";
-      testSource = "$MOBILITYDIR/demos/player";
-      testGoal = "Verify that video file replay can be start/stop/paused";
-      testPreconditions = "a test "+extension+" file is available on device.";
-      testGroups = "BAT";
-      testRequirements = " ";
-
-      // Test steps
-      prompt(twiki("---+++ " + testTitle + "<br><br>
-          *Goal:* " + testGoal + "<br>
-          *Pre-Requisites:* " + testPreconditions + "<br>
-          *Tested Binary:* " + testBinary + "<br>
-
-         | *Step* | *Verification* |
-         | Launch " + testBinary + " | App launches normally |
-         | Select [Open] | |
-         | In [Open File] select the "+filename+extension+" file to return to player UI | |
-         | Select [Play] to play the file | |
-         | Select [Pause] | Verify that file has paused |
-         | | Verify that the [Pause] icon has changed to a [Play] icon |
-         | Select [Play] | Verify that the [Play] icon has changed to a [Pause] icon |
-         | | Verify that file continues to play from where previously paused. |
-         | Select [Next File] | Verify that next file in playlist is playing from start |
-         | After some time (10-20 sec) Select [Beginning of File] control | Verify that current file is being played from start |
-         | Let arbitrary time pass, then Select [Beginning of File] control twice in quick succession.| Verify that previous file in playlist is playing from start |
-         | Select [Stop] | Verify that file has stopped playing |
-         | Select [Play] | Verify that file continues to play from start of file. |
-         | Let file play till end | Verify player stops at end of file. |
-         | Start playing file. | |
-         | After arbitrary time, Select [Stop] | |
-         | Select [Next File] | Verify that next file in playlist is highlighted |
-         | | Verify that file is not automatically playing |
-         | Select [Beginning of File] | Verify that previous file in playlist is highlighted |
-         | Select file in playlist | Verify that file plays in player. |
-         | Select number of files greater than can be displayed without scrolling in to playlist | Verify that list can be scrolled through |
-         | With file playing, verify that hardware keys can change volume up and down | |
-         | With file playing, verify that UI volume control slider can change volume up and down | |
-         | Select volume at 50% (or thereabout) | |
-         | Select [Mute] control | Verify that sound is muted while file is playing |
-         | | Verify that [Mute] control is displaying the Muted icon |
-         | Select [Mute] control again | Verify that sound has reverted back to level selected prior to muting |
-         | Drag positional slider to right, then release | Verify that player continues to play file at later part of file |
-         | Drag positional slider to left, then release | Verify that player continues to play file at earlier part of file |
-         | Start playing file | |
-         | Select [FullScreen] control | Verify that video is now playing in Fullscreen mode |
-         | When at end of current file | Verify that next file in playlist is being played |
-         | When at last file in playlist and at end of file | Verify that fullscreen mode is exited and user returned to player interface and that [FullScreen] is no longer selected. |
+        // Test meta data
+        testTitle = "Multimedia - Video Controls";
+        testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
+        testGoal = "Verify that video file replay can be start/stop/paused";
+        testPreconditions = "a test "+extension+" file is available on device.";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Select [Open] | |
+            | In [Open File] select the "+filename+extension+" file to return to player UI | |
+            | Select [Play] to play the file | |
+            | Select [Pause] | Verify that file has paused |
+            | | Verify that the [Pause] icon has changed to a [Play] icon |
+            | Select [Play] | Verify that the [Play] icon has changed to a [Pause] icon |
+            | | Verify that file continues to play from where previously paused. |
+            | Select [Next File] | Verify that next file in playlist is playing from start |
+            | After some time (10-20 sec) Select [Beginning of File] control | Verify that current file is being played from start |
+            | Let arbitrary time pass, then Select [Beginning of File] control twice in quick succession.| Verify that previous file in playlist is playing from start |
+            | Select [Stop] | Verify that file has stopped playing |
+            | Select [Play] | Verify that file continues to play from start of file. |
+            | Let file play till end | Verify player stops at end of file. |
+            | Start playing file. | |
+            | After arbitrary time, Select [Stop] | |
+            | Select [Next File] | Verify that next file in playlist is highlighted |
+            | | Verify that file is not automatically playing |
+            | Select [Beginning of File] | Verify that previous file in playlist is highlighted |
+            | Select file in playlist | Verify that file plays in player. |
+            | Select number of files greater than can be displayed without scrolling in to playlist | Verify that list can be scrolled through |
+            | With file playing, verify that hardware keys can change volume up and down | |
+            | With file playing, verify that UI volume control slider can change volume up and down | |
+            | Select volume at 50% (or thereabout) | |
+            | Select [Mute] control | Verify that sound is muted while file is playing |
+            | | Verify that [Mute] control is displaying the Muted icon |
+            | Select [Mute] control again | Verify that sound has reverted back to level selected prior to muting |
+            | Drag positional slider to right, then release | Verify that player continues to play file at later part of file |
+            | Drag positional slider to left, then release | Verify that player continues to play file at earlier part of file |
+            | Start playing file | |
+            | Select [FullScreen] control | Verify that video is now playing in Fullscreen mode |
+            | When at end of current file | Verify that next file in playlist is being played |
+            | When at last file in playlist and at end of file | Verify that fullscreen mode is exited and user returned to player interface and that [FullScreen] is no longer selected. |
        "));
     },
 
     seek_controls_for_video: function()
     {
-       // Test meta data
-       testTitle = "Multimedia - Video Seek";
-       testBinary = "player";
-       testSource = "$MOBILITYDIR/demos/player";
-       testGoal = "Verify that video files can be played at various replay speeds (search mode).";
-       testPreconditions = "Video files are available for testing on the device.";
-       testGroups = "BAT";
-       testRequirements = " ";
-
-       // Test steps
-       prompt(twiki("---+++ " + testTitle + "<br><br>
-           *Goal:* " + testGoal + "<br>
-           *Pre-Requisites:* " + testPreconditions + "<br>
-           *Tested Binary:* " + testBinary + "<br>
-
-          | *Step* | *Verification* |
-          | Launch " + testBinary + " | App launches normally |
-          | While playing a video file, Select or Tap on [1.0] (Multiplier) control | |
-          | Select [2.0] | Verify that file is playing at double speed |
-          | Select [Multiplier] control | |
-          | Select [0.5] | Verify that file is playing at half speed |
+        // Test meta data
+        testTitle = "Multimedia - Video Seek";
+        testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
+        testGoal = "Verify that video files can be played at various replay speeds (search mode).";
+        testPreconditions = "Video files are available for testing on the device.";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | While playing a video file, Select or Tap on [1.0] (Multiplier) control | |
+            | Select [2.0] | Verify that file is playing at double speed |
+            | Select [Multiplier] control | |
+            | Select [0.5] | Verify that file is playing at half speed |
         "));
     },
 
     basic_controls_for_streamed_content: function()
     {
 
-//*Note* Functionality for this feature is being implemented due to bugs in .m3u playback on Maemo. Once resolved, this test will revert back to its original form
-//*Note* In order to play stream on Maemo, invoke player with following command from console:
-//            run-standalone.sh ./player http://202.6.74.107:8060/triplej.mp3
-//*Note* For this test you need a playlist of streaming media urls. Suggest: http://202.6.74.107:8060/triplej.mp3 ; http://www.abc.net.au/streaming/triplej.asx ; rtsp://media1.abc.net.au/broadcast/triplej.rm ; mms://media3.abc.net.au/triplej ; depending on your platform and backend support.
-
-       // Test meta data
-       testTitle = "Multimedia - Content Streaming";
-       testBinary = "player";
-       testSource = "$MOBILITYDIR/demos/player";
-       testGoal = "Verify that streaming playlist can be played.";
-       testPreconditions = "None";
-       testGroups = "BAT";
-       testRequirements = " ";
-
-       // Test steps
-       prompt(twiki("---+++ " + testTitle + "<br><br>
-           *Goal:* " + testGoal + "<br>
-           *Pre-Requisites:* " + testPreconditions + "<br>
-           *Tested Binary:* " + testBinary + "<br>
-
-          | *Step* | *Verification* |
-          | Launch " + testBinary + " | App launches normally |
-          | In player application, Select or Tap [Open] | |
-          | In [Open File] navigate and highlight test (streaming) playlist file | |
-          | Select or Tap on selected file to return to player UI | Verify selected file has populated playlist |
-          | Highlight file in playlist by selecting or clicking it | |
-          | Select [Play] | Verify that stream is playing on device |
-          | Select [Pause] | Verify that stream is paused on device |
-          | | Verify that the [Pause] button has changed to a [Play] button |
-          | Select [Play] again | Verify that stream is playing on device |
-          | Select [Stop] | |
-          | Open local mp3 file in to play list and select it to play | Verify that the mp3 plays while the stream name is still present in the playlist |
-          | Re-select the stream in the playlist | Verify that the stream starts playing again |
-          | Select [Next File] | Verify that the player started playing the next file in the playlist |
-          | Select [Previous File] | Verify that the original stream is playing again |
-          | During stream playback, have headphones connected to device | Verify that the sound is now playing through the headphones |
-          | Invoke a system notification on the device (such as an incoming SMS) | Verify that the device correctly transmits the audible system notification through the devices speakers and then returns to playing the stream through the headphones |
+    //*Note* Functionality for this feature is being implemented due to bugs in .m3u playback on Maemo. Once resolved, this test will revert back to its original form
+    //*Note* In order to play stream on Maemo, invoke player with following command from console:
+    //run-standalone.sh ./player http://202.6.74.107:8060/triplej.mp3
+    //*Note* For this test you need a playlist of streaming media urls. Suggest: http://202.6.74.107:8060/triplej.mp3 ; http://www.abc.net.au/streaming/triplej.asx ; rtsp://media1.abc.net.au/broadcast/triplej.rm ; mms://media3.abc.net.au/triplej ; depending on your platform and backend support.
+
+        // Test meta data
+        testTitle = "Multimedia - Content Streaming";
+        testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
+        testGoal = "Verify that streaming playlist can be played.";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | In player application, Select or Tap [Open] | |
+            | In [Open File] navigate and highlight test (streaming) playlist file | |
+            | Select or Tap on selected file to return to player UI | Verify selected file has populated playlist |
+            | Highlight file in playlist by selecting or clicking it | |
+            | Select [Play] | Verify that stream is playing on device |
+            | Select [Pause] | Verify that stream is paused on device |
+            | | Verify that the [Pause] button has changed to a [Play] button |
+            | Select [Play] again | Verify that stream is playing on device |
+            | Select [Stop] | |
+            | Open local mp3 file in to play list and select it to play | Verify that the mp3 plays while the stream name is still present in the playlist |
+            | Re-select the stream in the playlist | Verify that the stream starts playing again |
+            | Select [Next File] | Verify that the player started playing the next file in the playlist |
+            | Select [Previous File] | Verify that the original stream is playing again |
+            | During stream playback, have headphones connected to device | Verify that the sound is now playing through the headphones |
+            | Invoke a system notification on the device (such as an incoming SMS) | Verify that the device correctly transmits the audible system notification through the devices speakers and then returns to playing the stream through the headphones |
         "));
     },
 
@@ -352,7 +352,7 @@ A device specific headset is required to be connected to device for radio testin
         testSource = "$MOBILITYDIR/examples/radio";
         testGoal = "Verify that radio stations can be played.";
         testPreconditions = "1. This test requires radio reception and headphones to be connected to device.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -361,18 +361,18 @@ A device specific headset is required to be connected to device for radio testin
             *Pre-Requisites:* " + testPreconditions + "<br>
             *Tested Binary:* " + testBinary + "<br>
 
-           | *Step* | *Verification* |
-           | Launch " + testBinary + " | App launches normally |
-           | | Verify that 0 KHz and No Signal is displayed |
-           | Select [Scan Up] | Audible white noise should be heard as the radio searches for a frequency lock. Frequency should be increasing in 100 KHz steps until a strong signal is found |
-           | | Verify that a radio signal can be heard. It is possible for the radio to lock on a silent station signal, in that case progress further up the frequencies |
-           | Once a strong audible signal is found | Verify that the stations frequency and Got Signal message is displayed |
-           | Select [Scan Up] | Verify that the radio has moved off the previous station and in progressing through the frequencies |
-           | Once on a radio station, Select [Freq Up] | Verify that the radio frequency has moved off the station by 100KHz and is stationary |
-           | Select [Freq Up] again | Verify that the radio frequency has moved up another 100KHz and is stationary |
-           | Select [Freq Down] twice | Verify that you are now at the frequency of the previous radio station and that the signal is audible |
-           | Select [Scan Down] | Verify that the radio has moved off the previous station, progressing through the frequencies, and finds the original station from this test |
-           | Exit the radio application | Verify that the radio station is no longer heard |
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | | Verify that 0 KHz and No Signal is displayed |
+            | Select [Scan Up] | Audible white noise should be heard as the radio searches for a frequency lock. Frequency should be increasing in 100 KHz steps until a strong signal is found |
+            | | Verify that a radio signal can be heard. It is possible for the radio to lock on a silent station signal, in that case progress further up the frequencies |
+            | Once a strong audible signal is found | Verify that the stations frequency and Got Signal message is displayed |
+            | Select [Scan Up] | Verify that the radio has moved off the previous station and in progressing through the frequencies |
+            | Once on a radio station, Select [Freq Up] | Verify that the radio frequency has moved off the station by 100KHz and is stationary |
+            | Select [Freq Up] again | Verify that the radio frequency has moved up another 100KHz and is stationary |
+            | Select [Freq Down] twice | Verify that you are now at the frequency of the previous radio station and that the signal is audible |
+            | Select [Scan Down] | Verify that the radio has moved off the previous station, progressing through the frequencies, and finds the original station from this test |
+            | Exit the radio application | Verify that the radio station is no longer heard |
          "));
     },
 
@@ -384,7 +384,7 @@ A device specific headset is required to be connected to device for radio testin
         testSource = "$MOBILITYDIR/examples/radio";
         testGoal = "Verify that radio play can be interrupted by system notifications.";
         testPreconditions = "1. Audible system notifications should be enabled for this test.<br>2. This test requires radio reception and headphones to be connected to device.";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -393,36 +393,36 @@ A device specific headset is required to be connected to device for radio testin
             *Pre-Requisites:* " + testPreconditions + "<br>
             *Tested Binary:* " + testBinary + "<br>
 
-           | *Step* | *Verification* |
-           | Launch " + testBinary + " | App launches normally |
-           | Locate a strong radio station signal by scanning upwards | |
-           | While on a strong and audible radio signal, evoke a system notification on device (eg: incoming SMS, alarm notification) | Verify that after the system notification has been delivered, the radio reverts to outputting the audio signal back through the headphones |
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Locate a strong radio station signal by scanning upwards | |
+            | While on a strong and audible radio signal, evoke a system notification on device (eg: incoming SMS, alarm notification) | Verify that after the system notification has been delivered, the radio reverts to outputting the audio signal back through the headphones |
          "));
     },
 
     radio_volume_control: function()
     {
-     // Test meta data
-     testTitle = "Multimedia - Radio Volume Control";
-     testBinary = "radio";
-     testSource = "$MOBILITYDIR/examples/radio";
-     testGoal = "Verify that the radio volume can be controlled.";
-     testPreconditions = "1. This test requires radio reception and headphones to be connected to device.";
-     testGroups = "BAT";
-     testRequirements = " ";
-
-     // Test steps
-     prompt(twiki("---+++ " + testTitle + "<br><br>
-         *Goal:* " + testGoal + "<br>
-         *Pre-Requisites:* " + testPreconditions + "<br>
-         *Tested Binary:* " + testBinary + "<br>
-
-        | *Step* | *Verification* |
-        | Launch " + testBinary + " | App launches normally |
-        | Locate a strong radio station signal by scanning upwards | |
-        | While on a strong and audible radio signal, move volume slider to the right | Verify that the audio volume of the radio station is amplified |
-        | Move volume slider to the left | Verify that the audio volume is lowered |
-        | Move the volume slider all the way to the left | Verify that the sound is now completely muted |
+        // Test meta data
+        testTitle = "Multimedia - Radio Volume Control";
+        testBinary = "radio";
+        testSource = "$MOBILITYDIR/examples/radio";
+        testGoal = "Verify that the radio volume can be controlled.";
+        testPreconditions = "1. This test requires radio reception and headphones to be connected to device.";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+             | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Locate a strong radio station signal by scanning upwards | |
+            | While on a strong and audible radio signal, move volume slider to the right | Verify that the audio volume of the radio station is amplified |
+            | Move volume slider to the left | Verify that the audio volume is lowered |
+            | Move the volume slider all the way to the left | Verify that the sound is now completely muted |
        "));
     },
 
@@ -434,7 +434,7 @@ A device specific headset is required to be connected to device for radio testin
          testSource = "$MOBILITYDIR/examples/camera";
          testGoal = "Verify that a photo can be made with the camera.";
          testPreconditions = "None";
-         testGroups = "BAT";
+         testGroups = "BAT_MOBILITY";
          testRequirements = " ";
 
          // Test steps
@@ -455,33 +455,33 @@ A device specific headset is required to be connected to device for radio testin
           "));
     },
 
-change_camera_settings: function()
-{
-     // Test meta data
-     testTitle = "Multimedia - Photo Camera";
-     testBinary = "camera";
-     testSource = "$MOBILITYDIR/examples/camera";
-     testGoal = "Verify that the camera can change its Still Camera settings successfully.";
-     testPreconditions = "None";
-     testGroups = "BAT";
-     testRequirements = " ";
-
-     // Test steps
-     prompt(twiki("---+++ " + testTitle + "<br><br>
-         *Goal:* " + testGoal + "<br>
-         *Pre-Requisites:* " + testPreconditions + "<br>
-         *Tested Binary:* " + testBinary + "<br>
-
-        | *Step* | *Verification* |
-        | Launch " + testBinary + " | App launches normally |
-        | If device has lens cover, make sure it is open | |
-        | Change Exposure Compensatioin on the slider in the main UI | Verify that the change in value affects the picture qwality in expected fashion |
-        | Select Settings/File/Setrtings | Verify that you have an option to change Image Resolution, Image Format and Quality |
-        | Change Image Resolution to another supported resolution | Verify that you can take stills with various resolutions |
-        | Change Image Format to another supported format | Verify that you can take stills with various Image Formats |
-        | Sellect Settings/Device/Secondary Device | Verify that you can see the view from the Front Facing Camera on the viewfinder |
-        |  | Varify that you can take still images from the Front Facing Camera |
-        | Select Settings/File/Exit | Verify that the application has now closed |
+    change_camera_settings: function()
+    {
+        // Test meta data
+        testTitle = "Multimedia - Photo Camera";
+        testBinary = "camera";
+        testSource = "$MOBILITYDIR/examples/camera";
+        testGoal = "Verify that the camera can change its Still Camera settings successfully.";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | If device has lens cover, make sure it is open | |
+            | Change Exposure Compensatioin on the slider in the main UI | Verify that the change in value affects the picture qwality in expected fashion |
+            | Select Settings/File/Setrtings | Verify that you have an option to change Image Resolution, Image Format and Quality |
+            | Change Image Resolution to another supported resolution | Verify that you can take stills with various resolutions |
+            | Change Image Format to another supported format | Verify that you can take stills with various Image Formats |
+            | Sellect Settings/Device/Secondary Device | Verify that you can see the view from the Front Facing Camera on the viewfinder |
+            |  | Varify that you can take still images from the Front Facing Camera |
+            | Select Settings/File/Exit | Verify that the application has now closed |
 
       "));
 },
@@ -494,7 +494,7 @@ change_camera_settings: function()
         testSource = "$MOBILITYDIR/examples/camera";
         testGoal = "Verify that the camera can capture and save an audio/video file.";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
@@ -526,12 +526,12 @@ change_camera_settings: function()
         testSource = "$MOBILITYDIR/examples/camera";
         testGoal = "Verify that the camera can change its Video settings successfully.";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
         testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
-             *Goal:* " + testGoal + "<br>
+            *Goal:* " + testGoal + "<br>
             *Pre-Requisites:* " + testPreconditions + "<br>
             *Tested Binary:* " + testBinary + "<br>
 
@@ -556,118 +556,118 @@ change_camera_settings: function()
     record_an_audio_file: function()
     {
 
-// Note: On Maemo5, accepting the default for Input Device, Audio Codec, File Container and Sample Rate will produce a valid audio file.
-// Note: Selecting the alternative selection, if available, works as well.
-
-      // Test meta data
-      testTitle = "Multimedia - Recording Audio";
-      testBinary = "audiorecorder";
-      testSource = "$MOBILITYDIR/examples/audiorecorder";
-      testGoal = "Verify that audio can be recorded.";
-      testPreconditions = "None";
-      testGroups = "BAT";
-      testRequirements = " ";
-
-      // Test steps
-      prompt(twiki("---+++ " + testTitle + "<br><br>
-          *Goal:* " + testGoal + "<br>
-          *Pre-Requisites:* " + testPreconditions + "<br>
-          *Tested Binary:* " + testBinary + "<br>
-
-         | *Step* | *Verification* |
-         | Launch " + testBinary + " | App launches normally |
-         | Select Input Device | |
-         | Select Audio Codec | |
-         | Select File Container | |
-         | Select Sample Rate | |
-         | Select Quality and Bitrate | |
-         | Select Output... and select location and name of output file | |
-         | Select Record | Verify that [Record] button has changed in to [Stop] |
-         | | Verify that Duration is counting seconds |
-         | | Verify that Recording is displayed |
-         | Select Stop | Verify that Duration is now 0 |
-         | Select Output File in file browser | Verify that an audio file has been generated |
-         | Play output file in media player | Verify that audible audio is recorded in file |
+        // Note: On Maemo5, accepting the default for Input Device, Audio Codec, File Container and Sample Rate will produce a valid audio file.
+        // Note: Selecting the alternative selection, if available, works as well.
+
+        // Test meta data
+        testTitle = "Multimedia - Recording Audio";
+        testBinary = "audiorecorder";
+        testSource = "$MOBILITYDIR/examples/audiorecorder";
+        testGoal = "Verify that audio can be recorded.";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+           | *Step* | *Verification* |
+           | Launch " + testBinary + " | App launches normally |
+           | Select Input Device | |
+           | Select Audio Codec | |
+           | Select File Container | |
+           | Select Sample Rate | |
+           | Select Quality and Bitrate | |
+           | Select Output... and select location and name of output file | |
+           | Select Record | Verify that [Record] button has changed in to [Stop] |
+           | | Verify that Duration is counting seconds |
+           | | Verify that Recording is displayed |
+           | Select Stop | Verify that Duration is now 0 |
+           | Select Output File in file browser | Verify that an audio file has been generated |
+           | Play output file in media player | Verify that audible audio is recorded in file |
         "));
     },
 
-pause_recording_an_audio_file: function()
+    pause_recording_an_audio_file: function()
     {
-// Note: On Maemo5, accepting the default for Input Device, Audio Codec, File Container and Sample Rate will produce a valid audio file.
-// Note: Selecting the alternative selection, if available, works as well.
-
-      // Test meta data
-      testTitle = "Multimedia - Pause Recording Audio";
-      testBinary = "audiorecorder";
-      testSource = "$MOBILITYDIR/examples/audiorecorder";
-      testGoal = "Verify that audio recordings can be paused.";
-      testPreconditions = "None";
-      testGroups = "BAT";
-      testRequirements = " ";
-
-      // Test steps
-      prompt(twiki("---+++ " + testTitle + "<br><br>
-          *Goal:* " + testGoal + "<br>
-          *Pre-Requisites:* " + testPreconditions + "<br>
-          *Tested Binary:* " + testBinary + "<br>
-
-         | *Step* | *Verification* |
-         | Launch " + testBinary + " | App launches normally |
-         | Select Input Device | |
-         | Select Audio Codec | |
-         | Select File Container | |
-         | Select Sample Rate | |
-         | Select Quality and Bitrate | |
-         | Select Output... and select location and name of output file | |
-         | Select Record | Verify that [Record] button has changed in to [Stop] |
-         | | Verify that Duration is counting seconds |
-         | | Verify that Recording is displayed |
-         | Select Pause | Verify that instead of Duration, Paused is displayed |
-         | Select Resume | Verify that the counter has resumed the seconds count from where it was previously paused. |
-         | After a arbitrary time, Stop the recording. | |
-         | Select Output File in file browser | Verify that an audio file has been generated |
-         | Play output file in media player | Verify that audible audio is recorded in file and that audio is only recorded for period that Pause was not selected |
-         | | Verify there is no audible artifact that separates the two or more recording periods, that is that the joint is seamless |
+        // Note: On Maemo5, accepting the default for Input Device, Audio Codec, File Container and Sample Rate will produce a valid audio file.
+        // Note: Selecting the alternative selection, if available, works as well.
+
+        // Test meta data
+        testTitle = "Multimedia - Pause Recording Audio";
+        testBinary = "audiorecorder";
+        testSource = "$MOBILITYDIR/examples/audiorecorder";
+        testGoal = "Verify that audio recordings can be paused.";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Select Input Device | |
+            | Select Audio Codec | |
+            | Select File Container | |
+            | Select Sample Rate | |
+            | Select Quality and Bitrate | |
+            | Select Output... and select location and name of output file | |
+            | Select Record | Verify that [Record] button has changed in to [Stop] |
+            | | Verify that Duration is counting seconds |
+            | | Verify that Recording is displayed |
+            | Select Pause | Verify that instead of Duration, Paused is displayed |
+            | Select Resume | Verify that the counter has resumed the seconds count from where it was previously paused. |
+            | After a arbitrary time, Stop the recording. | |
+            | Select Output File in file browser | Verify that an audio file has been generated |
+            | Play output file in media player | Verify that audible audio is recorded in file and that audio is only recorded for period that Pause was not selected |
+            | | Verify there is no audible artifact that separates the two or more recording periods, that is that the joint is seamless |
         "));
     },
 
     play_a_slideshow: function()
     {
-       // Test meta data
-       testTitle = "Multimedia - Play Slideshow";
-       testBinary = "slideshow";
-       testSource = "$MOBILITYDIR/examples/slideshow";
-       testGoal = "Verify that a slideshow can be played.";
-       testPreconditions = "Some images are in the phone";
-       testGroups = "BAT";
-       testRequirements = " ";
-
-       // Test steps
-       prompt(twiki("---+++ " + testTitle + "<br><br>
-           *Goal:* " + testGoal + "<br>
-           *Pre-Requisites:* " + testPreconditions + "<br>
-           *Tested Binary:* " + testBinary + "<br>
-
-          | *Step* | *Verification* |
-          | Launch " + testBinary + " | App launches normally |
-          | Select [Open] Icon | |
-          | Select Directory from the list | |
-          | Navigate to desired directory | |
-          | Select desired directory containing pictures | |
-          | Select [Play] | Verify that the slideshow starts |
-          | Select [Pause] | Verify that slideshow stops on given image |
-          | Select [Play] again | Verify that slideshow resumes |
-          | Select [Next File] | Verify that slideshow jumps to next image in directory |
-          | Select [Previous File] | Verify that slideshow jumps to previous image in directory |
-          | Select [Stop] | Verify that slideshow has stopped |
-          | Select [Open] Icon | |
-          | Select Playlist from the list | |
-          | Select [Play] | Verify that slideshow starts |
-          | Select [Pause] | Verify that slideshow stops on given image |
-          | Select [Play] again | Verify that slideshow resumes |
-          | Select [Next File] | Verify that slideshow jumps to next image in directory |
-          | Select [Previous File] | Verify that slideshow jumps to previous image in directory |
-          | Select [Stop] | Verify that slideshow has stopped |
+        // Test meta data
+        testTitle = "Multimedia - Play Slideshow";
+        testBinary = "slideshow";
+        testSource = "$MOBILITYDIR/examples/slideshow";
+        testGoal = "Verify that a slideshow can be played.";
+        testPreconditions = "Some images are in the phone";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " ";
+
+        // Test steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App launches normally |
+            | Select [Open] Icon | |
+            | Select Directory from the list | |
+            | Navigate to desired directory | |
+            | Select desired directory containing pictures | |
+            | Select [Play] | Verify that the slideshow starts |
+            | Select [Pause] | Verify that slideshow stops on given image |
+            | Select [Play] again | Verify that slideshow resumes |
+            | Select [Next File] | Verify that slideshow jumps to next image in directory |
+            | Select [Previous File] | Verify that slideshow jumps to previous image in directory |
+            | Select [Stop] | Verify that slideshow has stopped |
+            | Select [Open] Icon | |
+            | Select Playlist from the list | |
+            | Select [Play] | Verify that slideshow starts |
+            | Select [Pause] | Verify that slideshow stops on given image |
+            | Select [Play] again | Verify that slideshow resumes |
+            | Select [Next File] | Verify that slideshow jumps to next image in directory |
+            | Select [Previous File] | Verify that slideshow jumps to previous image in directory |
+            | Select [Stop] | Verify that slideshow has stopped |
         "));
     },
 
diff --git a/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.pro b/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.pro
new file mode 100644
index 0000000000..dc5a6bea7b
--- /dev/null
+++ b/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.pro
@@ -0,0 +1,11 @@
+SOURCES=sys_publish_and_subscribe.qtt
+CONFIG+=systemtest
+
+unix:!symbian {
+    maemo5 {
+        target.path = /opt/usr/bin
+    } else {
+        target.path = /usr/local/bin
+    }
+    INSTALLS += target
+}
diff --git a/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.qtt b/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.qtt
new file mode 100644
index 0000000000..fa29b31053
--- /dev/null
+++ b/tests/systemtests/sys_publish_and_subscribe/sys_publish_and_subscribe.qtt
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//TESTED_COMPONENT=src/publishsubscribe
+<quote>
+Publish and Subscribe is fully tested with Unit tests and System level tests are deemed un-necessery.
+<unquote>
diff --git a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
index 9da48c0edd..b016852b15 100644
--- a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
+++ b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
@@ -168,6 +168,7 @@ function checkContact(contact)
 testcase = {
 
     // prove that the test application starts before anything else is tested.
+    /* commit this function as it doesn't use at this moment.
     run_test_application: function()
     {
         // Test meta data
@@ -188,7 +189,7 @@ testcase = {
             prompt('Verify test application started and closed without issue');
         }
     },
-
+    */
 
     check_contact_list_data : {
         ContactSet : [ exampleContactSet() ]
diff --git a/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt b/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
index 5c0f995ed0..5ed0ca4a75 100755
--- a/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
+++ b/tests/systemtests/sys_versitorganizer/sys_versitorganizer.qtt
@@ -166,4 +166,58 @@ testcase = {
             | Close " + testBinary + " | Test application closed successfully |
         "));
     },
+
+    import_ical_data_format: function()
+    {
+        // Test meta data
+        testTitle = "Versitorganizer - Export ical";
+        testBinary = "testQtOrganizer";
+        testSource = "$MOBILITYDIR/tests/applications/organizer";
+        testGoal = "Verify ical data can be imported";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " "
+
+
+        // Test Steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Test application started successfully |
+            | Select *Import and export organizer data* button | |
+            | Click *Create template* button and press *Import item* | Verify that the type, name, start time and end time in the screen right are the same as the ical data template |
+        "));
+    },
+
+    import_vcal_data_format: function()
+    {
+        // Test meta data
+        testTitle = "Versitorganizer - Export ical";
+        testBinary = "testQtOrganizer";
+        testSource = "$MOBILITYDIR/tests/applications/organizer";
+        testGoal = "Verify vcal data can be imported";
+        testPreconditions = "None";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = " "
+
+
+        // Test Steps
+        prompt(twiki("---+++ " + testTitle + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Requirements:* " + testRequirements + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Test application started successfully |
+            | Select *Import and export organizer data* button | |
+            | Click *Create template* button | |
+            | Modify the calendar data as vcal format | |
+            | Press *Import item* | Verify that the type, name, start time and end time in the screen right are the same as the vcal data |
+        "));
+    },
 }