Updated testcases following coding style guide

4 files changed, 352 insertions, 229 deletions

diff --git a/tests/systemtests/sys_bearer/sys_bearer.qtt b/tests/systemtests/sys_bearer/sys_bearer.qtt
index 1476011a42..83e755aca9 100644
--- a/tests/systemtests/sys_bearer/sys_bearer.qtt
+++ b/tests/systemtests/sys_bearer/sys_bearer.qtt
@@ -56,76 +56,111 @@ testcase = {
 
     enumeration: function()
     {
-    prompt(twiki("---++++ Enumeration of connections
-
-                 1. Work out the list of available networks:
-                    1. On S60 device, use Menu->Settings->Connectivity settings application.
-                    1. ifconfig (as superuser on linux/Mac)
-                    1. ipconfig (on Windows)
-                 1. Run the bearermonitor example application
-                 1. Press 'Scan'
-                 1. Verify all previously listed networks are shown in the application view
-"));
+        // Test meta data
+        testApplication = "Bearer - Enumeration of Connections";
+        testBinary = "bearermonitor";
+        testGoal = "Verify the system can detect and display all available networks";
+        testPreconditions = "Work out the list of available networks:<br>
+   1. On S60 device: use Menu->Settings->Connectivity settings application.<br>
+   1. linux/Mac: ifconfig (as superuser)<br>
+   1. Windows: ipconfig<br><br>";
+        testGroups = "BAT";
+
+         // Test Steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App starts correctly |
+            | Press 'Scan' | Verify all available networks are shown in the application view |
+        "));
     },
 
     added_interfaces: function()
     {
-    prompt(twiki("---++++ Added network interfaces
-
-                 1. Pre: no network access points are defined on the device; a WLAN is available
-                 1. Run the bearercloud application
-                 1. Verify the cloud space is clear of networks
-                 1. Press the Menu key to background the application
-                 1. Open Settings -> Connectivity -> Wireless networks
-                 1. Select the WLAN from the list
-                 1. Press Connect
-                 1. Press the Menu key
-                 1. Select the bearercloud application to foreground it
-                 1. Verify the new network is displayed in the circle
-"));
+          // Test meta data
+          testApplication = "Bearer - Added network interfaces";
+          testBinary = "bearermonitor";
+          testGoal = "Verify that network interfaces can be added";
+          testPreconditions = "No network access points are defined on the device; a WLAN is available";
+          testGroups = "BAT";
+
+          // Test steps
+          prompt(twiki("---+++ " + testApplication + "<br><br>
+              *Goal:* " + testGoal + "<br>
+              *Pre-Requisites:* " + testPreconditions + "<br>
+              *Tested Binary:* " + testBinary + "<br>
+
+              | *Step* | *Verification* |
+              | Launch " + testBinary + " | Verify the cloud space is clear of networks |
+              | Press the Menu key to background the application | |
+              | Open Settings -> Connectivity -> Wireless networks | |
+              | Select the WLAN from the list | |
+              | Press Connect | |
+              | Press the Menu key | |
+              | Select the bearercloud application to foreground it | Verify the new network is displayed in the circle |
+          "));
     },
 
     removed_interfaces: function()
     {
-    prompt(twiki("---++++ Removed network interfaces
-
-                 1. Pre: Added network interfaces has been executed successfully
-                 1. Run the bearercloud application
-                 1. Verify the cloud space shows a network in the green circle
-                 1. Press the Menu key to background the application
-                 1. Open Settings -> Connectivity -> Destinations -> Uncategorised
-                 1. Select the WLAN from the list
-                 1. Press Options -> Delete, and then Yes in the confirm dialog
-                 1. Press the Menu key
-                 1. Select the bearercloud application to foreground it
-                 1. Verify the new network is not displayed in the circle
-"));
+        // Test meta data
+        testApplication = "Bearer - Removed network interfaces";
+        testBinary = "bearercloud";
+        testGoal = "Verify that removal of a network connection is detected correctly";
+        testPreconditions = "A connection to a WLAN exists";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | Verify the cloud space shows a network in the green circle |
+            | Press the Menu key to background the application | |
+            | Open Settings -> Connectivity -> Destinations -> Uncategorised | |
+            | Select the WLAN from the list | |
+            | Press Options -> Delete, and then Yes in the confirm dialog | |
+            | Press the Menu key | |
+            | Select the bearercloud application to foreground it | Verify the new network is not displayed in the circle |
+        "));
     },
 
     change_status: function()
     {
-        prompt(twiki("---++++ Changing the status of a network
-
-                 1. Pre: no network access points are defined on the device; a WLAN is available
-                 1. Run the bearercloud application
-                 1. Verify the cloud space is clear of networks
-                 1. Press the Menu key to background the application
-                 1. Open Settings -> Connectivity -> Wireless networks
-                 1. Select the WLAN from the list
-                 1. Press Connect
-                 1. Press the Menu key
-                 1. Select the bearercloud application to foreground it
-                 1. Verify the new network is displayed in the green circle (connected)
-                 1. Press the Menu key to background the application
-                 1. Open Settings -> Connectivity -> Connection Mgr
-                 1. Select the WLAN from the list
-                 1. Press Options -> Disconnect
-                 1. Press the Menu key
-                 1. Select the bearercloud application to foreground it
-                 1. Verify the new network is now displayed in the blue circle (disconnected)
-                 1. Disable the network device (eg. unplug the access point)
-                 1. Verify that bearercloud shows the network moves to the grey circle (unavailable)
-"));
+       // Test meta data
+       testApplication = "Bearer - Changing the status of a network";
+       testBinary = "bearercloud";
+       testGoal = "Verify that network status changes are detected correctly.";
+       testPreconditions = "no network access points are defined on the device; a WLAN is available";
+       testGroups = "BAT";
+
+       // Test steps
+       prompt(twiki("---+++ " + testApplication + "<br><br>
+           *Goal:* " + testGoal + "<br>
+           *Pre-Requisites:* " + testPreconditions + "<br>
+           *Tested Binary:* " + testBinary + "<br>
+
+           | *Step* | *Verification* |
+           | Launch " + testBinary + " | Verify the cloud space is clear of networks |
+           | Press the Menu key to background the application | |
+           | Open Settings -> Connectivity -> Wireless networks | |
+           | Select the WLAN from the list | |
+           | Press Connect | |
+           | Press the Menu key | |
+           | Select the bearercloud application to foreground it | Verify the new network is displayed in the green circle (connected) |
+           | Press the Menu key to background the application | |
+           | Open Settings -> Connectivity -> Connection Mgr | |
+           | Select the WLAN from the list | |
+           | Press Options -> Disconnect | |
+           | Press the Menu key | |
+           | Select the bearercloud application to foreground it | Verify the new network is now displayed in the blue circle (disconnected) |
+           | Disable the network device (eg. unplug the access point) | Verify that bearercloud shows the network moves to the grey circle (unavailable) |
+        "));
     },
 
     interface_priority: function()
@@ -133,38 +168,44 @@ testcase = {
         if (testcase.platform != "symbian" && testcase.platform != "maemo") {
             skip("This test only applies to Symbian platform");
         }
-        prompt(twiki('---++++ Interfaces are used in order of priority
-
-    1. Pre: GPRS is available to the device
-    1. Pre: WLAN is available to the device
-
-    1. Press the Menu key
-    1. Select Settings->Connectivity->Destinations
-    1. Select Option->New Destination, enter a name
-    1. Select a picture
-    1. Select the destination
-    1. Select Option->New access point
-    1. Select Yes
-    1. Verify that the WLAN "x networks avail." is greater than 0
-    1. Select Wireless LAN
-    1. Select the test WLAN (and enter a key if necessary)
-    1. Select Option->New access point
-    1. Select Yes
-    1. Select Packet data
-    1. Enter a name and commit
-    1. Press Back
-    1. Select Options->Default connection
-    1. Select the new Destination
-    1. Verify the Destination has a check mark
-    1. Start the bearermonitor example application
-    1. In the list, select the new Destination
-    1. Verify "Roaming" is shown as "Available"
-    1. Move the device into an area not covered by the WLAN or simulate an uncovered environment
-    1. Verify the application indicates loss of WLAN network (may take 1 - 2 minutes)
-    1. Verify the application indicates a change of bearer to the GPRS network - may take 1 - 2 minutes
-    1. Move the device into or simulate the area covered by both networks
-    1. Verify the device connects to the network using the WLAN bearer
-    '));
+
+        // Test meta data
+        testApplication = "Bearer - Interfaces are used in order of priority";
+        testBinary = "";
+        testGoal = "Verify that network interfaces are used in order of priority";
+        testPreconditions = "   1. GPRS is available to the device<br>
+   1. WLAN is available to the device";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Tested Binary:* " + testBinary + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+
+            | *Step* | *Verification* |
+            | Press the Menu key | |
+            | Select Settings->Connectivity->Destinations | |
+            | Select Option->New Destination, enter a name | |
+            | Select a picture | |
+            | Select the destination | |
+            | Select Option->New access point | |
+            | Select Yes | Verify that the WLAN 'x networks avail' is greater than 0 |
+            | Select Wireless LAN | |
+            | Select the test WLAN (and enter a key if necessary) | |
+            | Select Option->New access point | |
+            | Select Yes | |
+            | Select Packet data | |
+            | Enter a name and commit | |
+            | Press Back | |
+            | Select Options->Default connection | |
+            | Select the new Destination | Verify the Destination has a check mark |
+            | Start the bearermonitor example application | |
+            | In the list, select the new Destination | Verify 'Roaming' is shown as 'Available' |
+            | Move the device into an area not covered by the WLAN or simulate an uncovered environment | Verify the application indicates loss of WLAN network (may take 1 - 2 minutes) |
+            | Wait a bit longer (1 - 2 minutes) | Verify the application indicates a change of bearer to the GPRS network |
+            | Move the device into or simulate the area covered by both networks | Verify the device connects to the network using the WLAN bearer |
+    "));
     }
 
 }
diff --git a/tests/systemtests/sys_contacts/sys_contacts.qtt b/tests/systemtests/sys_contacts/sys_contacts.qtt
index 34f7a3b8a6..0629dc2a52 100644
--- a/tests/systemtests/sys_contacts/sys_contacts.qtt
+++ b/tests/systemtests/sys_contacts/sys_contacts.qtt
@@ -41,11 +41,6 @@
 
 //TESTED_COMPONENT=src/contacts
 
-function startTestApp()
-{
-    startApplication("samplephonebook");
-}
-
 function selectContactList()
 {
     if (!runAsManualTest()){
@@ -122,7 +117,7 @@ function contactsMenuItem(menuText)
 // otherwise find the oldName then edit contact details
 function updateContact(name, phone, email, address, avatar, oldName) {
     if ((oldName == undefined)  || (oldName == "")){
-        select("Add");        
+        select("Add");
     }else{
         if (!runAsManualTest()){
             var contactList = findWidget( { className: "QListWidget" } );
@@ -230,7 +225,7 @@ function checkContactDetails(name, phone, email, address, avatar){
 }
 
 
-// not ideal, there is need to programaticly check that 
+// not ideal, there is need to programaticly check that
 //  the contact details dialog is not longer showing, ie no "Save" button
 function waitForSave(){
     for (var loop=0; loop < 5; loop++){
@@ -239,7 +234,7 @@ function waitForSave(){
         else
             break;
     }
-    
+
     // should not happen
     verify(!getLabels().contains("&Save"));
 }
@@ -250,7 +245,7 @@ testcase = {
     initTestCase: function()
     {
 /*
-        startTestApp();
+        startApplication("samplephonebook");
 
         if (!runAsManualTest()){
             var contactList = findWidget( { className: "QListWidget" } );
@@ -267,7 +262,7 @@ testcase = {
         if (!runAsManualTest()){
             /* TODO delete contact added by test cases
             // make use we remove all contacts that has been added
-            startTestApp();
+            startApplication("samplephonebook");
 
             var contactWidget = findWidget( { className: "QListWidget" } );
             var contactList = getValue(contactWidget);
@@ -290,10 +285,18 @@ testcase = {
         ] ]
     },
 
-    /* Requirement: Add some contacts */
     addContact: function(contactSet)
     {
-        startTestApp();
+        // Test meta data
+        testApplication = "Contacts - Add Contact";
+        testBinary = "samplephonebook";
+        testGoal = "Verify that contacts can be added";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        startApplication(testBinary);
+
         for (var index = 0; index < contactSet.length; index++){
             var contact = contactSet[index];
             // create new contact
@@ -310,11 +313,18 @@ testcase = {
         ] ]
     },
 
-    /* Requirement: Verify the contact details and confirm that it can be updated */
-    /* verify added contact details and update contact name */
     updateContactDetails : function(contactSet)
     {
-        startTestApp();
+        // Test meta data
+        testApplication = "Contacts - Update Contact Details";
+        testBinary = "samplephonebook";
+        testGoal = "Verify that contact details can be updated";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        startApplication(testBinary);
+
         for (var index = 0; index < contactSet.length; index++){
             var contact = contactSet[index];
             var newname = contact.name + '9';
@@ -339,10 +349,17 @@ testcase = {
         Names: ["NameA", "NameB"]
     },
 
-    /* Requirement : Verify the correct match of contacts against a simple filter */
-    /* Test the "Apply &Filter" function */
     filterCheck : function(name, exists, message) {
-        startTestApp();
+        // Test meta data
+        testApplication = "Contacts - Apply Filter";
+        testBinary = "samplephonebook";
+        testGoal = "Verify the correct match of contacts against a simple filter";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        startApplication(testBinary);
+
         // add some contacts for this tests use
         var extraNames = testcase.filterCheck_extraData['Names'];
         updateContact(extraNames[0]);
@@ -360,9 +377,17 @@ testcase = {
         Names: ["NameC", "NameD"]
     },
 
-    /* Test the "Clear Filter" function */
     clearFilterCheck : function(nameFilter){
-        startTestApp();
+       // Test meta data
+       testApplication = "Contacts - Clear Filter";
+       testBinary = "samplephonebook";
+       testGoal = "Verify that when the filter is cleared all contacts are visible";
+       testPreconditions = "None";
+       testGroups = "BAT";
+
+       // Test steps
+       startApplication(testBinary);
+
         // add some contacts for this tests use
         var extraNames = testcase.clearFilterCheck_extraData['Names'];
         updateContact(extraNames[0]);
@@ -382,13 +407,22 @@ testcase = {
         Name1 : ["NameE", "NameG", "NameH"]
     },
 
-    /* Requirement: Verify that a contact can be deleted */
     deleteContact : function(name1, name2, name3){
-        startTestApp();
+        // Test meta data
+        testApplication = "Contacts - Delete Contact";
+        testBinary = "samplephonebook";
+        testGoal = "Verify that a contact can be deleted";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        startApplication(testBinary);
+
         // add some contacts for this tests use
         updateContact(name1);
         updateContact(name2);
         updateContact(name3);
+
         // delete contacts in different order to creation
         deleteContact(name2);
         deleteContact(name1);
@@ -400,7 +434,13 @@ testcase = {
             checkContactExists(name2, false);
             checkContactExists(name3, false);
         }else{
-            prompt("Verify that Contacts have been deleted:" + name1 + ", " + name2 + ", " + name3);
+            prompt(twiki("---+++ " + testApplication + "<br><br>
+                *Goal:* " + testGoal + "<br>
+                *Pre-Requisites:* " + testPreconditions + "<br>
+                *Tested Binary:* " + testBinary + "<br>
+
+                | *Step* | *Verification* |
+                | | Verify that Contacts have been deleted:" + name1 + ", " + name2 + ", " + name3 + "|" ));
         }
     }
 
diff --git a/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt b/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
index dda65a297d..a55954fa7e 100644
--- a/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
+++ b/tests/systemtests/sys_crsysteminfo/sys_crsysteminfo.qtt
@@ -45,77 +45,99 @@ testcase = {
 
     Configurable_Signal_Strength: function()
     {
-        skip('Configurable Signal Strength not implemented yet', SkipAll);
+          // Test meta data
+          testApplication = "System Info - Configurable Signal Strength";
+          testBinary = "";
+          testGoal = "Verify that ";
+          testPreconditions = "None";
+          testGroups = "BAT";
+
+          // Test steps
+          skip('Configurable Signal Strength not implemented yet', SkipAll);
     },
 
     Storage_changed_notification: function()
     {
-        prompt(twiki('*Storage changed notification*
+          // Test meta data
+          testApplication = "System Info - Storage Changed Notification";
+          testBinary = "examples/qsysinfo";
+          testGoal = "Verify that the system detects changes to storage media correctly and sends notifications";
+          testPreconditions = "   1. target supports removable storage, if not then pass this test<br>
+   1. Ensure that target system does not have any removable storage inserted/mounted<br>
+                               *Note:* On S60 platforms removing a media might cause qsysinfo to be closed, which is usual";
+          testGroups = "BAT";
+
+          // Test steps
+          prompt(twiki("---+++ " + testApplication + "<br><br>
+              *Goal:* " + testGoal + "<br>
+              *Tested Binary:* " + testBinary + "<br>
+              *Pre-Requisites:* " + testPreconditions + "<br>
 
-    1 Verify that target supports removable storage, if not then pass this test now otherwise continue with the next steps
-    1 Ensure that target system does not have any removable storage inserted/mounted
-    1 Start application *examples/qsysinfo*
-    1 Switch to the *Storage* tab
-    1 Verify that the removable storage status is unavailable
-    1 Insert/mount the storage
-    1 Verify that the storage appears with correct size
-    1 Remove/unmount the removable media
-    1 Verify that the storage disappears or marked unavailable
-    1 *Note:* On S60 platforms removing a media might cause qsysinfo to be closed, which is usual
-        '));
+              | *Step* | *Verification* |
+              | Start " + testBinary + " | App starts correctly |
+              | Switch to the *Storage* tab | Verify that the removable storage status is unavailable |
+              | Insert/mount the storage | Verify that the storage appears with correct size |
+              | Remove/unmount the removable media | Verify that the storage disappears or marked unavailable |
+        "));
     },
 
     Query_OS_Qt_firmware_versions: function()
     {
-        prompt(twiki('*Query OS, Qt and firmware versions*
+       // Test meta data
+       testApplication = "System Info - OS Qt Firmware Version";
+       testBinary = "BlueWheel/SystemInfo";
+       testGoal = "Verify that OS, Qt and Firmware versions numbers can be read";
+       testPreconditions = "None";
+       testGroups = "BAT";
 
-    1 Start the bluewheel application and open *SystemInfo*
-    1 Open *General/Features*
-    1 From the *Version* pulldown menu select *Os*
-    1 Verify the Os version is what is expected for the platform
-    1 From the *Version* pulldown menu select *QtCore*
-    1 Verify the Qt version is what is expected
-    1 From the *Version* pulldown menu select *Firmware*
-    1 Verify the Firmware version is what is expected for the platform
-    1 From the *Version* pulldown menu select *QtMobility*
-    1 Verify the QtMobility version is what is expected
-        '));
+       // Test steps
+       prompt(twiki("---+++ " + testApplication + "<br><br>
+           *Goal:* " + testGoal + "<br>
+           *Pre-Requisites:* " + testPreconditions + "<br>
+           *Tested Binary:* " + testBinary + "<br>
+
+           | *Step* | *Verification* |
+           | Launch " + testBinary + " | App starts correctly |
+           | Open *General/Features* | Features page is shown |
+           | From the *Version* pulldown menu select *Os* | Verify the Os version is what is expected for the platform |
+           | From the *Version* pulldown menu select *QtCore* | Verify the Qt version is what is expected |
+           | From the *Version* pulldown menu select *Firmware* | Verify the Firmware version is what is expected for the platform |
+           | From the *Version* pulldown menu select *QtMobility* | Verify the QtMobility version is what is expected |
+        "));
     },
 
     Query_device_hardware_features: function()
     {
-        prompt(twiki('*Query device hardware features*
+        // Test meta data
+        testApplication = "System Info - Device Hardware Features";
+        testBinary = "BlueWheel/SystemInfo";
+        testGoal = "Verify that device hardware status can be read";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+            *Goal:* " + testGoal + "<br>
+            *Pre-Requisites:* " + testPreconditions + "<br>
+            *Tested Binary:* " + testBinary + "<br>
 
-    1 Start the bluewheel application and open *SystemInfo*
-    1 Open *General/Features*
-    1 From the *Feature* pulldown menu select *Bluetooth*
-    1 Verify the Bluetooth status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Camera*
-    1 Verify the camera status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Fmradio*
-    1 Verify the Fmradio status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Ir*
-    1 Verify the Ir status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Led*
-    1 Verify the Led status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Memcard*
-    1 Verify the Memcard status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Usb*
-    1 Verify the Usb status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Vib*
-    1 Verify the Vib status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Wlan*
-    1 Verify the Wlan status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Sim*
-    1 Verify the Sim status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Location*
-    1 Verify the Location status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *VideoOut*
-    1 Verify the VideoOut status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *Haptics*
-    1 Verify the Haptics status is what is expected for the platform
-    1 From the *Feature* pulldown menu select *FmTransmitter*
-    1 Verify the FmTransmitter status is what is expected for the platform
-        '));
+            | *Step* | *Verification* |
+            | Launch " + testBinary + " | App starts correctly |
+            | Open *General/Features* | Features page is shown |
+            | From the *Feature* pulldown menu select *Bluetooth* | Verify the Bluetooth status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Camera* | Verify the camera status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Fmradio* | Verify the Fmradio status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Ir* | Verify the Ir status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Led* | Verify the Led status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Memcard* | Verify the Memcard status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Usb* | Verify the Usb status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Vib* | Verify the Vib status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Wlan* | Verify the Wlan status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Sim* | Verify the Sim status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Location* | Verify the Location status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *VideoOut* | Verify the VideoOut status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *Haptics* | Verify the Haptics status is what is expected for the platform |
+            | From the *Feature* pulldown menu select *FmTransmitter* | Verify the FmTransmitter status is what is expected for the platform |
+        "));
     }
 }
diff --git a/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt b/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
index e0e027adcc..7b6feec1c0 100644
--- a/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
+++ b/tests/systemtests/sys_declarative-music-browser/sys_declarative-music-browser.qtt
@@ -41,84 +41,104 @@
 
 //TESTED_COMPONENT=src/gallery
 
-function startTestApp()
-{
-    prompt('Start application \'declarative-music-browser\'
-    Verify test application started and closed without issue');
-}
-
-
 testcase = {
 
-    // prove that the test application starts before anything else is tested.
-    Run_Test_Application: function()
-    {
-        startTestApp();
-        if (!runAsManualTest()){
-            // ensure we have a widget to work with, dump its details
-            // TODO when run this test case 'automaticly' then enable this following code
-            //print('Focus widget is' + focusWidget());
-        }
-    },
-
     List_Albums: function()
     {
-        prompt(twiki('*List Albums*
-
-    1 Start application *declarative-music-browser*
-    1 Click Albums icon
-    1 Verify that the albums listed match what is seen via the native music/document browser
-    1 Verify that albums have the expected cover thumbnail above the album title
-    1 Click on an album in view that is known to have more that once song in it
-    1 Verify that the expected songs are listed in view
-    1 Click *Back* button
-    1 Click *Back* button to return to top \"menu\"
-        '));
+         // Test meta data
+         testApplication = "Music - List Albums";
+         testBinary = "declarative-music-browser";
+         testGoal = "Verify that all available music albums can be shown and selected";
+         testPreconditions = "None";
+         testGroups = "BAT";
+
+         // Test steps
+         prompt(twiki("---+++ " + testApplication + "<br><br>
+             *Goal:* " + testGoal + "<br>
+             *Pre-Requisites:* " + testPreconditions + "<br>
+             *Tested Binary:* " + testBinary + "<br>
+
+             | *Step* | *Verification* |
+             | Launch " + testBinary + " | App launches normally |
+             | Click Albums icon | Verify that the albums listed match what is seen via the native music/document browser |
+             | | Verify that albums have the expected cover thumbnail above the album title |
+             | Click on an album in view that is known to have more that once song in it | Verify that the expected songs are listed in view |
+             | Click *Back* button | |
+             | Click *Back* button to return to top 'menu' | |
+        "));
     },
 
 
     List_Artists : function()
     {
-        prompt(twiki('*List Artists*
-
-    1 Start application *declarative-music-browser*
-    1 Click Artists icon
-    1 Verify that the artists listed match what is seen via the native music/document browser
-    1 Click on an artist in view
-    1 Verify that the artist name is listed correctly at top of view
-    1 Verify that expected songs are listed in view
-    1 Click *Back* button
-    1 Click *Back* button to return to top \"menu\"
-        '));
+        testApplication = "Music - List Artists";
+        testBinary = "declarative-music-browser";
+        testGoal = "Verify that all available artists can be shown and selected";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+          *Goal:* " + testGoal + "<br>
+          *Pre-Requisites:* " + testPreconditions + "<br>
+          *Tested Binary:* " + testBinary + "<br>
+
+          | *Step* | *Verification* |
+          | Launch " + testBinary + " | App launches normally |
+          | Click Artists icon | Verify that the artists listed match what is seen via the native music/document browser |
+          | Click on an artist in view | Verify that the artist name is listed correctly at top of view |
+          | | Verify that expected songs are listed in view |
+          | Click *Back* button | |
+          | Click *Back* button to return to top 'menu' | |
+        "));
     },
 
 
     List_Genres : function()
     {
-        prompt(twiki('*List Genres*
-
-    1 Start application *declarative-music-browser*
-    1 Click Genres icon
-    1 Verify that the genres listed match what is seen via the native music/document browser
-    1 Click on an genre in view
-    1 Verify that albums matching the genres are listed
-    1 Verify that the expected songs are listed in view
-    1 Click *Back* button
-    1 Click *Back* button to return to top \"menu\"
-        '));
+        testApplication = "Music - List Genres";
+        testBinary = "declarative-music-browser";
+        testGoal = "Verify that available genres are shown correctly";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+          *Goal:* " + testGoal + "<br>
+          *Pre-Requisites:* " + testPreconditions + "<br>
+          *Tested Binary:* " + testBinary + "<br>
+
+          | *Step* | *Verification* |
+          | Launch " + testBinary + " | App launches normally |
+          | Click Genres icon | Verify that the genres listed match what is seen via the native music/document browser |
+          | Click on an genre in view | Verify that albums matching the genres are listed |
+          | | Verify that the expected songs are listed in view |
+          | Click *Back* button | |
+          | Click *Back* button to return to top 'menu' | |
+        "));
     },
 
 
     List_Songs : function()
     {
-        prompt(twiki('*List Songs*
-
-    1 Start application *declarative-music-browser*
-    1 Click Songs icon
-    1 Verify that the song listed match what is seen via the native music/document browser
-    1 Verify that two of the listed songs have the correct song length mentioned on right
-    1 Click *Back* button to return to top \"menu\"
-        '));
+        testApplication = "Music - List Songs";
+        testBinary = "declarative-music-browser";
+        testGoal = "Verify that available songs are listed correctly";
+        testPreconditions = "None";
+        testGroups = "BAT";
+
+        // Test steps
+        prompt(twiki("---+++ " + testApplication + "<br><br>
+         *Goal:* " + testGoal + "<br>
+         *Pre-Requisites:* " + testPreconditions + "<br>
+         *Tested Binary:* " + testBinary + "<br>
+
+         | *Step* | *Verification* |
+         | Launch " + testBinary + " | App launches normally |
+         | Click Songs icon | Verify that the song listed match what is seen via the native music/document browser |
+         | | Verify that two of the listed songs have the correct song length mentioned on right |
+         | Click *Back* button to return to top menu' | |
+        "));
     }
 
 }