testability-driver-qt-sut-plugin 1.1.1 → 1.2.0

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

@@ -122,7 +122,7 @@ module MobyBehaviour
       #   # perform the tests here...
       # 
       #   # stop logging and get data as state object
-      #   log_data_object = MobyBase::StateObject.new( @app.stop_cpu_log )
+      #   log_data_object = @sut.state_object( @app.stop_cpu_log )
       # 
       #   # collect values from log_data_object to result array
       #   result = ( 0 .. log_data_object.logData.attribute( 'entryCount' ).to_i ).collect do | index | 
@@ -245,7 +245,7 @@ module MobyBehaviour
       #   # perform the tests here...
       # 
       #   # stop logging and get data as state object
-      #   log_data_object = MobyBase::StateObject.new( @app.stop_mem_log )
+      #   log_data_object = @sut.state_object( @app.stop_mem_log )
       # 
       #   # collect values from log_data_object to result array
       #   result = ( 0 .. log_data_object.logData.attribute( 'entryCount' ).to_i ).collect do | index | 
@@ -326,6 +326,38 @@ module MobyBehaviour
       end
 
 
+      # == description
+      # Starts logging the power usage of the device
+      # NOTE: not supported on all platforms. Platforms not supporting this will return -1 values.
+      # Logging is done to a file in the given intervals (seconds). Small (<1) intervals may cause problems and should be avoided.
+      #
+      # The default behaviour is that a new log file will be created whenever the logging is started.
+      # If you need to save the old results use the append parameter to tell the logger to append the results to the existing file.
+      #
+      # == arguments
+      # params
+      #  Hash
+      #   description: Update interval and path for the log file. Interval value is in seconds.
+      #   The file path given must exist on the target.
+      #   Optional append parameter can also be given and if true the log file will not be cleared if one exists (by default a new file will always be started).
+      #   example: {:interval => 1, :filePath => 'C:\Data', :append => true}
+      #
+      # == returns
+      # nil
+      #  description: -
+      #  example: -
+      # == exceptions
+      # ArgumentError
+      #  description: For missing / wrong argument types
+      #
+      # == info
+      #
+      def log_pwr(params)
+        params[:action] = 'start'
+        execute_info('pwr', params)
+      end
+
+
       # == description
       # Stops the gpu memory logging and returns the results and xml data.
       # Will return an error if the logging was not started.
@@ -380,7 +412,7 @@ module MobyBehaviour
       #   # perform the tests here...
       # 
       #   # stop logging and get data as state object
-      #   log_data_object = MobyBase::StateObject.new( @app.stop_gpu_log )
+      #   log_data_object = @sut.state_object( @app.stop_gpu_log )
       # 
       #   # create arrays for the results
       #   total_memory            = [] 
@@ -460,6 +492,117 @@ module MobyBehaviour
         params[:action] = 'stop'
         execute_info('gpu', params)
       end
+      
+
+      # == description
+      # Stops the power logging and returns the results and xml data.
+      # Will return an error if the logging was not started.
+      # The logging is done by writing the values to a log file.
+      # When the logging is stopped the file is read and a xml format of the data is returned. The file is removed.\n
+      #
+      # Top object is of type logData and name pwrUsage. It contains the number of entries. The entries are the child elements of logData element.
+      #
+      # [code]
+      #   <object id="0" name="pwrUsage" type="logData" >
+      #    <attributes>
+      #      <attribute name="entryCount" >
+      #        <value>8</value>
+      #      </attribute>
+      #    </attributes>
+      #    <objects>
+      # [/code]
+      #
+      # Each logEntry contains a timeStamp (yyyyMMddhhmmsszzz), totalMem, usedMem, freeMem, processPrivateMem and processSharedMem. Process specific details may not always be available. \n
+      #
+      # [code]
+      #    <object id="0" name="LogEntry" type="logEntry" >
+      #      <attributes>
+      #        <attribute name="timeStamp" >
+      #        <value>20100108190741059</value>
+      #        </attribute>
+      #        <attribute name="voltage" >
+      #          <value>4317</value>
+      #        </attribute>
+      #        <attribute name="current" >
+      #          <value>-107</value>
+      #        </attribute>
+      #      </attributes>
+      #    </object>
+      # [/code]
+      #
+      # You can use xpath to access the data directly to form any your own reports. Another way is to create a state object out of the data. This way you can access the data as you access ui state objects.
+      #
+      # [code]
+      #   # start logging
+      #   @app.log_pwr( :interval => 1, :filePath => 'C:\Data' )
+      #  
+      #   # perform the tests here...
+      # 
+      #   # stop logging and get data as state object
+      #   log_data_object = @sut.state_object( @app.stop_pwr )
+      # 
+      #   # create arrays for the results
+      #   voltage             = [] 
+      #   current             = [] 
+      # 
+      #   # collect values from each log entry and store to results array
+      #   ( 0 .. log_data_object.logData.attribute( 'entryCount' ).to_i ).each do | index |
+      # 
+      #     # store log entry reference to variable  
+      #     entry = log_data_object.logEntry( :id => index.to_s ) 
+      # 
+      #     # store entry values to array
+      #     voltage            << entry.attribute( 'voltage' ).to_i
+      #     current            << entry.attribute( 'current' ).to_i
+      # 
+      #   end 
+      # 
+      #   g = Gruff::Line.new
+      #   g.title = "Application cpu usage%"
+      #   g.data( "voltage", voltage )
+      #   g.data( "current", current )
+      #   g.write( "info_pwr.png" )
+      # [/code]
+      #
+      # The example produces a graph which shows the power usage (values depend on the testing steps, device, platform etc...).
+      #
+      # == arguments
+      # params
+      #  Hash
+      #   description: Optional parameters.
+      #   example: {:clearLog => true}
+      #
+      # == returns
+      # Xml
+      #  description: data is returned in the same format as the ui state xml
+      #  example: <object id="0" name="LogEntry" type="logEntry" >
+      #      <attributes>
+      #        <attribute name="timeStamp" >
+      #        <value>20100108190741059</value>
+      #        </attribute>
+      #        <attribute name="voltage" >
+      #          <value>4318</value>
+      #        </attribute>
+      #        <attribute name="current" >
+      #          <value>-107</value>
+      #        </attribute>
+      #      </attributes>
+      #    </object>
+      #
+      # == exceptions
+      # RuntimeError
+      #  description: When no data has been colleted
+      # ArgumentError
+      #  description: For missing / wrong argument types
+      #
+      # == info
+      #
+      def stop_pwr_log(params={})
+        params[:action] = 'stop'
+        execute_info('pwr', params)
+      end
+      
+      
 
       # == description
       # Load the cpu log without stopping the logging.
@@ -545,6 +688,35 @@ module MobyBehaviour
         params[:action] = 'load'
         execute_info('gpu', params)
       end
+      
+
+      # == description
+      # Load the power log without stopping the logging.
+      #
+      # == arguments
+      # 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}
+      #
+      #
+      # == returns
+      # Xml
+      #  description: data is returned in the same format as the ui state xml
+      #  example: -
+      #
+      # == exceptions
+      # RuntimeError
+      #  description: When no data has been colleted
+      # ArgumentError
+      #  description: For missing / wrong argument types
+      #
+      # == info
+      #
+      def load_pwr_log(params={})
+        params[:action] = 'load'
+        execute_info('pwr', params)
+      end
 
       private
 
@@ -568,10 +740,10 @@ module MobyBehaviour
           end
 
         rescue Exception => e
-          $logger.log "behaviour","FAIL;Failed infologger \"#{params.to_s}\".;#{service};"
+          $logger.behaviour "FAIL;Failed infologger \"#{params.to_s}\".;#{service};"
           Kernel::raise e
         end
-        $logger.log "behaviour","PASS;Operation infologger succeeded with params \"#{params.to_s}\".;#{service};"
+        $logger.behaviour "PASS;Operation infologger succeeded with params \"#{params.to_s}\".;#{service};"
         ret
       end
 

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

@@ -91,11 +91,11 @@ module MobyBehaviour
           key.check_type [ Fixnum, Symbol, MobyCommand::KeySequence ], 'wrong argument type $1 for key (expected $2)'
 
 					# verify that keymap is defined for sut if symbol used. 
-					raise ArgumentError, "Symbol #{ key.inspect } cannot be used due to no keymap defined for #{ @sut.id } in TDriver configuration file." if key.kind_of?( Symbol ) && $parameters[ @sut.id ].has_key?( :keymap ) == false
+					raise ArgumentError, "Symbol #{ key.inspect } cannot be used due to no keymap defined for #{ @sut.id } in TDriver configuration file." if key.kind_of?( Symbol ) && sut_parameters.has_key?( :keymap ) == false
 
 					if key.kind_of?( Symbol )
 
-					  scancode = TDriver::KeymapUtilities.fetch_keycode( key, $parameters[ @sut.id ][ :keymap ] )
+					  scancode = TDriver::KeymapUtilities.fetch_keycode( key, sut_parameters[ :keymap ] )
 
             # convert hexadecimal (string) to fixnum
 					  scancode = scancode.hex if scancode.kind_of?( String )
@@ -112,9 +112,9 @@ module MobyBehaviour
 
 					  key.get_sequence.each do | key_event |
 					        
-					    #tempcode = $parameters[ @sut.id ][ :keymap ][ key_event[ :value ], nil ]
+					    #tempcode = sut_parameters[ :keymap ][ key_event[ :value ], nil ]
 
-  					  tempcode = TDriver::KeymapUtilities.fetch_keycode( key_event[ :value ], $parameters[ @sut.id ][ :keymap ] )
+  					  tempcode = TDriver::KeymapUtilities.fetch_keycode( key_event[ :value ], sut_parameters[ :keymap ] )
 
 					    tempcode = tempcode.hex if tempcode.kind_of?( String )
 						
@@ -143,7 +143,7 @@ module MobyBehaviour
 
 					#Kernel::raise RuntimeError.new("Error occured during keypress (Response: %s)" % @response ) unless ( @response = @sut.execute_command(command) ) == "OK" 
 
-				rescue Exception
+				rescue #Exception
 
 					$logger.behaviour "FAIL;Failed press_key with key \"#{ key }\".;#{ identity };press_key;"
 

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

@@ -93,7 +93,8 @@ module MobyBehaviour
 		    password = $parameters[ :localisation_server_password ]
 		
 		    db_connection = MobyUtil::DBConnection.new(  db_type, host, database_file, username, password )
-		    table_name = $parameters[ :sut_qt ][ :localisation_server_database_tablename, "" ]
+
+		    table_name = sut_parameters[ :localisation_server_database_tablename, "" ]
                     
 		    begin
 			    tmp_path = $parameters[:tmp_folder] + "/locale_db_tmp"

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ############################################################################
 ## 
 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
@@ -49,32 +50,58 @@ module MobyBehaviour
 			# == description
 			# Calls an invokable method of the Qt test object.
 			# Slots and signals are automatically invokable, but other methods must be explicitly made invokable.
-			# This version does not support method arguments or return values.
+      # 
+      # Warning: Use with caution - function parameters must match exactly to the Qt slot. Otherwise
+      #          behavior is undefined.
 			# 
 			# == arguments
 			# method_name
 			#  String
 			#   description: name of method to invoke, including empty parenthesis
 			#   example: "clear()"
+      # *params
+      #  Array
+      #   description: Parameters for the method. Currently primitive types (String,Fixnum,Float, boolean) are supported. 
+      #                Must match the parameters and types of the slot.
+      #   example: 1.2, 'Hello'
 			#
 			# == returns
-			# Undefined
-			#  description: on success, returns unspecified value of unspecified type
-			#  example: "OK"
+			# String
+			#  description: returns slot return value, empty string if void.
+      #  example: "1"
 			#
 			# == exceptions
 			# RuntimeError
 			#   description: invoking the method failed
-			def call_method( method_name )
+			def call_method( method_name, *params )
 
 				Kernel::raise ArgumentError.new( "Method name was empty" ) if method_name.empty?
 				command = command_params #in qt_behaviour      
 				command.transitions_off     
 				command.command_name( 'CallMethod' )
-				command.command_params( 'method_name' => method_name.to_s )
+
+        # Syntactically terrible..
+        pars = {'method_name' => method_name.to_s }
+
+        params.each_with_index{ |param,i|
+          case param
+          when String
+              key = "S"
+          when Fixnum
+              key = "I"
+          when Float
+              key = "D"
+          when TrueClass,FalseClass
+              key = "B"
+          else
+            Kernel::raise ArgumentError.new( "Method parameter #{i}: Only String,Fixunum,Float and Boolean types are supported" ) 
+          end
+         pars["method_param#{i}"] = key+param.to_s
+        }
+				command.command_params(pars)
 				command.service( 'objectManipulation' )
+
 				returnValue = @sut.execute_command( command )
-				Kernel::raise RuntimeError.new( "Calling method '%s' failed with error: %s" % [ method_name, returnValue ] ) if ( returnValue != "OK" )
 			end
 
 			# enable hooking for performance measurement & debug logging

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

@@ -213,11 +213,11 @@ module MobyBehaviour
 		        do_sleep(time)
 
 		      rescue Exception => e      
-		        $logger.log "behaviour","FAIL;Failed pinch_zoom with params \"#{params.to_s}\".;#{identity};pinch_zoom;"
+		        $logger.behaviour "FAIL;Failed pinch_zoom with params \"#{ params.inspect }\".;#{ identity };pinch_zoom;"
 		        Kernel::raise e        
 		      end      
 
-		      $logger.log "behaviour","PASS;Operation pinch_zoom succeeded with params \"#{params.to_s}\".;#{identity};pinch_zoom;"
+		      $logger.behaviour "PASS;Operation pinch_zoom succeeded with params \"#{ params.inspect }\".;#{ identity };pinch_zoom;"
 
 		      self
 
@@ -414,11 +414,11 @@ module MobyBehaviour
 		      #wait untill the operation to finish
 		      do_sleep( time )
 		    rescue Exception => e      
-		      $logger.log "behaviour","FAIL;Failed rotate with params \"#{params.to_s}\".;#{identity};rotate;"
+		      $logger.behaviour "FAIL;Failed rotate with params \"#{ params.inspect }\".;#{ identity };rotate;"
 		      Kernel::raise e        
 		    end      
 
-		    $logger.log "behaviour","PASS;Operation rotate succeeded with params \"#{params.to_s}\".;#{identity};rotate;"
+		    $logger.behaviour "PASS;Operation rotate succeeded with params \"#{ params.inspect }\".;#{ identity };rotate;"
 
 		    self
 

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

@@ -62,10 +62,10 @@ module MobyBehaviour
       # @sut.execute_command(command)
       # self.force_refresh
       # rescue Exception => e
-      # $logger.log "behaviour" , "FAIL;Failed open_file with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
+      # $logger.behaviour "FAIL;Failed open_file with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
       # Kernel::raise e
       # end
-      # $logger.log "behaviour" , "PASS;Operation file executed successfully with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
+      # $logger.behaviour "PASS;Operation file executed successfully with path \"#{path}\", dialog_name \"#{dialog_name}\", button \"#{button.to_s}\".;#{identity};open_file;"
       # nil
       # end			
 			# Press Enter on the keyboard. Useful to accept crash warnings on windows
@@ -85,10 +85,10 @@ module MobyBehaviour
 				  end
 				  self.execute_command( MobyCommand::WidgetCommand.new( nil, nil, nil, 'PressEnter', params, nil, 'uiCommand') )
 				rescue Exception => e
-					$logger.log "behaviour" , "FAIL;Failed to send an Enter keystroke request to the qttas server;press_enter;"
+					$logger.behaviour "FAIL;Failed to send an Enter keystroke request to the qttas server;press_enter;"
 					Kernel::raise e
 				end
-					$logger.log "behaviour" , "PASS;Successfuly sent an Enter keystroke request to the qttas server;press_enter;"
+					$logger.behaviour "PASS;Successfuly sent an Enter keystroke request to the qttas server;press_enter;"
 				nil
 			end
 

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

@@ -62,12 +62,12 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					$logger.log "behaviour" , "FAIL;Failed start_recording.;#{ identity };start_recording;"
+					$logger.behaviour "FAIL;Failed start_recording.;#{ identity };start_recording;"
 					Kernel::raise e
 
 				end
 
-				$logger.log "behaviour" , "PASS;Operation start_recording executed successfully.;#{ identity };start_recording;"
+				$logger.behaviour "PASS;Operation start_recording executed successfully.;#{ identity };start_recording;"
 
 				nil
 			end
@@ -88,12 +88,12 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					$logger.log "behaviour" , "FAIL;Failed stop_recording.;#{ identity };stop_recording;"
+					$logger.behaviour "FAIL;Failed stop_recording.;#{ identity };stop_recording;"
 					Kernel::raise e
 
 				end
 
-				$logger.log "behaviour" , "PASS;Operation stop_recording executed successfully.;#{ identity };stop_recording;"
+				$logger.behaviour "PASS;Operation stop_recording executed successfully.;#{ identity };stop_recording;"
 
 				nil
 
@@ -113,12 +113,12 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					$logger.log "behaviour" , "FAIL;Failed print_recordings.;#{ identity };print_recordings;"
+					$logger.behaviour "FAIL;Failed print_recordings.;#{ identity };print_recordings;"
 					Kernel::raise e
 
 				end
 
-				$logger.log "behaviour" , "PASS;Operation print_recordings executed successfully.;#{ identity };print_recordings;"
+				$logger.behaviour "PASS;Operation print_recordings executed successfully.;#{ identity };print_recordings;"
 
 				return ret
 

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

@@ -112,16 +112,16 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					#$logger.log "behaviour" , "FAIL;Failed capture_screen with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
+					#$logger.behaviour "FAIL;Failed capture_screen with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
 
-					$logger.log "behaviour" , "FAIL;Failed capture_screen with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
+					$logger.behaviour "FAIL;Failed capture_screen with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
 
 					Kernel::raise e
 
 				end
 
-				#$logger.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
-				$logger.log "behaviour" , "PASS;Operation capture_screen executed successfully with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
+				#$logger.behaviour "PASS;Operation capture_screen executed successfully with format \"#{format}\", file_name \"#{file_name}\".;#{ identity };capture_screen;"
+				$logger.behaviour "PASS;Operation capture_screen executed successfully with format \"%s\", file_name \"%s\".;%s;capture_screen;" % [ format, file_name, identity ]
 
 				image_binary
 
@@ -205,15 +205,13 @@ module MobyBehaviour
 
 				rescue Exception => e
 
-					$logger.log "behaviour", 
-						"FAIL;Failed when searching for image on the screen.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"  
+					$logger.behaviour "FAIL;Failed when searching for image on the screen.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"  
 
 					Kernel::raise e
 
 				end
 
-				$logger.log "behaviour", 
-					"PASS;Image search completed successfully.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
+				$logger.behaviour "PASS;Image search completed successfully.;#{ identity };find_on_screen;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 				result
 
@@ -258,16 +256,14 @@ module MobyBehaviour
 					result = !find_on_screen(image_or_path, tolerance).nil?
 				rescue Exception => exc
 
-					$logger.log "behaviour", 
-						"FAIL;Failed when searching for image on the screen.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
+					$logger.behaviour	"FAIL;Failed when searching for image on the screen.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 					Kernel::raise exc
 
 
 				end      
 
-				$logger.log "behaviour", 
-					"PASS;Image search completed successfully.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
+				$logger.behaviour "PASS;Image search completed successfully.;#{ identity };screen_contains?;#{(image_or_path.respond_to?(:filename) ? image_or_path.filename : image_or_path.to_s)},#{tolerance.to_s}"
 
 				result