From 36ce5f2e4ee8e78dc7fd3e2b34670e62b0ab2227 Mon Sep 17 00:00:00 2001
From: Joona Hakkarainen <ext-joona.2.hakkarainen@nokia.com>
Date: Mon, 23 May 2011 16:17:22 +0300
Subject: [PATCH] Changes: Add usage printing test in applauncherd RevBy:
 Nimika Keshri

---
 tests/harmattan/functests/tests.xml               | 8 ++++++++
 tests/harmattan/testscripts/test-func-launcher.py | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/tests/harmattan/functests/tests.xml b/tests/harmattan/functests/tests.xml
index 6a92441..07d4af6 100644
--- a/tests/harmattan/functests/tests.xml
+++ b/tests/harmattan/functests/tests.xml
@@ -37,6 +37,8 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_applications_exist</step>
       </case>
 
+
+
       <case name="applauncherd__test_zombie_state" type="Functional" description="To test that no Zombie process exist after the application is killed" timeout="360" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_zombie_state</step>
       </case>
@@ -78,6 +80,10 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_delay</step>
       </case>
 
+      <case name="applauncherd__test_invoker_usage_printing" type="Functional" description="Test that applauncherd invoker --help usage printing ok" timeout="360" level="System" insignificant="false">
+          <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_usage_printing</step>
+      </case>
+
       <case name="applauncherd__test_invoker_search_prog" type="Functional" description="Test that invoker finds binaries from PATH" timeout="360" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_search_prog</step>
       </case>
@@ -327,6 +333,8 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_wait_term_e</step>
       </case>
 
+
+
       <case name="applauncherd__test_fd_booster_e" type="Functional" description="File descriptor test for booster-d" timeout="360" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_e</step>
       </case>
diff --git a/tests/harmattan/testscripts/test-func-launcher.py b/tests/harmattan/testscripts/test-func-launcher.py
index 68a13e0..c00bd13 100644
--- a/tests/harmattan/testscripts/test-func-launcher.py
+++ b/tests/harmattan/testscripts/test-func-launcher.py
@@ -930,6 +930,14 @@ class launcher_tests (unittest.TestCase):
 
         kill_process(PREFERED_APP) 
 
+    def test_invoker_usage_printing(self):
+        """
+        Test that applauncherd invoker --help usage printing ok
+        """
+
+        p = run_cmd_as_user('invoker --help')
+        self.assert_(p.wait() == 0, "'invoker --help' failed")
+
     def test_writable_executable_mem(self):
         """
         Test that applauncherd does not have the writable and executable memory