testability-driver-qt-sut-plugin 1.2.1 → 1.3.0

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

@@ -89,7 +89,7 @@ module MobyBehaviour
           end
           command.command_params(params)
 
-          @sut.execute_command(command)
+          execute_behavior(move_params, command)
 
         rescue Exception => e
 
@@ -130,12 +130,15 @@ module MobyBehaviour
       #  |:interval|This method sleeps tap_count times interval|Integer|2|1|
       #  |:tap_count|Number of taps to do|Integer|2|1|
       #  |:use_tap_screen|Should tapping be done on screen or as mouse event to the object|Boolean|true|see TDriver parameters table below|
+      #  |:ensure_event|Verify that an event is sent to the target object. Retry if not received by target|Boolean|true|false|
+      #
       # tdriver_params_table
       #  title: Default values read from tdriver parameters
       #  description: These setting values are read from tdriver_parameters.xml
       #  |Name|Description|Default if missing from parameters|
       #  |use_tap_screen|See :use_tap_screen above|false|
       #  |in_tap_move_pointer|Wether to actually move mouse pointer to tap coordinates|false|
+      #  |:ensure_event|Verify that an event is sent to the target object. Retry if not received by target|false|
       #
       # == returns
       # NilClass
@@ -178,6 +181,7 @@ module MobyBehaviour
 
             tap_count = tap_params[:tap_count].nil? ? 1 : tap_params[:tap_count]
             use_tap_screen = tap_params[:use_tap_screen].nil? ? sut_parameters[ :use_tap_screen, 'false'] : tap_params[:use_tap_screen].to_s
+            
           else
             tap_count = tap_params
 
@@ -254,7 +258,7 @@ module MobyBehaviour
           command.command_params(params)
 
           # puts "tap: " + (Time.now - tapMeasure).to_s + " s - tap about to execute "
-          @sut.execute_command( command )
+          execute_behavior(tap_params, command)
 
           # puts "tap: " + (Time.now - tapMeasure).to_s + " s - executed"
           #do not allow operations to continue untill taps done
@@ -358,7 +362,7 @@ module MobyBehaviour
                                  
                                  )
 
-          @sut.execute_command(command)
+          execute_behavior(tap_params, command)
 
         rescue # Exception => e
 
@@ -479,13 +483,25 @@ module MobyBehaviour
 
         logging_enabled = $logger.enabled
         $logger.enabled = false
-
+          
         raise ArgumentError.new("First parameter should be time between taps or Hash") unless tap_params.kind_of? Hash or tap_params.kind_of? Fixnum
 
         begin
-          tap_down(button, false, tap_params)
-          sleep time
-          tap_up(button, false, tap_params)
+          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) {
+                  tap_down(button, false, tap_params)
+                  sleep time
+                  tap_up(button, false, tap_params)
+                }
+          else
+            tap_down(button, false, tap_params)
+            sleep time
+            tap_up(button, false, tap_params)
+          end
+
+            
         rescue Exception => e
           $logger.enabled = logging_enabled
           $logger.behaviour "FAIL;Failed long_tap with time \"#{time.to_s}\", button \"#{button.to_s}\".;#{identity};long_tap;"
@@ -610,7 +626,7 @@ module MobyBehaviour
           params.merge!(tap_params)
 
           command.command_params(params)
-          @sut.execute_command(command)
+          execute_behavior(tap_params, command)
 
           self.force_refresh( :id => get_application_id ) if refresh
 
@@ -679,8 +695,7 @@ module MobyBehaviour
 
           command.command_params(params)
 
-
-          @sut.execute_command(command)
+          execute_behavior(tap_params, command)
           self.force_refresh({:id => get_application_id}) if refresh
 
         rescue Exception => e

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

@@ -0,0 +1,54 @@
+############################################################################
+## 
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+## All rights reserved. 
+## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
+## 
+## This file is part of TDriver. 
+## 
+## If you have questions regarding the use of this file, please contact 
+## Nokia at testabilitydriver@nokia.com . 
+## 
+## This library is free software; you can redistribute it and/or 
+## modify it under the terms of the GNU Lesser General Public 
+## License version 2.1 as published by the Free Software Foundation 
+## and appearing in the file LICENSE.LGPL included in the packaging 
+## of this file. 
+## 
+############################################################################
+
+module MobyController
+  
+  module QT
+  
+    module AgentCommand
+      
+      include MobyController::Abstraction
+
+      # TODO: document me
+      # overloads default MobyController::Abstraction#make_message
+      def make_message
+      
+        command = @parameters[ :command ]
+      
+        case command
+        
+          when :version
+          
+            # query agent version from versionService
+            Comms::MessageGenerator.generate( '<TasCommands service="versionService" />' )
+        
+        else
+        
+          # raise exception if command not implemented
+          raise NotImplementedError, "command #{ command.inspect } not implemented in #{ self.class.name }"
+        
+        end
+      
+      end
+
+    end # AgentCommand
+
+  end  # QT    
+
+end # MobyController

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

@@ -30,6 +30,7 @@ module MobyController
         @sut_adapter = adapter
     
       end           
+
       
       # Execute the command 
       # Sends the message to the device using the @sut_adapter (see base class)     

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

@@ -19,42 +19,35 @@
 
 module MobyController
 
-	module QT
-
-		module ConfigureCommand
-
-			# Execute the command
-			# Sends the message to the device using the @sut_adapter (see base class)     
-			# == params         
-			# == returns
-			# == raises
-			# NotImplementedError: raised if unsupported command type       
-		  def execute
-			
-			@sut_adapter.send_service_request(
-			      Comms::MessageGenerator.generate(
-				Nokogiri::XML::Builder.new{
-					  TasCommands( :service => "confService", :id=> application_id ) {
-							Target( :TasId => "Application" ) {
-							  Command( value || "", ( params || {} ).merge( :name => name ) )
-						    }
-					      }
-						}.to_xml
-					  )
-				    )
-
-			end
-
-			def set_adapter( adapter )
-				@sut_adapter = adapter
-			end
-
-			# enable hooking for performance measurement & debug logging
-			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
-
-		end #module ConfigureCommand
-
-	end #module QT
-
-end #module MobyController
-
+  module QT
+
+    module ConfigureCommand
+
+      include MobyController::Abstraction
+
+      # Creates service command message which will be sent to @sut_adapter by execute method
+      # == params         
+      # == returns
+      # == raises
+      def make_message
+      
+        Comms::MessageGenerator.generate(
+          Nokogiri::XML::Builder.new{
+            TasCommands( :service => "confService", :id=> application_id ) {
+              Target( :TasId => "Application" ){
+                Command( value || "", ( params || {} ).merge( :name => name ) )
+              }
+            }
+          }.to_xml
+        )
+      
+      end
+
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+    end # ConfigureCommand
+
+  end # QT
+
+end # MobyController

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

@@ -25,27 +25,17 @@ module MobyController
 
       include MobyUtil::FindObjectGenerator
 
-      # Execute the command
-      # Sends the message to the device using the @sut_adapter (see base class)     
+      include MobyController::Abstraction
+
+      # Creates service command message which will be sent to @sut_adapter by execute method
       # == params         
       # == returns
       # == raises
-      # NotImplementedError: raised if unsupported command type       
-      def execute
-
-        @sut_adapter.send_service_request( 
-
-          # *[ message, return_crc ]
-          MobyController::QT::Comms::MessageGenerator.generate( generate_message ), true 
-
-        )
-
-      end
-
-      def set_adapter( adapter )
-
-        @sut_adapter = adapter
-
+      def make_message
+      
+        # *[ message, return_crc ]
+        [ Comms::MessageGenerator.generate( generate_message ), true ]
+            
       end
 
       # enable hooking for performance measurement & debug logging
@@ -56,4 +46,3 @@ module MobyController
   end # QT
 
 end # MobyController
-

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

@@ -19,34 +19,47 @@
 
 module MobyController
 
-	module QT
+  module QT
 
-		module Fixture 
-		  include MobyUtil::MessageComposer
+    module Fixture 
 
-			# Execute the command
-			# Sends the message to the device using the @sut_adapter (see base class)     
-			# == params         
-			# == returns
-			# == raises
-			# NotImplementedError: raised if unsupported command type       
-			def execute
-				Kernel::raise ArgumentError.new( "Fixture '%s' not found for sut id '%s'" % [ @name, @sut_adapter.sut_id ] ) if ( plugin_params =  $parameters[ @sut_adapter.sut_id.to_sym ][ :fixtures ][ @params[:name].to_sym, nil ] ).nil?
+      include MobyUtil::MessageComposer
 
-        fixture_plugin = plugin_params.kind_of?(String) ? plugin_params : plugin_params[:plugin] 
-				@sut_adapter.send_service_request(Comms::MessageGenerator.generate(make_fixture_message(fixture_plugin, @params)))
+      include MobyController::Abstraction
 
-			end
+      # Creates service command message which will be sent to @sut_adapter by execute method
+      # == params         
+      # == returns
+      # == raises
+      def make_message
 
-			def set_adapter( adapter )
-				@sut_adapter = adapter
-			end
+        # use local variable for less AST lookups
+        sut_id = @sut_adapter.sut_id.to_sym
 
-			# enable hooking for performance measurement & debug logging
-			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+        plugin_name = @params[ :name ].to_s
 
-		end # Fixture
+        # retrieve plugin details from fixtures configuration
+        plugin_params = $parameters[ sut_id ][ :fixtures ][ plugin_name.to_sym, nil ]
 
-	end #module QT
+        # verify that plugin is configured
+        plugin_params.not_nil "Fixture #{ plugin_name.inspect } not found for #{ sut_id.inspect }"
 
-end #module MobyController
+        # retrieve plugin name
+        fixture_plugin = plugin_params.kind_of?( String ) ? plugin_params : plugin_params[ :plugin ] 
+
+        Comms::MessageGenerator.generate(
+          make_fixture_message(
+            fixture_plugin, @params
+          )
+        )
+            
+      end
+
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+    end # Fixture
+
+  end # QT
+
+end # MobyController

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

@@ -19,34 +19,36 @@
 
 module MobyController
 
-	module QT
-
-		module Group
-
-			# Execute the command). 
-			# Sends the message to the device using the @sut_adapter (see base class)     
-			# == params         
-			# == returns
-			# == raises
-			# NotImplementedError: raised if unsupported command type       
-			def execute
-			  builder = Nokogiri::XML::Builder.new{
-				TasCommands( :id=> application.id.to_s, :transitions => 'true', :service => 'uiCommand', :interval => interval.to_s, :multitouch => multitouch.to_s)
-			  }
-			  @sut_adapter.set_message_builder(builder)
-			  block.call
-			  @sut_adapter.send_grouped_request
-			end
-
-			def set_adapter( adapter )
-				@sut_adapter = adapter
-			end
-
-			# enable hooking for performance measurement & debug logging
-			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
-
-		end #module Group
-
-	end #module QT
+  module QT
+
+    module Group
+
+      # Execute the command). 
+      # Sends the message to the device using the @sut_adapter (see base class)     
+      # == params         
+      # == returns
+      # == raises
+      # NotImplementedError: raised if unsupported command type       
+      def execute
+        builder = Nokogiri::XML::Builder.new{
+        TasCommands( :id=> application.id.to_s, :transitions => 'true', :service => 'uiCommand', :interval => interval.to_s, :multitouch => multitouch.to_s)
+        }
+
+        @sut_adapter.set_message_builder(builder)
+        block.call
+        @sut_adapter.send_grouped_request
+
+      end
+
+      def set_adapter( adapter )
+        @sut_adapter = adapter
+      end
+
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+
+    end #module Group
+
+  end #module QT
 
 end #module MobyController

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

@@ -19,44 +19,35 @@
 
 module MobyController
 
-	module QT
+  module QT
 
-		module InfoLoggerCommand
+    module InfoLoggerCommand
 
-			# Execute the command
-			# Sends the message to the device using the @sut_adapter (see base class)     
-			# == params         
-			# == returns
-			# == raises
-			# NotImplementedError: raised if unsupported command type       
-			def execute
+      include MobyController::Abstraction
 
-				@sut_adapter.send_service_request(
-					Comms::MessageGenerator.generate(
-						Nokogiri::XML::Builder.new{
-							TasCommands( :service => "infoService", :id=> application_id, :interval => params[:interval] ) {
-								Target( :TasId => "Application" ) {
-									Command( value || "", ( params || {} ).merge( :name => name ) )
-								}
-							}
-						}.to_xml
-					)
-				)
+      # Creates service command message which will be sent to @sut_adapter by execute method
+      # == params         
+      # == returns
+      # == raises
+      def make_message
 
-			end
+        Comms::MessageGenerator.generate(
+          Nokogiri::XML::Builder.new{
+            TasCommands( :service => "infoService", :id=> application_id, :interval => params[:interval] ) {
+              Target( :TasId => "Application" ){
+                Command( value || "", ( params || {} ).merge( :name => name ) )
+              }
+            }
+          }.to_xml
+        )
 
-			def set_adapter( adapter )
+      end
 
-				@sut_adapter = adapter
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
-			end
+    end # InfoLoggerCommand
 
-			# enable hooking for performance measurement & debug logging
-			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+  end # QT
 
-
-		end # InfoLoggerCommand
-
-	end #module QT
-
-end #module MobyController
+end # MobyController