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

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

@@ -19,32 +19,49 @@
 
 module MobyCommand
 
-
   class FindObjectCommand < MobyCommand::CommandData
-	
-	
-	# Constructor
-	# == params
-	# btn_id:: (optional) String, id for the button perform this command on
-	# command_type:: (optional) Symbol, defines the command to perform on the button
-	# == returns
-	# Touch:: New CommandData object
-	# == raises
-	# ArgumentError:: When the supplied command_type is invalid.
-	def initialize(sut, app_details = nil, params = nil)
-	  @_params = params
-	  @_app_details = app_details
-	  @_sut = sut
-	end
-
-	def application_details
-	  @_app_details
-	end
-
-	def search_parameters
-	  @_params
-	end
-
-
-  end
-end
+    
+    # Constructor
+    # == params
+    # btn_id:: (optional) String, id for the button perform this command on
+    # command_type:: (optional) Symbol, defines the command to perform on the button
+    # == returns
+    # MobyCommand::FindObjectCommand:: New CommandData object
+    # == raises
+    # ArgumentError:: When the supplied command_type is invalid.
+    def initialize( sut, app_details = nil, params = nil, checksum = nil )
+
+      @_params = params
+
+      @_app_details = app_details
+
+      @_sut = sut
+
+      @_checksum = checksum
+
+    end
+
+    # TODO: document me
+    def application_details
+
+      @_app_details
+
+    end
+
+    # TODO: document me
+    def search_parameters
+
+      @_params
+
+    end
+
+    # TODO: document me
+    def checksum
+
+      @_checksum
+
+    end
+
+  end # FindObjectCommand
+
+end # MobyCommand

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

@@ -0,0 +1,34 @@
+############################################################################
+## 
+## 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 MobyCommand
+
+  class VersionCommand < MobyCommand::CommandData
+		
+	  # Constructor
+	  # == params
+	  # == returns
+	  # MobyCommand::VersionCommand:: New CommandData object
+	  # == raises
+	  def initialize
+	  end
+
+  end # VersionCommand
+
+end # MobyCommand

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

@@ -42,7 +42,7 @@ module MobyCommand
 			@@_valid_types = [ nil, :Standard, :Graphics, :Application, :Action, :Web ]
 
 			self.application_id(application_id )
-			self.object_id( object_id )
+			self.set_object_id( object_id )
 			self.object_type( object_type )
 			self.command_name( command_name )    
 			self.command_params( params )
@@ -123,7 +123,7 @@ module MobyCommand
 		# == returns  
 		# == raises
 		# ArgumentError:: When the supplied id is not of type String   
-		def object_id(id)
+		def set_object_id(id)
 			raise ArgumentError.new( "Object id must be a string." ) unless id == nil or id.kind_of?( String )
 			@_object_id = id
 		end

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

@@ -20,128 +20,181 @@
 module MobyController
   
   module QT
-	
-	module Application 
-	  
+  
+    module Application 
+      
       include MobyUtil::MessageComposer
 
-	  def set_adapter( adapter )
-		
-		@sut_adapter = adapter
-		
-	  end           
-	  
-	  # Execute the command). 
-	  # Sends the message to the device using the @sut_adapter (see base class)     
-	  # == params         
-	  # == returns
-	  # == raises
-	  # ArgumentError: raised if unsupported command type   
-	  def execute()
-		
-		return_response_crc = false
-		
-		# application ui state
-		if @_command == :State
-		  
-		  command_xml = state_message()
-		  return_response_crc = true
-		  
-		  # launch application
-		elsif @_command == :Run
-		  command_xml = run_message()
-
-		  # close
-		elsif @_command == :Close
-		  command_xml = close_message()
-
-		  # close qttas
-		elsif @_command == :CloseQttas
-		  #params = {'uid' => '0'}
-		  command_xml = make_xml_message({:service => 'closeApplication'},'Close',{'uid' => '0'})
-
-		  # kill application
-		elsif @_command == :Kill
-		  command_xml = make_xml_message({:service => 'closeApplication'},'Kill',{'uid' => @_application_uid})
-
-		  # list application -- raises exception??
-		elsif @_command == :List
-		  Kernel::raise ArgumentError.new( "Unknown command! " + @_command.to_s )
-
-		  # list applications		      
-		elsif @_command == :ListApps
-		  service_details = {:service => 'listApps', :name => @_application_name, :id => @_application_uid}
-		  command_xml = make_xml_message(service_details, 'listApps', nil )
-
-		  # list started applications		      
-		elsif @_command == :ListStartedApps
-		  service_details = {:service => 'startedApps', :name => @_application_name, :id => @_application_uid}
-		  command_xml = make_xml_message(service_details, 'startedApps', nil )
-
-		  # list crashed applications
-		elsif @_command == :ListCrashedApps
-		  service_details = {:service => 'listCrashedApps', :name => @_application_name, :id => @_application_uid}
-		  command_xml = make_xml_message(service_details, 'listCrashedApps', nil )
-
-		  # shell command
-		elsif @_command == :Shell
-		  command_xml = make_xml_message({:service => 'shellCommand'}, 'shellCommand', @_flags, @_application_name)
-
-		  # kill all application started by agent_qt
-		elsif @_command == :KillAll
-		  command_xml = make_xml_message({:service =>'kill'},'Kill', nil)
-
-		  # tap screen
-		elsif @_command == :TapScreen
-		  command_xml = make_xml_message({:service =>'tapScreen'}, 'TapScreen', params)
-
-		  # bring application to foreground
-		elsif @_command == :BringToForeground
-		  command_xml = make_xml_message({:service => 'bringToForeground'},'BringToForeground', {'pid' => @_application_uid})
-		  
-		  # system info
-		elsif @_command == :SystemInfo
-		  command_xml = make_xml_message({:service => 'systemInfo'}, 'systemInfo', nil)
-		  
-		  # start process memory logging
-		elsif @_command == :ProcessMemLoggingStart
-		  
-		  parameters = {
-			'thread_name' => @_application_name, 
-			'file_name' => @_flags[ :file_name ],
-			'timestamp' => @_flags[ :timestamp ],
-			'interval_s' => @_flags[ :interval_s] }
-
-		  command_xml = make_xml_message({:service => 'resourceLogging'}, 'ProcessMemLoggingStart', parameters)
-
-
-		  # stop process memory logging
-		elsif @_command == :ProcessMemLoggingStop
-		  parameters = {'thread_name' => @_application_name,
-			'return_data' => @_flags[ :return_data ]}
-
-		  command_xml = make_xml_message({ :service =>'resourceLogging'}, 'ProcessMemLoggingStop',parameters)
-
-		  # start CPU load generating
-		elsif @_command == :CpuLoadStart
-		  parameters =  {'cpu_load' => @_flags[ :cpu_load ]}
-		  command_xml = make_xml_message({:service => 'resourceLogging'},'CpuLoadStart',parameters)
-
-		  # stop CPU load generating
-		elsif @_command == :CpuLoadStop
-		  command_xml = make_xml_message({:service => 'resourceLogging'},'CpuLoadStop', nil)
-
-		  # unknown command
-		else
-		  Kernel::raise ArgumentError.new( "Unknown command! " + @_command.to_s )
-		end
-		
-		message = Comms::MessageGenerator.generate( command_xml )
-		@sut_adapter.send_service_request( message, return_response_crc ) if message		
-	  end
-
-	end # application
-
-  end  # QT  	
+      def set_adapter( adapter )
+    
+        @sut_adapter = adapter
+    
+      end           
+      
+      # Execute the command 
+      # Sends the message to the device using the @sut_adapter (see base class)     
+      # == params         
+      # == returns
+      # == raises
+      # ArgumentError: raised if unsupported command type   
+      def execute
+    
+        return_response_crc = false
+
+        case @_command
+        
+          # application ui state
+          when  :State        
+
+            command_xml = state_message
+
+            return_response_crc = true
+          
+          # launch application
+          when :Run
+          
+            command_xml = run_message
+
+          # close
+          when :Close
+          
+            command_xml = close_message
+
+          # close qttas
+          when :CloseQttas
+
+            command_xml = make_xml_message( { :service => 'closeApplication' }, 'Close', { 'uid' => '0' } )
+
+          # kill application
+          when :Kill
+
+            command_xml = make_xml_message( { :service => 'closeApplication' }, 'Kill', { 'uid' => @_application_uid } )
+
+          # list applications          
+          when :ListApps
+
+            service_details = { 
+              :service => 'listApps', 
+              :name => @_application_name, 
+              :id => @_application_uid 
+            }
+
+            command_xml = make_xml_message( service_details, 'listApps', nil )
+
+          # list applications          
+          when :ListRunningProcesses
+
+            service_details = { 
+              :service => 'listRunningProcesses', 
+              :name => @_application_name, 
+              :id => @_application_uid 
+            }
+
+            command_xml = make_xml_message( service_details, 'listRunningProcesses', nil )
+
+          # list started applications          
+          when :ListStartedApps
+
+            service_details = { 
+              :service => 'startedApps', 
+              :name => @_application_name, 
+              :id => @_application_uid 
+            }
+
+            command_xml = make_xml_message( service_details, 'startedApps', nil )
+
+          # list crashed applications
+          when :ListCrashedApps
+
+            service_details = { 
+              :service => 'listCrashedApps', 
+              :name => @_application_name, 
+              :id => @_application_uid 
+            }
+
+            command_xml = make_xml_message( service_details, 'listCrashedApps', nil )
+
+          # shell command
+          when :Shell
+
+            command_xml = make_xml_message( { :service => 'shellCommand' }, 'shellCommand', @_flags, @_application_name )
+
+          # kill all application started by agent_qt
+          when :KillAll
+
+            command_xml = make_xml_message( { :service => 'kill' }, 'Kill', nil )
+
+          # tap screen
+          when :TapScreen
+
+            command_xml = make_xml_message( { :service =>'tapScreen' }, 'TapScreen', params)
+
+          # bring application to foreground
+          when :BringToForeground
+
+            command_xml = make_xml_message( { :service => 'bringToForeground' }, 'BringToForeground', { 'pid' => @_application_uid } )
+          
+          # system info
+          when :SystemInfo
+
+            command_xml = make_xml_message( { :service => 'systemInfo' }, 'systemInfo', nil)
+          
+          # start process memory logging
+          when :ProcessMemLoggingStart
+          
+            parameters = {
+              'thread_name' => @_application_name, 
+              'file_name' => @_flags[ :file_name ],
+              'timestamp' => @_flags[ :timestamp ],
+              'interval_s' => @_flags[ :interval_s ]
+            }
+
+            command_xml = make_xml_message( { :service => 'resourceLogging' }, 'ProcessMemLoggingStart', parameters )
+
+          # stop process memory logging
+          when :ProcessMemLoggingStop
+
+            parameters = {
+              'thread_name' => @_application_name,
+              'return_data' => @_flags[ :return_data ]
+            }
+
+            command_xml = make_xml_message( { :service =>'resourceLogging' }, 'ProcessMemLoggingStop', parameters )
+
+          # start CPU load generating
+          when :CpuLoadStart
+
+            parameters = {
+              'cpu_load' => @_flags[ :cpu_load ]
+            }
+
+            command_xml = make_xml_message( { :service => 'resourceLogging' }, 'CpuLoadStart', parameters )
+
+          # stop CPU load generating
+          when :CpuLoadStop
+          
+            command_xml = make_xml_message( { :service => 'resourceLogging' }, 'CpuLoadStop', nil )
+
+          # list application -- raises exception??
+          #when :List
+
+            #raise ArgumentError, "Unknown command! #{ @_command.to_s }"
+        
+        else
+        
+          # unknown command
+          raise ArgumentError, "Unknown command! #{ @_command.to_s }"
+          
+        end
+    
+        message = Comms::MessageGenerator.generate( command_xml )
+
+        @sut_adapter.send_service_request( message, return_response_crc ) if message    
+
+      end
+
+    end # application
+
+  end  # QT    
 
 end # MobyController

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

@@ -21,30 +21,39 @@ module MobyController
 
   module QT
 
-	module FindObjectCommand
-	  include MobyUtil::FindObjectGenerator
-
-	  # 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
-		msg = generate_message
-		@sut_adapter.send_service_request(MobyController::QT::Comms::MessageGenerator.generate(msg), true)		
-	  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 FindObjectCommand
-	
-  end #module QT
-
-end #module MobyController
+    module FindObjectCommand
+
+      include MobyUtil::FindObjectGenerator
+
+      # 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( 
+
+          # *[ message, return_crc ]
+          MobyController::QT::Comms::MessageGenerator.generate( generate_message ), true 
+
+        )
+
+      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 # FindObjectCommand
+  
+  end # QT
+
+end # MobyController