testability-driver-qt-sut-plugin 0.9.2 → 1.0.0

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

@@ -45,7 +45,7 @@ module MobyBehaviour
     # Application
     #
 	  module Application
-
+      # == nodoc
 	    # == description
 	    # Drag from the start coordinates to the end coordinates.
 	    # 
@@ -131,11 +131,11 @@ module MobyBehaviour
 	    end
 
 	    # == description
-	    # Verify was the popup on the screen or not. The method uses matti verify internally for the verification. 
+	    # Verify was the popup on the screen or not. The method uses TDriver verify internally for the verification. 
 	    # If the popup was shown then the entire application ui state is returned as a test object. 
 	    # More detailed verification can be done for the object (e.g. the content of the popup, labels etc...).
 	    # \n
-	    # Note: If the popup does not close the verification will fail. Detection is based on grabbing the ui state just before the popup closes.
+	    # [b]NOTE:[/b] If the popup does not close the verification will fail. Detection is based on grabbing the ui state just before the popup closes.
 	    # 
       # == arguments
 	    # class_name
@@ -161,7 +161,9 @@ module MobyBehaviour
 	    end
 	    
 	    # == description
-	    # Bring the application to foreground. Note! Currently this works only for Symbian OS target!
+	    # Bring the application to foreground.\n
+	    # \n
+	    # [b]NOTE:[/b] Currently this works only for Symbian OS target!
 	    # 
 	    # == returns
 	    # NilClass
@@ -170,8 +172,8 @@ module MobyBehaviour
 	    #
 	    #
 	    def bring_to_foreground
-		  @sut.execute_command(MobyCommand::Application.new(:BringToForeground, nil, self.uid, self.sut))
-        end
+		    @sut.execute_command(MobyCommand::Application.new(:BringToForeground, nil, self.uid, self.sut))
+      end
 
 	    # == description
 	    # Taps the given objects at the same time (multitouch).
@@ -259,8 +261,9 @@ module MobyBehaviour
 	    end
 
 	    # == description
-	    # Performs the given operations at the same time (when possible). 
-	    # Note that only ui behaviours can be used here (e.g. taps, gestures).
+	    # Performs the given operations at the same time (when possible).\n
+	    # \n 
+	    # [b]NOTE:[/b] Only UI behaviours can be used here (e.g. taps, gestures).
 	    # 
       # == arguments
 	    # &block

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

@@ -138,7 +138,7 @@ module MobyBehaviour
       #
       # == arguments
       # to_qdebug
-      #  boolean
+      #  Boolean
       #   description:
       #    True to logs message to qDebug instead of a file.	  
       #    example: true
@@ -157,7 +157,7 @@ module MobyBehaviour
       #
       # == arguments
       # include
-      #  boolean
+      #  Boolean
       #   description:
       #    True to log qDebug messages and false to not
       #    example: true
@@ -177,7 +177,7 @@ module MobyBehaviour
       #
       # == arguments
       # size
-      #  integer
+      #  Fixnum
       #   description:
       #    The new log file size
       #    example: 500000

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

@@ -42,24 +42,24 @@ module MobyBehaviour
     # == objects
     # *;application
     #
-	module Events
-
-	  include MobyBehaviour::QT::Behaviour
-
-	  # == description
-	  # Enable event listening. You can specify which events you want to listen for by including the names of 
-	  # those events separated by comma or integers if using user events. Use ALL if you want to listen for all 
-	  # events but be aware that there will be a lot of events.
-	  # \n
-	  # The events listened need to be sent the object to which the enabling is done for e.g. sut.button.enable_events('ALL') 
-	  # would listen to all events sent to the button. When disabling or getting the events the operation must be done to the same object.
-	  #
+    module Events
+
+      include MobyBehaviour::QT::Behaviour
+
+      # == description
+      # Enable event listening. You can specify which events you want to listen for by including the names of 
+      # those events separated by comma or integers if using user events. Use ALL if you want to listen for all 
+      # events but be aware that there will be a lot of events.
+      # \n
+      # The events listened need to be sent the object to which the enabling is done for e.g. sut.button.enable_events('ALL') 
+      # would listen to all events sent to the button. When disabling or getting the events the operation must be done to the same object.
+      #
       # == arguments
       # filter_array
       #  Array
       #   description: Array of the event named to listen
       #   example: ["Timer","MouseButtonPress","45677","67889"]
-	  #
+      #
       # == returns
       # NilClass
       #   description: -
@@ -69,31 +69,31 @@ module MobyBehaviour
       # Exception
       #  description: In case of an error
       #    
-	  def enable_events(filter_array = nil)
+      def enable_events(filter_array = nil)
 
-		begin
-		  command = plugin_command #in qt_behaviour 
-		  command.command_name( 'EnableEvents' )
-		  params_str = ''
-		  filter_array.each {|value| params_str << value << ','} if filter_array
-		  command.command_params( 'EventsToListen' => params_str)
-		  command.service( 'collectEvents' ) 
-		  @sut.execute_command( command)
+        begin
+          command = plugin_command #in qt_behaviour 
+          command.command_name( 'EnableEvents' )
+          params_str = ''
+          filter_array.each {|value| params_str << value << ','} if filter_array
+          command.command_params( 'EventsToListen' => params_str)
+          command.service( 'collectEvents' ) 
+          @sut.execute_command( command)
 
-		rescue Exception => e
+        rescue Exception => e
 
-		  MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed enable_events with refresh \"#{filter_array.to_s}\".;#{ identity };enable_events;"
-		  Kernel::raise e
+          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed enable_events with refresh \"#{filter_array.to_s}\".;#{ identity };enable_events;"
+          Kernel::raise e
 
-		end
+        end
 
-		MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation enable_events executed successfully with refresh \"#{ filter_array.to_s }\".;#{ identity };enable_events;"
-		nil
-	  end
+        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation enable_events executed successfully with refresh \"#{ filter_array.to_s }\".;#{ identity };enable_events;"
+        nil
+      end
 
-	  # == description
-	  # Disables event listening on the target
-	  #
+      # == description
+      # Disables event listening on the target
+      #
       # == returns
       # NilClass
       #   description: -
@@ -103,62 +103,64 @@ module MobyBehaviour
       # Exception
       #  description: In case of an error
       #    
-	  def disable_events()
-
-		begin
-		  command = plugin_command #in qt_behaviour
-		  command.command_name( 'DisableEvents' )
-		  command.service( 'collectEvents' )
-		  @sut.execute_command( command)
-		rescue Exception => e
-		  MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed disable_events.;#{ identity };disable_events;"
-		  Kernel::raise e 
-		end 
-
-		MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation disable_events executed successfully.;#{ identity };disable_events;"
-		nil
-	  end
-
-	  # == description
-	  # Gets event list occured since the enabling of events
-	  # \n
-	  # The format of the xml string is the same as with the ui state.
-	  #
+      def disable_events()
+
+        begin
+          command = plugin_command #in qt_behaviour
+          command.command_name( 'DisableEvents' )
+          command.service( 'collectEvents' )
+          @sut.execute_command( command)
+        rescue Exception => e
+          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed disable_events.;#{ identity };disable_events;"
+          Kernel::raise e 
+        end 
+
+        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation disable_events executed successfully.;#{ identity };disable_events;"
+        nil
+
+      end
+
+      # == description
+      # Gets event list occured since the enabling of events. The format of the XML string is the same as with the UI state.
+      #
       # == returns
       # String
-      #   description: Xml listing containing the details of the events logger since enable_events
-      #   example: -
+      #  description: Xml listing containing the details of the events logger since enable_events
+      #  example: -
       #
       # == exceptions
       # Exception
       #  description: In case of an error
       #    
-	  def get_events()
-		ret = nil
-
-		begin
+      def get_events()
+      
+        ret = nil
 
-		  command = plugin_command(true) #in qt_behaviour 
-		  command.command_name( 'GetEvents' )
-		  command.service( 'collectEvents' )
-		  ret = @sut.execute_command( command)
-		  # TODO: how to parse the output?
+        begin
 
-		rescue Exception => e
+          command = plugin_command(true) #in qt_behaviour 
+          command.command_name( 'GetEvents' )
+          command.service( 'collectEvents' )
+          ret = @sut.execute_command( command)
+          # TODO: how to parse the output?
 
-		  MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed get_events.;#{ identity };get_events;"
-		  Kernel::raise e
+        rescue Exception => e
 
-		end
+          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed get_events.;#{ identity };get_events;"
+          Kernel::raise e
+    
+        end
 
-		MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation get_events executed successfully.;#{ identity };get_events;"
-		return ret
-	  end
+        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation get_events executed successfully.;#{ identity };get_events;"
+        
+        ret
+        
+      end
 
-	  # enable hooking for performance measurement & debug logging
-	  MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+      # enable hooking for performance measurement & debug logging
+      MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
 
-	end # EventsBehaviour
+    end # EventsBehaviour
 
   end
 

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

@@ -48,6 +48,8 @@ module MobyBehaviour
 		module Find   
 			include MobyBehaviour::QT::Behaviour
 			
+			# == nodoc
+			# TODO: fix this
 			def find_and_center (find_hash = {})
 			  begin
 				search_result = find(find_hash)

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

@@ -86,11 +86,14 @@ module MobyBehaviour
 		ret = nil
 
 		begin
+		  params = {:name => fixture_name, :command_name => fixture_method, :parameters => parameters_hash, :async => false}
 		  #for sut send the fixture command to qttasserver (appid nil)
 		  if self.class == MobyBase::SUT
-			ret = self.execute_command( MobyCommand::Fixture.new( nil, self.id, :Application, fixture_name, fixture_method, parameters_hash ) )
+			params.merge!( {:application_id => nil, :object_id => self.id, :object_type => :Application} )
+			ret = self.execute_command( MobyCommand::Fixture.new( params ) )
 		  else
-			ret = @sut.execute_command( MobyCommand::Fixture.new( get_application_id, self.id, self.attribute( 'objectType' ).intern, fixture_name, fixture_method, parameters_hash ) )
+			params.merge!( {:application_id => get_application_id, :object_id => self.id, :object_type => self.attribute( 'objectType' ).intern} )
+			ret = @sut.execute_command( MobyCommand::Fixture.new( params ) )
 		  end				  
 		rescue Exception => e
 
@@ -148,11 +151,14 @@ module MobyBehaviour
 		ret = nil
 
 		begin
+		  params = {:name => fixture_name, :command_name => fixture_method, :parameters => parameters_hash, :async => true}
 		  #for sut send the fixture command to qttasserver (appid nil)
 		  if self.class == MobyBase::SUT
-			ret = self.execute_command( MobyCommand::Fixture.new( nil, self.id, :Application, fixture_name, fixture_method, parameters_hash, true ) )
+			params.merge!( {:application_id => nil, :object_id => self.id, :object_type => :Application} )
+			ret = self.execute_command( MobyCommand::Fixture.new( params ) )
 		  else
-			ret = @sut.execute_command( MobyCommand::Fixture.new( get_application_id, self.id, self.attribute( 'objectType' ).intern, fixture_name, fixture_method, parameters_hash, true ) )
+			params.merge!( {:application_id => get_application_id, :object_id => self.id, :object_type => self.attribute( 'objectType' ).intern} )
+			ret = @sut.execute_command( MobyCommand::Fixture.new( params ) )
 		  end
 		rescue Exception => e
 

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

@@ -287,27 +287,38 @@ module MobyBehaviour
       #  description: One of the arguments is not valid   
         def gesture_to(x, y, speed, optional_params = {:button => :Left, :isDrag => false})
 
-		  begin      
+          begin      
             # change the format for api consitency
             use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
               optional_params[:use_tap_screen].to_s
             optional_params[:useTapScreen] = use_tap_screen
 
-
-            params = {:gesture_type => :MouseGestureToCoordinates, :x => x, :y => y, :speed => speed}
+            params = {:gesture_type => :MouseGestureToCoordinates, :speed => speed}
+            if attribute('objectType') == 'Web'
+              frame_x_absolute = (@sut.xml_data.xpath( "//object[@id='%s']/attributes/attribute[@name ='x_absolute']/value/text()" % self.attribute('webFrame') )[0]).to_s.to_i
+              frame_y_absolute = (@sut.xml_data.xpath( "//object[@id='%s']/attributes/attribute[@name ='y_absolute']/value/text()" % self.attribute('webFrame') )[0]).to_s.to_i
+              new_params = {:x=>(frame_x_absolute + x.to_i + (attribute('width' ).to_i/2)),
+                            :y=>(frame_y_absolute + y.to_i + (attribute('height').to_i/2))}
+              params.merge!(new_params)
+            else
+              new_params = {:x=>x, :y=>y}
+              params.merge!(new_params)
+            end
+            
+            
             params.merge!(optional_params)
-		    do_gesture(params)
-		    do_sleep(speed) 
+            do_gesture(params)
+            do_sleep(speed) 
 
-		  rescue Exception => e
+          rescue Exception => e
 
-		    MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed gesture_to with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", button \".;#{identity};gesture;"
-		    Kernel::raise e        
-		  end
+            MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed gesture_to with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\", button \".;#{identity};gesture;"
+            Kernel::raise e        
+          end
 
-		  MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation gesture_to executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\".;#{identity};gesture;"
-		  nil
-	    end
+          MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation gesture_to executed successfully with x \"#{x}\", y \"#{y}\", speed \"#{speed.to_s}\".;#{identity};gesture;"
+          nil
+        end
 
     	# == description
       # Perform a gesture with the object, starting the gesture at the specified point inside it.
@@ -409,6 +420,13 @@ module MobyBehaviour
       # ArgumentError
       #  description: One of the arguments is not valid  
 	    def gesture_to_object(target_object, duration, optional_params = {:button => :Left, :isDrag => false})    
+            if attribute('objectType') == 'Web'
+              gesture_to(target_object.attribute('x').to_i + (target_object.attribute('width' ).to_i/2) - (attribute('width' ).to_i/2),
+                         target_object.attribute('y').to_i + (target_object.attribute('height').to_i/2) - (attribute('height').to_i/2),
+                         duration, optional_params)
+              nil
+              return 
+            end
 
 		  begin
             # change the format for api consitency
@@ -422,8 +440,8 @@ module MobyBehaviour
             params[:targetId] = target_object.id
             params[:targetType] = target_object.attribute('objectType')
             params.merge!(optional_params)
-		    do_gesture(params)
-		    do_sleep(duration)
+            do_gesture(params)
+            do_sleep(duration)
 
 		  rescue Exception => e      
 
@@ -626,33 +644,22 @@ module MobyBehaviour
       #  description: One of the arguments is not valid  
 	    def drag_to( x, y, button = :Left, optional_params= {} )
 
-		    begin
-          use_tap_screen = optional_params[:use_tap_screen].nil? ? MobyUtil::Parameter[ @sut.id][ :use_tap_screen, 'false'] :
-          optional_params[:use_tap_screen].to_s
-          optional_params[:useTapScreen] = use_tap_screen
+        begin
+          optional_params.merge!({ :isDrag => true , :button=>button})
+          distance = distance_to_point(x,y)
+          speed = calculate_speed(distance, @sut.parameter[:gesture_drag_speed])
+          gesture_to(x, y, speed, optional_params )
 
+        rescue Exception => e      
+          MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed drag_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
+          Kernel::raise e        
+        end      
 
-		      distance = distance_to_point(x,y)
-		      return if distance == 0
+        MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation drag_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
 
-		      speed = calculate_speed(distance, @sut.parameter[:gesture_drag_speed])
-          params = {:gesture_type => :MouseGestureToCoordinates, :x => x, :y => y, :speed => speed, :isDrag => true, :button => button}
-          params.merge!(optional_params)
-          do_gesture(params)		
-		      do_sleep( speed )
-
-		    rescue Exception => e      
-
-		      MobyUtil::Logger.instance.log "behaviour" , "FAIL;Failed drag_to with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
-		      Kernel::raise e        
+        nil
 
-		    end      
-
-		    MobyUtil::Logger.instance.log "behaviour" , "PASS;Operation drag_to executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};drag;"
-
-		    nil
-
-	    end
+      end
 
       # == description
       # Drag the object to the center of another object.
@@ -744,8 +751,8 @@ module MobyBehaviour
       # optional_params
       #  Hash
       #   description: The only optional argument supported by drag_to_object is :use_tap_screen.
-      #   example: { :use_tap_screen => 'true' }
-      #   default: { :use_tap_screen => 'false' }  
+      #   example: {:use_tap_screen => 'true'}
+      #   default: {:use_tap_screen => 'false'}  
       #
       # == returns
       # NilClass
@@ -807,9 +814,9 @@ module MobyBehaviour
 	    def do_gesture(params)
 		    validate_gesture_params!(params)
 
-		    if attribute('objectType') == 'Embedded'
-		      params['x'] = center_x
-		      params['y'] = center_y					
+		    if attribute('objectType') == 'Embedded' or attribute('objectType') == 'Web'
+		      params['obj_x'] = center_x
+		      params['obj_y'] = center_y
 		      params['useCoordinates'] = 'true'
 		    end