Changes: fala_wid test script modified to get the window Id of application using pid

RevBy: Juha Lintula

debian/applauncherd-testscripts.install

@@ -7,7 +7,7 @@ usr/share/applauncherd-testscripts/test-perf.rb
 usr/share/applauncherd-testscripts/get-coordinates.rb
 usr/share/applauncherd-testscripts/utils.py
 usr/share/applauncherd-testscripts/test-security.py
-usr/share/applauncherd-testscripts/fala_wid
+usr/bin/fala_wid
 usr/share/applauncherd-testscripts/fala_xres_wl
 usr/share/applauncherd-testscripts/fala_xres_wol
 usr/share/applauncherd-testscripts/signal-forward/*

tests/Harmattan/TestScripts/CMakeLists.txt

@@ -17,10 +17,11 @@ if ($ENV{HARMATTAN})
         tc_theming.rb
         get-coordinates.rb
         test-perf.rb
-        fala_wid
         fala_xres_wl
         fala_xres_wol
         DESTINATION /usr/share/applauncherd-testscripts)
 
+    install(PROGRAMS fala_wid DESTINATION /usr/bin/)
+
     add_subdirectory (signal-forward)
 endif ($ENV{HARMATTAN})

tests/Harmattan/TestScripts/fala_wid

@@ -1,2 +1,2 @@
 #!/bin/sh
-for wid in $(xwininfo -root -tree| awk '/864x480\+0\+0/{print $1}'); do echo $wid $(xprop -id $wid | awk '/_NET_WM_PID/{print $3}') | awk -v BOOSTERPID=$(pidof booster-m) '{if (BOOSTERPID == $2) print $1}'; done
+for wid in $(xwininfo -root -tree| awk '/854x480\+0\+0/{print $1}'); do echo $wid $(xprop -id $wid | awk '/_NET_WM_PID/{print $3}') | awk -v APP_PID=$1 '{if (APP_PID == $2) print $1}'; done

tests/Harmattan/TestScripts/get-coordinates.rb

@@ -25,7 +25,7 @@ require 'optparse'
 
 include TDriverVerify
 
-WINDOWID_BINARY = '/usr/bin/fala_windowid'
+WINDOWID_BINARY = '/usr/bin/fala_wid'
 PIXELCHANGED_BINARY= '/usr/bin/fala_pixelchanged' 
 MATTI_LOCATION='/usr/lib/qt4/plugins/testability/libtestability.so'
 TEMPORARY_MATTI_LOCATION='/root/libtestability.so'

tests/Harmattan/bug-tests/tests.xml

@@ -26,7 +26,7 @@
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_oom_adj</step>
       </case>
 
-      <case name="applauncherd__test_launched_app_name" type="Functional" description="Test that launched application name  have .launch at the end" timeout="900" level="System" insignificant="true">
+      <case name="applauncherd__test_launched_app_name" type="Functional" description="Test that launched application name  have .launch at the end" timeout="460" level="System" insignificant="true">
         <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_launched_app_name</step>
       </case>
 
@@ -46,7 +46,7 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_bogus_apptype</step>
       </case>
 
-      <case name="applauncherd__test_launch_prestarted_app" type="Functional" description="To test that prestarted application is launched" timeout="1500" level="System" insignificant="true">
+      <case name="applauncherd__test_launch_prestarted_app" type="Functional" description="To test that prestarted application is launched" timeout="460" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  /usr/share/applauncherd-testscripts/ts_prestartapp.rb --name test_launch_prestarted_app</step>
       </case>