From 952776a95f692f2a8fb8a0d456529ce768cea15d Mon Sep 17 00:00:00 2001
From: Nimika Keshri <nimika.1.keshri@nokia.com>
Date: Wed, 18 May 2011 13:32:39 +0300
Subject: [PATCH] Changes: Boot-mode tests added to tests.xml RevBy: TrustMe

---
 debian/applauncherd-testscripts.install       |  1 +
 tests/harmattan/red-tests/tests.xml           | 18 ++++++++++++++++++
 tests/harmattan/testscripts/CMakeLists.txt    |  1 +
 tests/harmattan/testscripts/test-boot-mode.py |  5 +++--
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/applauncherd-testscripts.install b/debian/applauncherd-testscripts.install
index 43e5086..50ad392 100644
--- a/debian/applauncherd-testscripts.install
+++ b/debian/applauncherd-testscripts.install
@@ -9,6 +9,7 @@ usr/share/applauncherd-testscripts/get-coordinates.rb
 usr/share/applauncherd-testscripts/utils.py
 usr/share/applauncherd-testscripts/test-security.py
 usr/share/applauncherd-testscripts/test-daemons.py
+usr/share/applauncherd-testscripts/test-boot-mode.py
 usr/bin/fala_wid
 usr/share/applauncherd-testscripts/fala_xres_wl
 usr/share/applauncherd-testscripts/fala_xres_wol
diff --git a/tests/harmattan/red-tests/tests.xml b/tests/harmattan/red-tests/tests.xml
index 9428b9c..a690e05 100644
--- a/tests/harmattan/red-tests/tests.xml
+++ b/tests/harmattan/red-tests/tests.xml
@@ -84,6 +84,24 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  /usr/share/applauncherd-testscripts/tc_splash.rb --name test_no_splash</step>
       </case>
 
+      <environments>
+          <scratchbox>true</scratchbox>
+          <hardware>true</hardware>    
+      </environments>
+    </set>
+    <set name="TC_Boot_mode" description="functional tests for boot mode" feature="AF Basic Launcher daemon support" requirement="300168">   
+      <pre_steps>
+          <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
+      </pre_steps>
+
+      <case name="applauncherd__test_change_to_normal_mode" type="Functional" description="To test change from boot mode to normal mode" timeout="360" level="System" insignificant="true">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-boot-mode.py test_change_to_normal_mode</step>
+      </case>
+
+      <case name="applauncherd__test_boot_mode_and_normal_mode" type="Functional" description="To test boot mode and normal mode" timeout="360" level="System" insignificant="true">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-boot-mode.py test_boot_mode_and_normal_mode</step>
+      </case>
+
       <environments>
           <scratchbox>true</scratchbox>
           <hardware>true</hardware>    
diff --git a/tests/harmattan/testscripts/CMakeLists.txt b/tests/harmattan/testscripts/CMakeLists.txt
index 1952afa..3ba9e89 100644
--- a/tests/harmattan/testscripts/CMakeLists.txt
+++ b/tests/harmattan/testscripts/CMakeLists.txt
@@ -12,6 +12,7 @@ if ($ENV{HARMATTAN})
         test-daemons.py 
         test-single-instance.py
         test-core-dump.py
+        test-boot-mode.py
         DESTINATION /usr/share/applauncherd-testscripts)
 
     install(PROGRAMS
diff --git a/tests/harmattan/testscripts/test-boot-mode.py b/tests/harmattan/testscripts/test-boot-mode.py
index 162768c..9b92318 100644
--- a/tests/harmattan/testscripts/test-boot-mode.py
+++ b/tests/harmattan/testscripts/test-boot-mode.py
@@ -77,13 +77,14 @@ class BootModeTests(unittest.TestCase):
         
         if get_pid('applauncherd'):
             kill_process('applauncherd')
+        start_applauncherd()
 
         time.sleep(5)
 
     def start_applauncherd_in_boot_mode(self):
         remove_applauncherd_runtime_files()
 
-        run_app_as_user('/usr/bin/applauncherd --boot-mode', flag = False)
+        run_cmd_as_user('/usr/bin/applauncherd --boot-mode')
 
         time.sleep(5)
 
@@ -128,7 +129,7 @@ class BootModeTests(unittest.TestCase):
     def launch_apps(self, n = 6):
         # check that launching works and the apps are there
         for i in range(n):
-            run_app_as_user('/usr/bin/invoker -n -r 2 --type=m fala_multi-instance %d' % i, flag = False)
+            run_cmd_as_user('/usr/bin/invoker -n -r 2 --type=m fala_multi-instance %d' % i)
 
         # give the applications time to really start
         time.sleep(2 * n + 5)