Merge remote branch 'origin/master'

debian/changelog

@@ -1,5 +1,11 @@
 applauncherd (0.16.0) unstable; urgency=low
 
+  * Changes: Single instance test skeletons added
+
+ -- Olli Leppanen <olli.leppanen@nokia.com>  Thu, 13 Jan 2011 15:18:00 +0200
+
+applauncherd (0.16.0) stable; urgency=low
+
   * Changes: Boosters loaded as plugins.
   * Changes: New test added that checks that booster pid is acquired by application started using booster
   * Changes: Changed wait time between button press and release from 100ms to 200ms in pixelchanged.

tests/Harmattan/TestScripts/test-func-launcher.py

@@ -748,8 +748,37 @@ class launcher_tests (unittest.TestCase):
         self.assert_(op == '0',"oom.adj of the launched process is not 0")
         kill_process('fala_wl') 
 
-
+    def test_single_instance_window_raise_without_invoker(self):
-
+        # 1. Start the multi-instance application with single-instance binary
+        #    -check the pid of started app
+        # 2. Minimize it with xsendevent
+        # 3. Start another multi-instance application with single-instance binary
+        # 4. Check that there in only one app and its application pid is the same than with 1. launch
+        # 5. Check that window is raised with correct pid (from log files written by test application)
+        # 6. Close the application
+        # 7. Start the multi-instance application with single-instance binary
+        # 8. Check that the pid has changed
+
+    def test_single_instance_and_non_single_instance_without_invoker(self):
+        # 1. Start the multi-instance application without single-instance binary
+        # 2. Start another multi-instance application with single-instance binary
+        # 3. Check that both  application pids exist
+
+    def test_single_instance_stress_test_without_invoker(self):
+        # 1. Start the multi-instance application with single-instance binary
+        #    -check the pid of started app
+        # 2. Minimize it with xsendevent
+        # 3. Start the multi-instance app with single-instance binary 20 times very fast
+        #    - check the return value of each launch is zero
+        # 4. Check that there in only one application pid and it has the same than with 1. launch
+        # 5. Check that window is raised with correct pid (from log files written by test application)
+
+    def test_single_instance_abnormal_lock_release_without_invoker(self):
+        # 1. Start the multi-instance application with single-instance binary
+        #    -check the pid of started app
+        # 2. Kill the application with -9
+        # 3. Start the multi-instance application with single-instance binary
+        # 4. Check that application can be started and pid has changed
 
 # main
 if __name__ == '__main__':