testability-driver 1.1.0 → 1.1.1

data/lib/tdriver/util/recorder/scripter.rb

@@ -51,44 +51,84 @@ module MobyUtil
       mouse_status = 0
       previous_time = nil
       event = nil
+      
+      # mouse_status: 
+      # 0 = no press or release
+      # 1 = press, no release     [ will only happen if recording stoped before mouse release]
+      # 2 = release, no press     [ will only happen if recording started after mouse press]
+      # 3 = press and release
+      
+      # COLLECT ALL MOUSE EVENTS
+      mouse_moves = []
+      mouse_press_events = []
+      mouse_release_events = []
+      
+      begin
+        mouse_moves = xml_as_object.children(:type =>'event', :name=>'MouseMove')
+      rescue MobyBase::TestObjectNotFoundError
+      end
+      
+      begin
+        mouse_press_events = xml_as_object.children(:type =>'event', :name=>'MouseButtonPress')
+      rescue MobyBase::TestObjectNotFoundError
+      end
+      
+      begin 
+        mouse_release_events = xml_as_object.children(:type =>'event', :name=>'MouseButtonRelease')
+      rescue MobyBase::TestObjectNotFoundError
+      end
+      
+      # STORE MOVE POINTS
+      move_points = []
+      mouse_moves.each do |point|
+        timestamp = point.attribute('timeStamp').to_i
+        previous_timestamp = ( move_points[-1].nil? ) ? timestamp : move_points[-1]['timestamp'].to_i
+        interval = get_duration(previous_timestamp, timestamp)
+        move_points.push({'x' => point.attribute('windowX'), 'y' => point.attribute('windowY'), 'interval' => interval, 'timestamp' => timestamp, 'id' => point.id} )
+      end
+      
+      # STORE RELEASE EVENTS
+      release_events = []
+      mouse_release_events.each do |event|
+        release_events.push({'id' => event.id})
+      end
 
-      for i in 0...event_count
-
-        event = event_list.event(:id => i.to_s)
-        type = event.name
-
-        previous_time = event.attribute('timeStamp').to_i unless previous_time
-
-        if type == 'MouseButtonPress'
-          active_target = get_target_details(event.child(:id => i.to_s))      
-          scripting = true
-          mouse_status = 1
+      # FOREACH MouseButtonPress
+      mouse_press_events.each_index do |index|
+        active_target = get_target_details( mouse_press_events[index].child(:id => mouse_press_events[index].id) )  
+
+        # COLLECT MouseMove points until MouseButtonRelease
+        # If no more MouseButtonRelease or MouseButtonPress then last MoveMouse point id
+        first_point_index = mouse_press_events[index].id.to_i
+        if ( !move_points.empty? )
+          next_mouse_press_index =  ( mouse_press_events[ index + 1 ].nil? ) ?  move_points.last['id'].to_i : mouse_press_events[ index + 1 ].id.to_i
+          next_mouse_release = release_events.select{ |event| event['id'].to_i < next_mouse_press_index }
+          next_mouse_release_index = next_mouse_release.first['id'].to_i unless next_mouse_release.empty?
+          last_point_index = ( next_mouse_release_index.nil? ) ? next_mouse_press_index : next_mouse_release_index
+        else
+          if ( !release_events.empty? )
+            next_mouse_press_index =  ( mouse_press_events[ index + 1 ].nil? ) ?  0 : mouse_press_events[ index + 1 ].id.to_i
+            next_mouse_release = ( next_mouse_press_index == 0 ) ? [ release_events.last ] : release_events.select{ |event| event['id'].to_i < next_mouse_press_index }
+            last_point_index =  next_mouse_release.first['id'].to_i unless ( next_mouse_release.nil? or next_mouse_release.empty? )
+          else
+            last_point_index = 0
+          end
         end
-
-        duration = get_duration(previous_time, event.attribute('timeStamp').to_i)
-
-        point = {'x' => event.attribute('windowX'), 'y' => event.attribute('windowY'), 'interval' => duration}
-        points.push(point) if scripting 
-
-        previous_time = event.attribute('timeStamp').to_i
-
-        if type == 'MouseButtonRelease' and scripting
-
-          #mouse status based on the previous (if target changed no press)
-          mouse_status = 3 if mouse_status == 1
-          mouse_status = 2 if mouse_status == 0    
-          script << generate_command(active_target, points, mouse_status) << "\n"      
-          points.clear
-          active_target = nil
-          scripting = false
-
+        
+        
+        points = move_points.select{ |point| point['id'].to_i > first_point_index and point['id'].to_i <= last_point_index }
+        points.first['interval'] = 0.to_f unless points.empty? # set first interval to 0
+        
+        # PROCESS gesture at MouseButtonRelease unless we hit last point and there is no release
+        last_processed_event_id = ( move_points.empty? ) ? 0 : move_points.last['id'].to_i
+        if ( last_point_index != last_processed_event_id )
+          script << generate_command(active_target, points, mouse_status = 3 ) << "\n"   
+          
+        # END EVENTS, MouseButtonRelease truncated or second press without release witch would not make sense
+        else
+          script << generate_command(active_target, points, mouse_status = 1 ) << "\n"  
         end
-      end  
-
-      if scripting and event
-
-        script << generate_command(active_target, points, mouse_status) << "\n"
-
+        
       end
 
       script << "\n"
@@ -151,11 +191,7 @@ module MobyUtil
       target
     end
 
-    # mouse_status: 
-    # 0 = no press or release
-    # 1 = press, no release
-    # 2 = release, no press
-    # 3 = press and release
+
     def generate_command(target_details, points, mouse_status)
 
       command = "@app." 

data/lib/tdriver/version.rb

@@ -18,4 +18,4 @@
 ############################################################################
 
 
-ENV['TDRIVER_VERSION'] = '1.1.0'
+ENV['TDRIVER_VERSION'] = '1.1.1'

data/xml/templates/generic.xml

@@ -150,14 +150,19 @@
 
   <!-- default parameters for reporting settings -->
   <template name="reporting" inherits="error_recovery">
-
+    <!-- parameter for reporter modules enable disable enabled by default -->
+    <parameter name="enable_reporter" value="true" />
+    <parameter name="report_short_folders" value="false" />
+    
     <!-- Parameters for report crash file monitoring -->
     <parameter name="report_crash_file_monitor" value="false" />
+    <parameter name="report_crash_file_monitor_crash_file_cleanup" value="false" />
     <parameter name="report_crash_file_monitored_sut_ids" value="s60,qt_sut" />
     <parameter name="report_crash_file_locations" value="C:,c:\data,E:,F:" /> <!-- posix="..." -->
     <parameter name="report_crash_file_names" value="MobileCrash" />
     <parameter name="report_disconnect_connected_devices" value="false" />
 
+
     <!-- Parameters for report details -->
     <parameter name="report_outputter_path" value="tdriver_reports/" />
     <parameter name="behaviour_logging" value="true" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Testability Driver team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin/
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency