testability-driver-qt-sut-plugin 1.3.1 → 1.3.2

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/find.rb

@@ -66,7 +66,7 @@ module MobyBehaviour
 			  rescue Exception => e
 				##$logger.behaviour "FAIL;Failed to find test object.;#{id.to_s};sut;{};find;" << (find_hash.kind_of?(Hash) ? find_hash.inspect : find_hash.class.to_s)  
 				## Rescue from center and flick
-				Kernel::raise e
+				raise e
 			  end
 			  $logger.behaviour "PASS;Test object found and centered.;#{id.to_s};sut;{};application;" << find_hash.inspect  
 			  search_result

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/fps.rb

@@ -41,23 +41,22 @@ module MobyBehaviour
     # == objects
     # *
     #
-	module Fps
-
-	  include MobyBehaviour::QT::Behaviour
+    module Fps
 
+      include MobyBehaviour::QT::Behaviour
 
       # == description
       # Start collecting frames per second data for the object. 
-	  # Testability driver qttas package provides a fixture for measuring fps of a component. 
-	  # This behaviour is a wrapper for the fixture.
-	  # The fixture intercepts paint events send to the target of the fps measurement and simply 
-	  # counts how many occur during each second. The way this is done differs a bit depending 
-	  # on the target object. For normal QWidgets the fps values are measured to the target 
-	  # object direclty. QGraphicsItem based objects this is not the case. For QGrapchisItem 
-	  # based objects the system determines the QGraphicsView the item is in and starts to 
-	  # listen to paint evets send to the viewport of the QGraphicsView. If you measure the 
-	  # QGraphicsView object directly the measurement is also done for the viewport.
-	  # 
+      # Testability driver qttas package provides a fixture for measuring fps of a component. 
+      # This behaviour is a wrapper for the fixture.
+      # The fixture intercepts paint events send to the target of the fps measurement and simply 
+      # counts how many occur during each second. The way this is done differs a bit depending 
+      # on the target object. For normal QWidgets the fps values are measured to the target 
+      # object direclty. QGraphicsItem based objects this is not the case. For QGrapchisItem 
+      # based objects the system determines the QGraphicsView the item is in and starts to 
+      # listen to paint evets send to the viewport of the QGraphicsView. If you measure the 
+      # QGraphicsView object directly the measurement is also done for the viewport.
+      # 
       # == returns
       # NilClass
       #   description: -
@@ -67,106 +66,124 @@ module MobyBehaviour
       # ArgumentError
       #  description:  In case the given parameters are not valid.
       #    
-	  def start_fps_measurement
+      def start_fps_measurement
+
+        begin
+
+          fixture('fps', 'startFps')
 
-		begin
-		  self.fixture('fps', 'startFps')
-		rescue Exception => e
+        rescue Exception
 
-		  $logger.behaviour "FAIL;Failed start_fps_measurement.;#{ identity };start_fps_measurement;"
-		  Kernel::raise e
+          $logger.behaviour "FAIL;Failed start_fps_measurement.;#{ identity };start_fps_measurement;"
+          raise
 
-		end
+        end
 
-		$logger.behaviour "PASS;Operation start_fps_measurement executed successfully.;#{ identity };start_fps_measurement;"
+        $logger.behaviour "PASS;Operation start_fps_measurement executed successfully.;#{ identity };start_fps_measurement;"
 
-		nil
-	  end
+        nil
+        
+      end
 
       # == description
       # Stop collecting frames per second data for the object. 
-	  # 
+      # 
       # == returns
       # Array
-      #   description: An Array of fps entries. Each entry is a hash table that contains the 
-	  #                value and time stamp {value => 12, time_stamp => 06:49:42.259}
-      #   example: [{value => 12, time_stamp => 06:49:42.259}, {value => 11, time_stamp => 06:49:43.259}]
+      #  description: An Array of fps entries. Each entry is a hash table that contains the value and time stamp {value => 12, time_stamp => 06:49:42.259}
+      #  example: [{value => 12, time_stamp => 06:49:42.259}, {value => 11, time_stamp => 06:49:43.259}]
       #
       # == exceptions
       # ArgumentError
       #  description:  In case the given parameters are not valid.
       #    
-	  def stop_fps_measurement
+      def stop_fps_measurement
 
-		begin
-		  results = parse_results( self.fixture('fps', 'stopFps') )
-		rescue Exception => e
+        begin
 
-		  $logger.behaviour "FAIL;Failed stop_fps_measurement.;#{ identity };stop_fps_measurement;"
-		  Kernel::raise e
+          results = parse_results( fixture('fps', 'stopFps') )
 
-		end
+        rescue Exception
 
-		$logger.behaviour "PASS;Operation stop_fps_measurement executed successfully.;#{ identity };stop_fps_measurement;"
+          $logger.behaviour "FAIL;Failed stop_fps_measurement.;#{ identity };stop_fps_measurement;"
 
-		results
-	  end
+          raise
 
+        end
+
+        $logger.behaviour "PASS;Operation stop_fps_measurement executed successfully.;#{ identity };stop_fps_measurement;"
+
+        results
+
+      end
 
       # == description
       # Collect the stored fps results from the target. This will not stop the measurement but it will restart it
-	  # so the results returned will not be included in the next data request. Measuring fps will have a small impact
-	  # on the software performance and memory consumption so it is recommended that the collection is stopped if no longer
-	  # needed.
-	  # 
+      # so the results returned will not be included in the next data request. Measuring fps will have a small impact
+      # on the software performance and memory consumption so it is recommended that the collection is stopped if no longer
+      # needed.
+      # 
       # == returns
       # Array
       #   description: An Array of fps entries. Each entry is a hash table that contains the 
-	  #                value and time stamp {value => 12, time_stamp => 06:49:42.259}
+      #                value and time stamp {value => 12, time_stamp => 06:49:42.259}
       #   example: [{value => 12, time_stamp => 06:49:42.259}, {value => 11, time_stamp => 06:49:43.259}]
       #
       # == exceptions
       # ArgumentError
       #  description:  In case the given parameters are not valid.
       #    
-	  def collect_fps_data
+      def collect_fps_data
+
+        begin
+
+          results = parse_results( fixture('fps', 'collectData') )
+
+        rescue Exception
+
+          $logger.behaviour "FAIL;Failed collect_fps_data.;#{ identity };collect_fps_data;"
+
+          raise
+
+        end
+
+        $logger.behaviour "PASS;Operation collect_fps_data executed successfully.;#{ identity };collect_fps_data;"
+
+        results
+
+      end
+
+    private
+      
+      def parse_results( results_xml )
+
+        state_object = @sut.state_object( results_xml )
+
+        results = []
 
-		begin
-		  results = parse_results( self.fixture('fps', 'collectData') )
-		rescue Exception => e
+        count = state_object.results.attribute('count').to_i
 
-		  $logger.behaviour "FAIL;Failed collect_fps_data.;#{ identity };collect_fps_data;"
-		  Kernel::raise e
+        for i in 0...count
+        
+          value = state_object.fps(:id => i.to_s).attribute('frameCount').to_i
 
-		end
+          time_stamp = state_object.fps(:id => i.to_s).attribute('timeStamp')
 
-		$logger.behaviour "PASS;Operation collect_fps_data executed successfully.;#{ identity };collect_fps_data;"
+          entry = {:value => value, :time_stamp => time_stamp}
 
-		results
-	  end
+          results.push(entry)
 
-	  private
-	  
-	  def parse_results(results_xml)
-		xml_as_object = @sut.state_object( results_xml )
-		results = []
-		count = xml_as_object.results.attribute('count').to_i
-		for i in 0...count
-		  value = xml_as_object.fps(:id => i.to_s).attribute('frameCount').to_i
-		  time_stamp = xml_as_object.fps(:id => i.to_s).attribute('timeStamp')
-		  entry = {:value => value, :time_stamp => time_stamp}
-		  results.push(entry)
-		end
-		results
-	  end
-	  
+        end
 
-	  # enable hooking for performance measurement & debug logging
-	  TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+        results
 
+      end
+      
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
-	end # Fps
+    end # Fps
 
-  end
+  end # QT
 
 end # MobyBase

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/gesture.rb

@@ -106,7 +106,7 @@ module MobyBehaviour
       rescue Exception => e
 
         $logger.behaviour "FAIL;Failed flick with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
-        Kernel::raise e        
+        raise e        
       end      
 
       $logger.behaviour "PASS;Operation flick executed successfully with direction \"#{direction}\", button \"#{button.to_s}\".;#{identity};flick;"
@@ -182,7 +182,7 @@ module MobyBehaviour
       rescue Exception => e
 
         $logger.behaviour "FAIL;Failed flick_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
-        Kernel::raise e        
+        raise e        
 
       end      
 
@@ -275,7 +275,7 @@ module MobyBehaviour
       rescue Exception => e
 
         $logger.behaviour "FAIL;Failed gesture with direction \"#{direction}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
-        Kernel::raise e        
+        raise e        
       end      
 
       $logger.behaviour "PASS;Operation gesture executed successfully with direction \"#{direction}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
@@ -351,7 +351,7 @@ module MobyBehaviour
         rescue Exception => e
 
           $logger.behaviour "FAIL;Failed gesture_to with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", button \".;#{identity};gesture;"
-          Kernel::raise e        
+          raise e        
         end
 
         $logger.behaviour "PASS;Operation gesture_to executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\".;#{identity};gesture;"
@@ -424,7 +424,7 @@ module MobyBehaviour
 
         rescue Exception => e      
           $logger.behaviour "FAIL;Failed gesture_from with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\", button \".;#{identity};gesture;"
-          Kernel::raise e        
+          raise e        
         end
         $logger.behaviour "PASS;Operation gesture_from executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", distance \"#{distance.to_s}\".;#{identity};gesture;"
         self
@@ -496,7 +496,7 @@ module MobyBehaviour
       rescue Exception => e      
 
         $logger.behaviour "FAIL;Failed gesture_to_object with button.;#{identity};drag;"
-        Kernel::raise e        
+        raise e        
 
       end      
 
@@ -684,7 +684,7 @@ module MobyBehaviour
       rescue Exception => e      
         
         $logger.behaviour "FAIL;Failed drag with direction \"#{direction}\", distance \"#{distance}\", button \"#{button.to_s}\".;#{identity};drag;"
-        Kernel::raise e        
+        raise e        
 
       end      
 
@@ -738,7 +738,7 @@ module MobyBehaviour
 
         rescue Exception => e      
           $logger.behaviour "FAIL;Failed drag_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
-          Kernel::raise e        
+          raise e        
         end      
 
         $logger.behaviour "PASS;Operation drag_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
@@ -804,7 +804,7 @@ module MobyBehaviour
         rescue Exception => e      
 
           $logger.behaviour "FAIL;Failed drag_to_object with button \"#{button.to_s}\".;#{identity};drag;"
-          Kernel::raise e        
+          raise e        
 
         end      
 
@@ -874,7 +874,7 @@ module MobyBehaviour
         rescue Exception => e      
 
           $logger.behaviour "FAIL;Failed move with direction \"#{direction}\", distance \"#{distance}\",.;#{identity};move;"
-          Kernel::raise e        
+          raise e        
 
         end      
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/infologger.rb

@@ -611,7 +611,7 @@ module MobyBehaviour
 			# params
       #  Hash
       #   description: Optional params hash. If :clearLog => true given will clear the log when loading by default log will not be cleared.
-			#   example: {:clearLog = true}
+			#   example: {:clearLog => true}
 			#
       #
 			# == returns
@@ -639,7 +639,7 @@ module MobyBehaviour
 			# params
       #  Hash
       #   description: Optional params hash. If :clearLog => true given will clear the log when loading by default log will not be cleared.
-			#   example: {:clearLog = true}
+			#   example: {:clearLog => true}
 			#
       #
 			# == returns
@@ -667,7 +667,7 @@ module MobyBehaviour
 			# params
       #  Hash
       #   description: Optional params hash. If :clearLog => true given will clear the log when loading by default log will not be cleared.
-			#   example: {:clearLog = true}
+			#   example: {:clearLog => true}
 			#
       #
 			# == returns
@@ -697,7 +697,7 @@ module MobyBehaviour
       # params
       #  Hash
       #   description: Optional params hash. If :clearLog => true given will clear the log when loading by default log will not be cleared.
-      #   example: {:clearLog = true}
+      #   example: {:clearLog => true}
       #
       #
       # == returns
@@ -741,7 +741,7 @@ module MobyBehaviour
 
         rescue Exception => e
           $logger.behaviour "FAIL;Failed infologger \"#{params.to_s}\".;#{service};"
-          Kernel::raise e
+          raise e
         end
         $logger.behaviour "PASS;Operation infologger succeeded with params \"#{params.to_s}\".;#{service};"
         ret

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/key_press.rb

@@ -85,7 +85,7 @@ module MobyBehaviour
 
 					command.set_require_response( true )
 
-					#Kernel::raise ArgumentError.new( "Wrong argument type %s for key (Expected: %s)" % [ key.class, "Symbol/Fixnum/KeySequence" ] ) unless [ Fixnum, Symbol, MobyCommand::KeySequence ].include?( key.class )  
+					#raise ArgumentError.new( "Wrong argument type %s for key (Expected: %s)" % [ key.class, "Symbol/Fixnum/KeySequence" ] ) unless [ Fixnum, Symbol, MobyCommand::KeySequence ].include?( key.class )  
 
 					# raise exception if value type other than Fixnum or Symbol
           key.check_type [ Fixnum, Symbol, MobyCommand::KeySequence ], 'wrong argument type $1 for key (expected $2)'
@@ -131,7 +131,7 @@ module MobyBehaviour
             scancode = key.to_i
 					
 					  # raise exception if value is other than fixnum
-					  Kernel::raise ArgumentError.new( "Scan code for :%s not defined in keymap" % key ) unless scancode.kind_of?( Fixnum )
+					  raise ArgumentError.new( "Scan code for :%s not defined in keymap" % key ) unless scancode.kind_of?( Fixnum )
 
 					  # add scancode for keypress event
 					  command.command_value( scancode.to_s )
@@ -141,7 +141,7 @@ module MobyBehaviour
 					# execute command & verify that execution passed ("OK" expected as response) 
 					@sut.execute_command(command)
 
-					#Kernel::raise RuntimeError.new("Error occured during keypress (Response: %s)" % @response ) unless ( @response = @sut.execute_command(command) ) == "OK" 
+					#raise RuntimeError.new("Error occured during keypress (Response: %s)" % @response ) unless ( @response = @sut.execute_command(command) ) == "OK" 
 
 				rescue #Exception
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/method.rb

@@ -75,7 +75,7 @@ module MobyBehaviour
 			#   description: invoking the method failed
 			def call_method( method_name, *params )
 
-				Kernel::raise ArgumentError.new( "Method name was empty" ) if method_name.empty?
+				raise ArgumentError.new( "Method name was empty" ) if method_name.empty?
 				command = command_params #in qt_behaviour      
 				command.transitions_off     
 				command.command_name( 'CallMethod' )
@@ -94,7 +94,7 @@ module MobyBehaviour
           when TrueClass,FalseClass
               key = "B"
           else
-            Kernel::raise ArgumentError.new( "Method parameter #{i}: Only String,Fixunum,Float and Boolean types are supported" ) 
+            raise ArgumentError.new( "Method parameter #{i}: Only String,Fixunum,Float and Boolean types are supported" ) 
           end
          pars["method_param#{i}"] = key+param.to_s
         }

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/multitouch.rb

@@ -214,7 +214,7 @@ module MobyBehaviour
 
 		      rescue Exception => e      
 		        $logger.behaviour "FAIL;Failed pinch_zoom with params \"#{ params.inspect }\".;#{ identity };pinch_zoom;"
-		        Kernel::raise e        
+		        raise e        
 		      end      
 
 		      $logger.behaviour "PASS;Operation pinch_zoom succeeded with params \"#{ params.inspect }\".;#{ identity };pinch_zoom;"
@@ -415,7 +415,7 @@ module MobyBehaviour
 		      do_sleep( time )
 		    rescue Exception => e      
 		      $logger.behaviour "FAIL;Failed rotate with params \"#{ params.inspect }\".;#{ identity };rotate;"
-		      Kernel::raise e        
+		      raise e        
 		    end      
 
 		    $logger.behaviour "PASS;Operation rotate succeeded with params \"#{ params.inspect }\".;#{ identity };rotate;"

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/behaviours/os.rb

@@ -60,10 +60,10 @@ module MobyBehaviour
       ##open file is done without ui state update so wait for the dialog to open
       # sleep 0.2
       # @sut.execute_command(command)
-      # self.force_refresh
+      # force_refresh
       # rescue Exception => e
       # $logger.behaviour "FAIL;Failed open_file with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
-      # Kernel::raise e
+      # raise e
       # end
       # $logger.behaviour "PASS;Operation file executed successfully with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
       # nil
@@ -83,10 +83,10 @@ module MobyBehaviour
 					interval = (interval*1000).to_i
 					params = {:interval => interval}
 				  end
-				  self.execute_command( MobyCommand::WidgetCommand.new( nil, nil, nil, 'PressEnter', params, nil, 'uiCommand') )
+				  execute_command( MobyCommand::WidgetCommand.new( nil, nil, nil, 'PressEnter', params, nil, 'uiCommand') )
 				rescue Exception => e
 					$logger.behaviour "FAIL;Failed to send an Enter keystroke request to the qttas server;press_enter;"
-					Kernel::raise e
+					raise e
 				end
 					$logger.behaviour "PASS;Successfuly sent an Enter keystroke request to the qttas server;press_enter;"
 				nil