From f34c7215af1b7c0c31a51784f31c1dd9a6b6b649 Mon Sep 17 00:00:00 2001
From: Nimika Keshri <nimika.1.keshri@nokia.com>
Date: Wed, 1 Sep 2010 15:48:03 +0300
Subject: [PATCH] Changes: Adding some debugs in performance test and adding
 the test to a new test set RevBy: TrustMe

---
 tests/TestScripts/test-perf.rb | 10 +++++++++-
 tests/perftests/tests.xml      | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/TestScripts/test-perf.rb b/tests/TestScripts/test-perf.rb
index be7b36d..6d93236 100755
--- a/tests/TestScripts/test-perf.rb
+++ b/tests/TestScripts/test-perf.rb
@@ -38,8 +38,13 @@ class TC_PerformanceTests < Test::Unit::TestCase
             puts "Inside SB, Do Nothing to unlock"
         else
 	    system "mcetool --set-tklock-mode=unlocked"
+            # restart duihome so that qttasserver notices it
+            verify { 
+                system("/sbin/initctl restart xsession/duihome")
+            }
+            sleep (5)
         end
-        @sut = TDriver.sut(:Id=>ARGV[0] || 'sut_qt_maemo')
+        @sut = TDriver.sut(:Id=> 'sut_qt_maemo')
     end
 
     # method called after any test case for cleanup purposes
@@ -58,6 +63,7 @@ class TC_PerformanceTests < Test::Unit::TestCase
         #Open the Application from the application grid
         @meegoHome = @sut.application(:name => 'duihome')
         @meegoHome.MButton(:name => "ToggleLauncherButton").tap
+        sleep(2)
         if @meegoHome.test_object_exists?("LauncherButton", :text => appName)
             icon = @meegoHome.LauncherButton(:name => "LauncherButton", :text => appName)
             totalPages = @meegoHome.children(:type => 'LauncherPage').length
@@ -104,6 +110,7 @@ class TC_PerformanceTests < Test::Unit::TestCase
       #Run Application with invoker
       for i in 1..COUNT
           open_Apps("fala_wl")
+          print "Now Launching fala_wl %d times\n" %i
           sleep (5)
           read_file
           wL.push(measure_time)
@@ -112,6 +119,7 @@ class TC_PerformanceTests < Test::Unit::TestCase
       #Run Application without invoker
       for i in 1..COUNT
           open_Apps("fala_wol")
+          print "Now Launching fala_wol %d times\n" %i
           sleep (5)
           read_file
           woL.push(measure_time)
diff --git a/tests/perftests/tests.xml b/tests/perftests/tests.xml
index 3ee9f85..ecd7c4b 100644
--- a/tests/perftests/tests.xml
+++ b/tests/perftests/tests.xml
@@ -5,7 +5,7 @@
   <!-- Schema: https://projects.maemo.org/docs/testing/xml-definition.html -->
   <suite name="applauncherd-performance-tests" domain="Application framework"> 
 
-    <set name="applauncherd-performance-tests" description="applauncherd performance tests for Meego touch applications" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+    <set name="test-commandline" description="applauncherd application startup time from command line" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
@@ -14,6 +14,21 @@
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-perf-mbooster.py test_001 &gt; /tmp/launcher_perf.txt</step>
       </case>
 
+      <environments>
+          <scratchbox>false</scratchbox>
+          <hardware>true</hardware>    
+      </environments>
+
+      <get>
+          <file>/tmp/launcher_perf.txt</file>
+      </get>
+    </set>
+
+    <set name="test-applicationGrid" description="applauncherd application startup time from application grid" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+      <pre_steps>
+          <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
+      </pre_steps>
+
       <case name="Perf-Test" type="Performance" description="Measure launcher performance" timeout="360" level="System">
 	      <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb --name test_performance &gt; /tmp/launcher_perf_new.txt</step>
       </case>
@@ -23,7 +38,6 @@
       </environments>
 
       <get>
-          <file>/tmp/launcher_perf.txt</file>
           <file>/tmp/launcher_perf_new.txt</file>
       </get>
     </set>