Merge remote branch 'mainline/master'

4 files changed, 158 insertions, 57 deletions

diff --git a/tests/systemtests/sys_contacts/sys_contacts.qtt b/tests/systemtests/sys_contacts/sys_contacts.qtt
index c6f92d1d56..8b5bbee9f9 100644
--- a/tests/systemtests/sys_contacts/sys_contacts.qtt
+++ b/tests/systemtests/sys_contacts/sys_contacts.qtt
@@ -290,9 +290,11 @@ testcase = {
         // Test meta data
         testTitle = "Contacts - Add Contact";
         testBinary = "samplephonebook";
+        testSource = "$MOBILITYDIR/examples/samplephonebook";
         testGoal = "Verify that contacts can be added";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
 
         // Test steps
         startApplication(testBinary);
@@ -318,9 +320,11 @@ testcase = {
         // Test meta data
         testTitle = "Contacts - Update Contact Details";
         testBinary = "samplephonebook";
+        testSource = "$MOBILITYDIR/examples/samplephonebook";
         testGoal = "Verify that contact details can be updated";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
 
         // Test steps
         startApplication(testBinary);
@@ -353,9 +357,11 @@ testcase = {
         // Test meta data
         testTitle = "Contacts - Apply Filter";
         testBinary = "samplephonebook";
+        testSource = "$MOBILITYDIR/examples/samplephonebook";
         testGoal = "Verify the correct match of contacts against a simple filter";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
 
         // Test steps
         startApplication(testBinary);
@@ -381,9 +387,11 @@ testcase = {
        // Test meta data
        testTitle = "Contacts - Clear Filter";
        testBinary = "samplephonebook";
+       testSource = "$MOBILITYDIR/examples/samplephonebook";
        testGoal = "Verify that when the filter is cleared all contacts are visible";
        testPreconditions = "None";
-       testGroups = "BAT";
+       testGroups = "BAT_MOBILITY";
+       testRequirements = "";
 
        // Test steps
        startApplication(testBinary);
@@ -411,9 +419,11 @@ testcase = {
         // Test meta data
         testTitle = "Contacts - Delete Contact";
         testBinary = "samplephonebook";
+        testSource = "$MOBILITYDIR/examples/samplephonebook";
         testGoal = "Verify that a contact can be deleted";
         testPreconditions = "None";
-        testGroups = "BAT";
+        testGroups = "BAT_MOBILITY";
+        testRequirements = "";
 
         // Test steps
         startApplication(testBinary);
@@ -434,6 +444,8 @@ testcase = {
             checkContactExists(name2, false);
             checkContactExists(name3, false);
         }else{
+            prompt("Verify that Contacts have been deleted");
+            /*
             prompt(twiki("---+++ " + testTitle + "<br><br>
                 *Goal:* " + testGoal + "<br>
                 *Pre-Requisites:* " + testPreconditions + "<br>
@@ -441,6 +453,7 @@ testcase = {
 
                 | *Step* | *Verification* |
                 | | Verify that Contacts have been deleted:" + name1 + ", " + name2 + ", " + name3 + "|" ));
+            */
         }
     }
 
diff --git a/tests/systemtests/sys_messaging/sys_messaging.qtt b/tests/systemtests/sys_messaging/sys_messaging.qtt
index 0503617e9a..c1ed32e470 100644..100755
--- a/tests/systemtests/sys_messaging/sys_messaging.qtt
+++ b/tests/systemtests/sys_messaging/sys_messaging.qtt
@@ -43,13 +43,15 @@
 
 testcase = {
 
-    Send_PlainText_Message: function () {
+    send_plaintext_message: function () {
         // Test meta data
         testTitle = "Messaging - Send Message in Plain Text";
-        testBinary = "serviceaction";
+        testBinary = "serviceactions";
+        testSource = "$MOBILITYDIR/demos/serviceactions";
         testGoal = "Verify that a message can be sent in plain text.";
         testPreconditions = "None";
         testGroups = "BAT";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -65,13 +67,15 @@ testcase = {
        "));
     },
 
-    Send_HTML_Message : function() {
+    send_html_message : function() {
          // Test meta data
          testTitle = "Messaging - Send Message in HTML";
-         testBinary = "serviceaction";
+         testBinary = "serviceactions";
+         testSource = "$MOBILITYDIR/demos/serviceactions";
          testGoal = "Verify that a message can be sent in HTML.";
          testPreconditions = "None";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -87,13 +91,15 @@ testcase = {
          "));
     },
 
-    Compose_And_Send_Message_With_Attachment : function() {
+    compose_and_send_message_with_attachment : function() {
          // Test meta data
          testTitle = "Messaging - Compose and Send With Attachment";
-         testBinary = "serviceaction";
+         testBinary = "serviceactions";
+         testSource = "$MOBILITYDIR/demos/serviceactions";
          testGoal = "Verify that a message can be sent with an attachment.";
          testPreconditions = "None";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -110,13 +116,15 @@ testcase = {
         "));
     },
 
-    Query_Message : function() {
+    query_message : function() {
         // Test meta data
         testTitle = "Messaging - Query Messages";
         testBinary = "querymessage";
+        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";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -135,13 +143,15 @@ testcase = {
       WHat does 'according parameters' mean?
       Suggestion: search for "Like As" and "Not Like" conditions with wildcard such as %@hotmail.com
     */
-    Search_Message : function() {
+    search_message : function() {
      // Test meta data
      testTitle = "Messaging - Search Message";
      testBinary = "testQtMessaging";
+     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";
+     testRequirements = " ";
 
      // Test steps
      prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -161,13 +171,15 @@ testcase = {
       "));
     },
 
-    Receive_Message : function() {
+    receive_message : function() {
       // Test meta data
       testTitle = "Messaging - Receive Message";
       testBinary = "testQtMessaging";
+      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";
+      testRequirements = " ";
 
       // Test steps
       prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -186,13 +198,15 @@ testcase = {
           "));
       },
 
-    Show_Message : function() {
+    show_message : function() {
        // Test meta data
        testTitle = "Messaging - Show Message";
        testBinary = "keepintouch (alternative: declarativeMessaging, testQtMessaging)";
+       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";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -211,13 +225,15 @@ testcase = {
      "));
     },
 
-    Delete_Message : function() {
+    delete_message : function() {
          // Test meta data
          testTitle = "Messaging - Delete Message";
          testBinary = "testQtMessaging";
+         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";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -236,13 +252,15 @@ testcase = {
          "));
      },
 
-    Send_SMS : function() {
+    send_sms : function() {
        // Test meta data
        testTitle = "Messaging - Send SMS";
        testBinary = "writemessage (alternatives: messagingEx and testQtMessaging)";
+       testSource = "$MOBILITYDIR/examples/writemessage";
        testGoal = "Verify that an SMS message can be sent.";
        testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -259,13 +277,15 @@ testcase = {
         "));
     },
 
-    Store_SMS : function() {
+    store_sms : function() {
        // Test meta data
        testTitle = "Messaging - Store SMS";
        testBinary = "messagingex (alternatives: testQtMessaging)";
+       testSource = "$MOBILITYDIR/manual/messagingex";
        testGoal = "Verify that an SMS message can be saved.";
-       testPreconditions = "";
+       testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -282,13 +302,15 @@ testcase = {
         "));
     },
 
-    Read_SMS : function() {
+    read_sms : function() {
           // Test meta data
           testTitle = "Messaging - Read SMS";
           testBinary = "testQtMessaging";
+          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";
+          testRequirements = " ";
 
           // Test steps
           prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -308,13 +330,15 @@ testcase = {
           "));
       },
 
-    Compose_SMS : function() {
+    compose_sms : function() {
          // Test meta data
          testTitle = "Messaging - Compose SMS";
          testBinary = "testQtMessaging";
+         testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that an SMS messages can be composed and transferred to native client.";
-         testPreconditions = "";
+         testPreconditions = "None";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -332,13 +356,15 @@ testcase = {
         "));
     },
 
-    Send_MMS : function() {
+    send_mms : function() {
        // Test meta data
        testTitle = "Messaging - Send MMS";
        testBinary = "writemessage (alternatives: messagingEx and testQtMessaging)";
+       testSource = "$MOBILITYDIR/examples/writemessage";
        testGoal = "Verify that an MMS message can be sent.";
        testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -359,13 +385,15 @@ testcase = {
         "));
     },
 
-    Store_MMS : function() {
+    store_mms : function() {
        // Test meta data
        testTitle = "Messaging - Store MMS";
        testBinary = "messagingex (alternatives: testQtMessaging)";
+       testSource = "$MOBILITYDIR/manual/messagingex";
        testGoal = "Verify that an MMS message can be saved.";
-       testPreconditions = "";
+       testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -386,13 +414,15 @@ testcase = {
         "));
     },
 
-    Read_MMS : function() {
+    read_mms : function() {
           // Test meta data
           testTitle = "Messaging - Read MMS";
           testBinary = "testQtMessaging";
+          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";
+          testRequirements = " ";
 
           // Test steps
           prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -412,13 +442,15 @@ testcase = {
        "));
       },
 
-    Compose_MMS : function() {
+    compose_mms : function() {
          // Test meta data
          testTitle = "Messaging - Compose MMS";
          testBinary = "testQtMessaging";
+         testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
          testGoal = "Verify that an MMS message can be composed.";
          testPreconditions = "None";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -437,13 +469,15 @@ testcase = {
        "));
     },
 
-    Send_Email : function() {
+    send_email : function() {
          // Test meta data
          testTitle = "Messaging - Send Email";
          testBinary = "writemessage (alternatives: messagingEx and testQtMessaging)";
+         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";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -468,13 +502,15 @@ testcase = {
 
     //FIXME: This test needs to become a lot more specific, e.g. *which* encoding formats to we want to test?
     // and does that mean the test can (and should) be combined with Send_EMail??
-    Send_EMail_with_Encoding_Formats : function() {
+    send_email_with_encoding_formats : function() {
        // Test meta data
        testTitle = "Messaging - Supported Encoding Formats";
        testBinary = "testQtMessaging";
+       testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
        testGoal = "Verify that account settings can be send with various encoding formats.";
        testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -496,13 +532,15 @@ testcase = {
           "));
       },
 
-    Store_Email : function() {
+    store_email : function() {
          // Test meta data
          testTitle = "Messaging - Store EMail";
          testBinary = "messagingex (alternatives: testQtMessaging)";
+         testSource = "$MOBILITYDIR/manual/messagingex";
          testGoal = "Verify that an EMail message can be saved.";
          testPreconditions = "Email account called *Email* exists on the device";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -523,19 +561,24 @@ testcase = {
         "));
     },
 
-    Read_Email : function() {
+    read_email : function() {
         // Test meta data
         testTitle = "Messaging - Read E-Mail";
         testBinary = "testQtMessaging";
+        testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
         testGoal = "Verify that an EMail message can be read.";
-        testPreconditions = "   1. Email account called *Email* exists on the device<br>   1. Email accounts contains valid messages.<br>   1. Network is available.";
+        testPreconditions = " <br>
+   1. Email account called *Email* exists on the device<br>
+   1. Email accounts contains valid messages.<br>
+   1. Network is available.<br>";
         testGroups = "BAT";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
             *Goal:* " + testGoal + "<br>
-            *Pre-Requisites:* " + testPreconditions + "<br>
             *Tested Binary:* " + testBinary + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
 
            | *Step* | *Verification* |
            | Launch " + testBinary + " | App launches normally |
@@ -549,13 +592,15 @@ testcase = {
           "));
       },
 
-    Compose_Email : function() {
+    compose_email : function() {
         // Test meta data
         testTitle = "Messaging - Compose EMail";
         testBinary = "testQtmessaging";
+        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";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -575,13 +620,15 @@ testcase = {
         "));
     },
 
-    Query_Contacts : function() {
+    query_contacts : function() {
         // Test meta data
         testTitle = "Messaging - Query Contacts";
         testBinary = "keepintouch";
+        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";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -601,13 +648,15 @@ testcase = {
         "));
     },
 
-      Search_Accounts_By_Name : function() {
+      search_accounts_by_name : function() {
            // Test meta data
            testTitle = "Messaging - Search Accounts By Name";
            testBinary = "testQtMessaging";
+           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";
+           testRequirements = " ";
 
            // Test steps
            prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -623,13 +672,15 @@ testcase = {
           "));
       },
 
-      Search_Accounts_By_Id : function() {
+      search_accounts_by_id : function() {
          // Test meta data
          testTitle = "Messaging - Search Accounts by ID";
          testBinary = "testQtMessaging";
+         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";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -645,13 +696,15 @@ testcase = {
           "));
       },
 
-    Account_Settings : function() {
+    account_settings : function() {
        // Test meta data
        testTitle = "Messaging - Account Settings";
        testBinary = "testQtMessaging";
+       testSource = "$MOBILITYDIR/tests/applications/messaging/testqtmessaging";
        testGoal = "Verify that account settings can be set.";
        testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
diff --git a/tests/systemtests/sys_multimedia/sys_multimedia.qtt b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
index 2d2ee1593d..b50e653350 100644..100755
--- a/tests/systemtests/sys_multimedia/sys_multimedia.qtt
+++ b/tests/systemtests/sys_multimedia/sys_multimedia.qtt
@@ -70,9 +70,11 @@ A device specific headset is required to be connected to device for radio testin
         // Test meta data
         testTitle = "Multimedia - Play Audio File";
         testBinary = "player";
+        testSource = "$MOBILITYDIR/demos/player";
         testGoal = "Verify that Audio files can be played.";
         testPreconditions = "Audio files in " + extension + " format are available on device.";
         testGroups = "BAT";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -97,10 +99,12 @@ A device specific headset is required to be connected to device for radio testin
     {
          // Test meta data
          testTitle = "Multimedia - Audio Player Controls";
-         testBinary = "";
-         testGoal = "Verify that ";
+         testBinary = "player";
+         testSource = "$MOBILITYDIR/demos/player";
+         testGoal = "Verify that Audio files can be controled.";
          testPreconditions = "a test "+extension+" file is available on device";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -153,9 +157,11 @@ A device specific headset is required to be connected to device for radio testin
          // 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 steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -189,9 +195,11 @@ A device specific headset is required to be connected to device for radio testin
       // 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>
@@ -218,9 +226,11 @@ A device specific headset is required to be connected to device for radio testin
       // 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>
@@ -270,9 +280,11 @@ A device specific headset is required to be connected to device for radio testin
        // 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>
@@ -300,9 +312,11 @@ A device specific headset is required to be connected to device for radio testin
        // Test meta data
        testTitle = "Multimedia - Content Streaming";
        testBinary = "player";
+       testSource = "$MOBILITYDIR/demos/player";
        testGoal = "Verify that streaming playlist can be played.";
-       testPreconditions = "";
+       testPreconditions = "None";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -335,9 +349,11 @@ A device specific headset is required to be connected to device for radio testin
         // Test meta data
         testTitle = "Multimedia - Play Radio Transmission";
         testBinary = "radio";
+        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";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -365,9 +381,11 @@ A device specific headset is required to be connected to device for radio testin
         // Test meta data
         testTitle = "Multimedia - Play Radio With Interruptions";
         testBinary = "radio";
+        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";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -387,9 +405,11 @@ A device specific headset is required to be connected to device for radio testin
      // 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>
@@ -411,9 +431,11 @@ A device specific headset is required to be connected to device for radio testin
          // Test meta data
          testTitle = "Multimedia - Photo Camera";
          testBinary = "camera";
+         testSource = "$MOBILITYDIR/examples/camera";
          testGoal = "Verify that a photo can be made with the camera.";
-         testPreconditions = "";
+         testPreconditions = "None";
          testGroups = "BAT";
+         testRequirements = " ";
 
          // Test steps
          prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -424,7 +446,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 Image tab to put camera in still mode |  Verify the intended scene is reproduced in the preview/viewfinder |
+            | Select Image tab to put camera in still mode | Verify the intended scene is reproduced in the preview/viewfinder |
             | Select Capture Photo | If applicable, verify that flash has triggered |
             | | Verify that image is shown on screen for preview |
             | | Verify that a new file is in the Images folder and accessabble with the image viewer |
@@ -438,9 +460,11 @@ 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 = "";
+     testPreconditions = "None";
      testGroups = "BAT";
+     testRequirements = " ";
 
      // Test steps
      prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -465,11 +489,13 @@ change_camera_settings: function()
     take_a_video: function()
     {
         // Test meta data
-         testTitle = "Multimedia - Video Camera";
-         testBinary = "camera";
+        testTitle = "Multimedia - Video Camera";
+        testBinary = "camera";
+        testSource = "$MOBILITYDIR/examples/camera";
         testGoal = "Verify that the camera can capture and save an audio/video file.";
-        testPreconditions = "";
+        testPreconditions = "None";
         testGroups = "BAT";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -497,9 +523,11 @@ change_camera_settings: function()
         // Test meta data
         testTitle = "Multimedia - Video Camera";
         testBinary = "camera";
+        testSource = "$MOBILITYDIR/examples/camera";
         testGoal = "Verify that the camera can change its Video settings successfully.";
-        testPreconditions = "";
+        testPreconditions = "None";
         testGroups = "BAT";
+        testRequirements = " ";
 
         // Test steps
         prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -534,9 +562,11 @@ change_camera_settings: function()
       // Test meta data
       testTitle = "Multimedia - Recording Audio";
       testBinary = "audiorecorder";
+      testSource = "$MOBILITYDIR/examples/audiorecorder";
       testGoal = "Verify that audio can be recorded.";
-      testPreconditions = "";
+      testPreconditions = "None";
       testGroups = "BAT";
+      testRequirements = " ";
 
       // Test steps
       prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -569,9 +599,11 @@ pause_recording_an_audio_file: function()
       // Test meta data
       testTitle = "Multimedia - Pause Recording Audio";
       testBinary = "audiorecorder";
+      testSource = "$MOBILITYDIR/examples/audiorecorder";
       testGoal = "Verify that audio recordings can be paused.";
-      testPreconditions = "";
+      testPreconditions = "None";
       testGroups = "BAT";
+      testRequirements = " ";
 
       // Test steps
       prompt(twiki("---+++ " + testTitle + "<br><br>
@@ -604,9 +636,11 @@ pause_recording_an_audio_file: function()
        // Test meta data
        testTitle = "Multimedia - Play Slideshow";
        testBinary = "slideshow";
+       testSource = "$MOBILITYDIR/examples/slideshow";
        testGoal = "Verify that a slideshow can be played.";
-       testPreconditions = "";
+       testPreconditions = "Some images are in the phone";
        testGroups = "BAT";
+       testRequirements = " ";
 
        // Test steps
        prompt(twiki("---+++ " + testTitle + "<br><br>
diff --git a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
index e992bcfedc..9da48c0edd 100644
--- a/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
+++ b/tests/systemtests/sys_qmlcontacts/sys_qmlcontacts.qtt
@@ -174,7 +174,7 @@ testcase = {
         testTitle = "Contacts - Run test application";
         testBinary = "Qmlcontact";
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
-        testGoal = "Verify test application can run without any error";
+        testGoal = "Verify test application run without any error";
         testPreconditions = "None";
         testGroups = "BAT_MOBILITY";
         testRequirements = "";
@@ -201,8 +201,8 @@ testcase = {
         testTitle = "Contacts - Run test application";
         testBinary = "Qmlcontact";
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
-        testGoal = "Verify contact list can be checked";
-        testPreconditions = "None";
+        testGoal = "Verify that overview of contact names is correct";
+        testPreconditions = "There are some contact examples";
         testGroups = "BAT_MOBILITY";
         testRequirements = "";
 
@@ -212,6 +212,7 @@ testcase = {
             // note the contact list should be the focus widget
             select(contactSet[index].firstName);
         }
+        prompt("Verify that overview of contact names is correct");
     },
 
 
@@ -226,7 +227,7 @@ testcase = {
         testTitle = "Contacts - Run test application";
         testBinary = "Qmlcontact";
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
-        testGoal = "Verify contact can be export";
+        testGoal = "Verify that when selecting a contact its summary is shown";
         testPreconditions = "None";
         testGroups = "BAT_MOBILITY";
         testRequirements = "";
@@ -252,7 +253,7 @@ testcase = {
         testTitle = "Contacts - Run test application";
         testBinary = "Qmlcontact";
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
-        testGoal = "Verify all contact detail can be shown";
+        testGoal = "Verify that the details page for contacts can be seen";
         testPreconditions = "None";
         testGroups = "BAT_MOBILITY";
         testRequirements = "";
@@ -278,7 +279,7 @@ testcase = {
         testTitle = "Contacts - Run test application";
         testBinary = "Qmlcontact";
         testSource = "$MOBILITYDIR/demos/qmlcontacts";
-        testGoal = "Verify contact details can be checked";
+        testGoal = "Verify that each contact has the details expec";
         testPreconditions = "None";
         testGroups = "BAT_MOBILITY";
         testRequirements = "";