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

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

@@ -91,10 +91,12 @@ module MobyBehaviour
 
           execute_behavior(move_params, command)
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed to mouse_move"
-          Kernel::raise e
+
+          raise
+
         end
 
         $logger.behaviour "PASS;Operation mouse_move executed successfully"
@@ -216,7 +218,7 @@ module MobyBehaviour
             #params['obj_x'] = (center_x.to_i - 1).to_s
             #params['obj_y'] = (center_y.to_i - 1).to_s
             params['x'] = (center_x.to_i - 1).to_s
-            params['y'] = (center_y.to_i - 1).to_s
+            params['y'] = (center_y.to_i - 5).to_s #make sure we do not tap between two line links
             params['useCoordinates'] = 'true'
 				end
 
@@ -247,10 +249,10 @@ module MobyBehaviour
                  )
                 )
                 #puts "web element scroll"
-                self.scroll(0,0,1) # enable tap centralization
+                scroll(0,0,1) # enable tap centralization
                 #puts "web element force refresh in tap"
-                self.force_refresh({:id => get_application_id})
-                self.tap(tap_params, interval, button)
+                force_refresh({:id => get_application_id})
+                tap(tap_params, interval, button)
                 return
               end
             end
@@ -266,10 +268,11 @@ module MobyBehaviour
             sleep interval * tap_count
           end
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed tap with tap_count \"#{tap_count}\", button \"#{button.to_s}\".;#{identity};tap;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -364,10 +367,11 @@ module MobyBehaviour
 
           execute_behavior(tap_params, command)
 
-        rescue # Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed #{behavior_name} with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
-          Kernel::raise $!
+
+          raise
 
         end
 
@@ -490,7 +494,7 @@ module MobyBehaviour
           ens = param_set_configured?(tap_params, :ensure_event)
           tap_params[:ensure_event] = false
           if ens
-            self.ensure_event(:retry_timeout => 5, :retry_interval => 0.5) {
+            ensure_event(:retry_timeout => 5, :retry_interval => 0.5) {
                   tap_down(button, false, tap_params)
                   sleep time
                   tap_up(button, false, tap_params)
@@ -502,10 +506,13 @@ module MobyBehaviour
           end
 
             
-        rescue Exception => e
+        rescue Exception
+
           $logger.enabled = logging_enabled
+
           $logger.behaviour "FAIL;Failed long_tap with time \"#{time.to_s}\", button \"#{button.to_s}\".;#{identity};long_tap;"
-          Kernel::raise e
+
+          raise
 
         end
         $logger.enabled = logging_enabled
@@ -556,13 +563,16 @@ module MobyBehaviour
       def long_tap_object( x, y, time = 1, button = :Left, tap_params = {} )
 
         begin
+
           tap_down_object(x, y, button, tap_params)
           sleep time
           tap_up_object(x, y, button, tap_params)
-        rescue Exception => e
+
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed long_tap_object with time \"#{time.to_s}\", button \"#{button.to_s}\".;#{identity};long_tap_object;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -628,12 +638,13 @@ module MobyBehaviour
           command.command_params(params)
           execute_behavior(tap_params, command)
 
-          self.force_refresh( :id => get_application_id ) if refresh
+          force_refresh( :id => get_application_id ) if refresh
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed tap_down with button \"#{button.to_s}\", refresh \"#{refresh.to_s}\".;#{identity};tap_down;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -696,12 +707,13 @@ module MobyBehaviour
           command.command_params(params)
 
           execute_behavior(tap_params, command)
-          self.force_refresh({:id => get_application_id}) if refresh
+          force_refresh({:id => get_application_id}) if refresh
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed tap_up with button \"#{button.to_s}\", refresh \"#{refresh.to_s}\".;#{identity};tap_up;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -741,10 +753,11 @@ module MobyBehaviour
 
           @sut.execute_command(command)
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed press with tap_count \"#{tap_count}\", button \"#{button.to_s}\".;#{identity};press;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -764,10 +777,15 @@ module MobyBehaviour
         $stderr.puts "#{ caller(0).last.to_s } warning: TestObject#long_press is deprecated; use TestObject#long_tap"
 
         begin
+
           long_tap(time, button)
-        rescue Exception => e
+
+        rescue Exception
+
           $logger.behaviour "FAIL;Failed long_press with time \"#{time.to_s}\", button \"#{button.to_s}\".;#{identity};long_press;"
-          Kernel::raise e
+
+          raise
+
         end
 
         $logger.behaviour "PASS;Operation long_press executed successfully with time \"#{time.to_s}\", button \"#{button.to_s}\".;#{identity};long_press;"
@@ -789,10 +807,11 @@ module MobyBehaviour
 
           tap_down(button, refresh)
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed hold with button \"#{button.to_s}\", refresh \"#{refresh.to_s}\".;#{identity};hold;"
-          Kernel::raise e
+
+          raise
 
         end
 
@@ -815,10 +834,11 @@ module MobyBehaviour
 
           tap_up(button, refresh)
 
-        rescue Exception => e
+        rescue Exception
 
           $logger.behaviour "FAIL;Failed release with button \"#{button.to_s}\", refresh \"#{refresh.to_s}\".;#{identity};release;"
-          Kernel::raise e
+
+          raise
 
         end
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/group.rb

@@ -17,32 +17,28 @@
 ## 
 ############################################################################
 
-
-
-#require File.expand_path( File.join( File.dirname( __FILE__ ), 'command_data' ) )
-
 module MobyCommand
 
   class Group < MobyCommand::CommandData
 
-	attr_reader :interval, :application, :block, :multitouch
+	  attr_reader :interval, :application, :block, :multitouch
 
-	# Constructor to Group
-	# == params
-	# interval: interval between commands
-	# application: target application
-	# block: block of commands to group
-	def initialize( interval, application, block )    
-	  @interval = interval
-	  @application = application
-	  @block = block
-	  @multitouch = false
-	end
+	  # Constructor to Group
+	  # == params
+	  # interval: interval between commands
+	  # application: target application
+	  # block: block of commands to group
+	  def initialize( interval, application, block )    
+	    @interval = interval
+	    @application = application
+	    @block = block
+	    @multitouch = false
+	  end
 
-	def set_multitouch(multitouch = true)
-	  @multitouch = multitouch
-	end
+	  def set_multitouch(multitouch = true)
+	    @multitouch = multitouch
+	  end
 
-  end
+  end # Group
 
-end #module
+end # MobyCommand

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

@@ -47,9 +47,10 @@ module MobyCommand
 			@@_valid_directions = [nil, :Up, :Down, :Left,:Right]
 			@@_valid_orientations = [nil,:Vertical, :Horizontal]
 
-			self.command(command_type)    
-			self.id(btn_id)
-			self
+			command(command_type)    
+			id(btn_id)
+			
+      self
 
 		end
 

data/lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/widget.rb

@@ -17,12 +17,13 @@
 ## 
 ############################################################################
 
-
-
 module MobyCommand
 
 	class WidgetCommand < MobyCommand::CommandData
 
+    # class variable
+    VALID_OBJECT_TYPES = [ nil, :Standard, :Graphics, :Application, :Action, :Web ] unless defined?( VALID_OBJECT_TYPES )
+
 		# Constructs a new CommandParams object. CommandParams stores the details for the commands send
 		# to suts that operate using the tasCommand xml format. The controller creates an xml formatted 
 		# operation request that will be forwarded to the sut being tested. 
@@ -37,65 +38,67 @@ module MobyCommand
 		# CommandParams:: New CommandParams object
 		# == raises
 		# ArgumentError:: When the supplied params are invalid type (initially can be nil)  
-		def initialize(application_id = nil, object_id = nil, object_type = nil, command_name = nil, params = nil, value=nil, service = nil)
+		def initialize( application_id = nil, object_id = nil, object_type = nil, command_name = nil, params = nil, value=nil, service = nil )
+
+			application_id(application_id )
+
+			set_object_id( object_id )
+
+			object_type( object_type )
+
+			command_name( command_name )    
 
-			@@_valid_types = [ nil, :Standard, :Graphics, :Application, :Action, :Web ]
+			command_params( params )
 
-			self.application_id(application_id )
-			self.set_object_id( object_id )
-			self.object_type( object_type )
-			self.command_name( command_name )    
-			self.command_params( params )
-			self.command_value( value )
-			self.service( service )
+			command_value( value )
+      
+			service( service )
 	
-			@_transitions = true
+      transitions_on
 
-			return self
+			self
 
 		end
 
-		def service(service)
+		def service( service )
+
 			@_service = service
-		end
 
-		def get_service
-			@_service
 		end
 
 		# Set transition flag on
 		# Will cause the events to be 
 		# done on a delayed mode.
 		def transitions_on
+
 			@_transitions = true
+
 		end
 
 		# Set transition flag off
 		# Will cause the events to be 
 		# done on immediately
 		def transitions_off
+
 			@_transitions = false
-		end
 
-		# Return the transition value  
-		# ==returns
-		# bool: true of false  
-		def get_transitions
-			@_transitions    
 		end
 
-
 		# Set true if response is expected from device side after command
 		# Has been completed.
 		# ==params
 		# bool: True if response needed
-		def set_require_response(response_required)
+		def set_require_response( response_required )
+
 			@_response_required = response_required
+
 		end
 
 		# Returns true if response required after command.
 		def require_response?
+
 			@_response_required 
+
 		end
 
 		# Application id of the currently tested application
@@ -104,17 +107,12 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied id is not of type String   
-		def application_id(id)
-			raise ArgumentError.new( "Application id must be a string." ) unless id == nil or id.kind_of?( String )
+		def application_id( id )
+
+      id.check_type [ NilClass, String ], 'wrong argument type $1 for application id (expected $2)'
+
 			@_application_id = id
-		end
 
-		# Return application id
-		# == params  
-		# == returns
-		# String:: Application id of the command 
-		def get_application_id
-			@_application_id
 		end
 
 		# Object id of the target object
@@ -123,17 +121,12 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied id is not of type String   
-		def set_object_id(id)
-			raise ArgumentError.new( "Object id must be a string." ) unless id == nil or id.kind_of?( String )
+		def set_object_id( id )
+
+      id.check_type [ NilClass, String ], 'wrong argument type $1 for object id (expected $2)'
+
 			@_object_id = id
-		end
 
-		# Return object id
-		# == params  
-		# == returns
-		# String:: Object id of the command 
-		def get_object_id
-			@_object_id
 		end
 
 		# Object type of the target object
@@ -142,18 +135,13 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied type is not :Graphics or :Standard   
-		def object_type(type)
-			raise ArgumentError.new("Given object type '#{type.to_s}' is not valid.") unless @@_valid_types.include?(type)
+		def object_type( type )
+
+			raise TypeError.new("Given object type #{ type.inspect } is not valid.") unless VALID_OBJECT_TYPES.include?( type )
+
 			@_object_type = type
-		end
 
-		# Return object type
-		# == params  
-		# == returns
-		# String:: Object type of the command 
-		def get_object_type
-			@_object_type
-		end  
+		end
 
 		# Name of the command
 		# == params
@@ -161,17 +149,12 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied command_name is not of type String  
-		def command_name(name)
-			raise ArgumentError.new( "Command name must be a String." ) unless name == nil or name.kind_of?( String )
+		def command_name( name )
+
+      name.check_type [ NilClass, String ], 'wrong argument type $1 for command name (expected $2)'
+
 			@_command_name = name  
-		end
 
-		# Return name of the command
-		# == params  
-		# == returns
-		# String:: Name of the command 
-		def get_command_name
-			@_command_name
 		end
 
 		# Command parameters
@@ -180,17 +163,12 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied params is of type Hash   
-		def command_params(params)
-			raise ArgumentError.new( "The given params must be in a hash (name => value)." ) unless params == nil or params.kind_of?( Hash )
+		def command_params( params )
+
+      params.check_type [ NilClass, Hash ], 'wrong argument type $1 for command parameters (expected $2)'
+
 			@_command_params = params
-		end
 
-		# Return params of the command
-		# == params  
-		# == returns
-		# Hash:: Command parameter hash 
-		def get_command_params
-			@_command_params
 		end
 
 		# Command value which is passed on to the device as the value of the command.
@@ -201,26 +179,21 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied params not of type String or Array or nil
-		def command_value(value)
-			raise ArgumentError.new( "Command value must be a string." ) unless value == nil or value.kind_of?( String ) or value.kind_of? Array
+		def command_value( value )
+		
+      value.check_type [ NilClass, String, Array ], 'wrong argument type $1 for command value (expected $2)'
+
 			@_command_value = value
-		end
 
-		# Return command value
-		# == params  
-		# == returns
-		# tring or Array:: Command value  
-		def get_command_value
-			@_command_value
 		end
 
-		def set_event_type(event_type)
+		def set_event_type( event_type )
+
+      #event_type.check_type [ NilClass, String ], 'wrong argument type $1 for event type (expected $2)'
+
 		  @_event_type = event_type
+
 		end
-		
-		def get_event_type		  
-		  Kernel::raise "Assert: event_type must be set!" unless @_event_type
-		  @_event_type
-		end
+
 	end
 end