testability-driver-qt-sut-plugin 1.0.3 → 1.0.4

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

@@ -17,8 +17,6 @@
 ## 
 ############################################################################
 
-require 'zlib'
-
 module MobyController
 
   module QT
@@ -38,7 +36,7 @@ module MobyController
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	  end
 
@@ -68,8 +66,8 @@ module MobyController
 		  #check that response matches the request
 		  if @message_id != msg_id 
 			
-			MobyUtil::Logger.instance.log "fatal" , "Response to request did not match: \"#{@message_id}\"!=\"#{msg_id.to_s}\""
-			MobyUtil::Logger.instance.log "fatal" , @msg_body 
+			$logger.log "fatal" , "Response to request did not match: \"#{@message_id}\"!=\"#{msg_id.to_s}\""
+			$logger.log "fatal" , @msg_body 
 			
 			Kernel::raise RuntimeError.new("Response to request did not match: \"#{@message_id}\"!=\"#{msg_id.to_s}\"") 
 			
@@ -86,7 +84,7 @@ module MobyController
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	  end #class
 
@@ -100,7 +98,7 @@ module MobyController
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	  end
 
@@ -149,7 +147,7 @@ module MobyController
 		end			
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	  end # class
 

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

@@ -47,9 +47,20 @@ module MobyController
 
 			end
 
-			# enable hooking for performance measurement & debug logging
-			MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+      def received_packets
+
+				@sut_adapter.socket_received_packets
+
+			end
+
+      def sent_packets
 
+				@sut_adapter.socket_sent_packets
+
+			end
+
+			# enable hooking for performance measurement & debug logging
+			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 		end # SutController
 

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

@@ -17,51 +17,63 @@
 ## 
 ############################################################################
 
-
-
 module MobyUtil
   
   module FindObjectGenerator
 	
 	def generate_message
-	  filters = make_params if MobyUtil::Parameter[ @_sut.id ][ :filter_type, 'none' ] == 'dynamic'
-
-	  params = search_parameters
+	
+	  filter_type = $parameters[ @_sut.id ][ :filter_type, 'none' ]
+	
+	  filters = make_params if filter_type == 'dynamic'
 
 	  builder = Nokogiri::XML::Builder.new do |xml|
-		xml.TasCommands( ( application_details || {} ).merge( :service => "findObject") ) {			
-		  xml.Target{			  
-			add_objects(xml, params)
-			xml.Command( :name => 'findObject' ){
-			  filters.collect{ | name, value | 
-				xml.param( :name => name, :value => value ) 
-			  }					        
-			} if MobyUtil::Parameter[ @_sut.id ][ :filter_type, 'none' ] == 'dynamic'
-		  } if params and params.size > 0
-		}
+
+		  xml.TasCommands( ( @_app_details || {} ).merge( :service => "findObject") ) {			
+
+		    xml.Target{			  
+
+			    add_objects( xml, @_params )
+
+			    xml.Command( :name => 'findObject' ){ filters.collect{ | name, value | xml.param( :name => name, :value => value ) } } if filter_type == 'dynamic'
+
+		    } if @_params and @_params.size > 0
+
+		  }
+
 	  end
-	  builder.to_xml	  
+
+	  builder.to_xml
+
 	end
 
 	private
 
-	def add_objects(builder, params)
+	def add_objects( builder, params )
+
 	  parent = builder.parent
-	  params.each{|objectParams| parent = create_object_node(builder, objectParams, parent)}			  
+
+	  params.each{| objectParams | parent = create_object_node( builder, objectParams, parent ) }
+
 	end
 	
-	def create_object_node(builder, params, parent)
-	  node = Nokogiri::XML::Node.new('object', builder.doc)
-	  params.keys.each{|key| node[key.to_s] = params[key].to_s}
-	  parent.add_child(node)
+	def create_object_node( builder, params, parent )
+
+	  node = Nokogiri::XML::Node.new( 'object', builder.doc )
+
+	  params.keys.each{ | key | node[ key.to_s ] = params[ key ].to_s }
+
+	  parent.add_child( node )
+
 	end
 
 
 	def make_params
+	
 	  params = {}
 
 	  # get sut paramteres only once, store to local variable
-	  sut_parameters = MobyUtil::Parameter[ @_sut.id ]
+	  sut_parameters = $parameters[ @_sut.id ]
 
 	  params[ 'filterProperties' ] = $last_parameter if sut_parameters[ :filter_properties, nil ]
 	  params[ 'pluginBlackList'  ] = $last_parameter if sut_parameters[ :plugin_blacklist,  nil ]
@@ -69,25 +81,28 @@ module MobyUtil
 
 	  case sut_parameters[ :filter_type, 'none' ]
 		
-	  when 'dynamic'
+	    when 'dynamic'
 
-		# updates the filter with the current backtrace file list
-		MobyUtil::DynamicAttributeFilter.instance.update_filter( caller( 0 ) ) 
+		    # updates the filter with the current backtrace file list
+		    #MobyUtil::DynamicAttributeFilter.instance.update_filter( caller( 0 ) ) 
 
-		white_list = MobyUtil::DynamicAttributeFilter.instance.filter_string
-		params['attributeWhiteList'] = white_list if white_list
+		    white_list = MobyUtil::DynamicAttributeFilter.instance.filter_string
+		    params['attributeWhiteList'] = white_list if white_list
 		
-	  when 'static'
+	    when 'static'
 
-		params['attributeBlackList'] = $last_parameter if sut_parameters[ :attribute_blacklist, nil ]
-		params['attributeWhiteList'] = $last_parameter if sut_parameters[ :attribute_whitelist, nil ]
+		    params['attributeBlackList'] = $last_parameter if sut_parameters[ :attribute_blacklist, nil ]
+		    params['attributeWhiteList'] = $last_parameter if sut_parameters[ :attribute_whitelist, nil ]
 		
-	  end
+	    end
 
-	  params		
+	    params		
 
-	end
+	  end
+
+    # enable hoo./base/test_object/factory.rb:king for performance measurement & debug logging
+    TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
   end
+  
 end
-

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

@@ -17,145 +17,179 @@
 ## 
 ############################################################################
 
-
-
 module MobyUtil
 
 	module MessageComposer
 	 
 	  def make_parametrized_message( service_details, command_name, params, command_params = {} )
 
-		Nokogiri::XML::Builder.new{
-		  TasCommands( service_details ) {
-			Target( :TasId => "Application" ) {
-			  Command( ( params || {} ).merge( :name => command_name ) ){
-				command_params.collect{ | name, value | 
-				  param( :name => name, :value => value ) 
-				}					        
+		  Nokogiri::XML::Builder.new{
+		    TasCommands( service_details ) {
+			  Target( :TasId => "Application" ) {
+			    Command( ( params || {} ).merge( :name => command_name ) ){
+				  command_params.collect{ | name, value | 
+				    param( :name => name, :value => value ) 
+				  }					        
+			    }
 			  }
-			}
-		  }
-		}.to_xml
+		    }
+		  }.to_xml
 
 	  end
 
+    def hash_to_attributes( hash )
+
+     ( hash || {} ).collect{ | value | "#{ value.first }=\"#{ value.last }\"" }.join(" ")
+
+    end
+
 	  def make_xml_message( service_details, command_name, params, command_value = nil )
 
-		Nokogiri::XML::Builder.new{
-		  TasCommands( service_details ) {
-			Target( :TasId => "Application" ) {
-			  Command( command_value || "", ( params || {} ).merge( :name => command_name ) )
-			}
-		  }
-		}.to_xml		  
+=begin
+
+      # create message as string
+      #MobyUtil::MessageComposer::hash_to_attributes                                         140      0.00405100      0.00405100    0.010%      0.00002894
+      #MobyUtil::MessageComposer::make_xml_message                                            70      0.00762200      0.00357100    0.009%      0.00010889
+
+      "<TasCommands #{ hash_to_attributes( service_details ) }>" <<
+      "<Target TasId=\"Application\">" << 
+      "<Command name=\"#{ command_name }\" #{ hash_to_attributes( params ) }#{ command_value ? ">#{ command_value }</Command>" : " />"  }" <<
+      "</Target>" <<
+      "</TasCommands>"
+
+      # vs.
+
+      # create message using builder
+      #MobyUtil::MessageComposer::make_xml_message                                            70      0.03611100      0.03611100    0.090%      0.00051587
+
+      # create message
+		  MobyUtil::XML.build{
+		    TasCommands( service_details ) {
+			  Target( :TasId => "Application" ) {
+			    Command( command_value || "", ( params || {} ).merge( :name => command_name ) )
+			  }
+		    }
+		  }.to_xml		  
+
+=end
+
+      # construct xml message as string; using builder is approx. 67% slower, see statistics above
+      "<TasCommands #{ hash_to_attributes( service_details ) }><Target TasId=\"Application\"><Command name=\"#{ command_name }\" #{ hash_to_attributes( params ) }#{ command_value ? ">#{ command_value }</Command>" : " />"  }</Target></TasCommands>"
 
 	  end
 
 	  def make_fixture_message(fixture_plugin, params)
-		Nokogiri::XML::Builder.new{
-		  TasCommands( :id => params[:application_id].to_s, :service => "fixture", :async => params[:async].to_s ) {
-			Target( :TasId => params[:object_id].to_s, :type => params[:object_type].to_s ) {
-			  Command( :name => "Fixture", :plugin => fixture_plugin, :method => params[:command_name].to_s ) {
-				params[:parameters].collect{ | name, value | 
-				  param( :name => name, :value => value )
-				}
+
+		  Nokogiri::XML::Builder.new{
+		    TasCommands( :id => params[:application_id].to_s, :service => "fixture", :async => params[:async].to_s ) {
+			  Target( :TasId => params[:object_id].to_s, :type => params[:object_type].to_s ) {
+			    Command( :name => "Fixture", :plugin => fixture_plugin, :method => params[:command_name].to_s ) {
+				  params[:parameters].collect{ | name, value | 
+				    param( :name => name, :value => value )
+				  }
+			    }
 			  }
-			}
-		  }
-		}.to_xml		
+		    }
+		  }.to_xml		
 	  end
 
 	  def encode_string( source )
-		source = source.to_s
-		source.gsub!( '&', '&amp;' );
-		source.gsub!( '>', '&gt;' );
-		source.gsub!( '<', '&lt;' );
-		source.gsub!( '"', '&quot;' );
-		source.gsub!( '\'', '&apos;' );
-		source
+		  source = source.to_s
+		  source.gsub!( '&', '&amp;' );
+		  source.gsub!( '>', '&gt;' );
+		  source.gsub!( '<', '&lt;' );
+		  source.gsub!( '"', '&quot;' );
+		  source.gsub!( '\'', '&apos;' );
+		  source
 	  end
 
 	  def make_filters
 
-		params = {}
+		  params = {}
 
-		# get sut paramteres only once, store to local variable
-		sut_parameters = MobyUtil::Parameter[ @_sut.id ]
+		  # get sut paramteres only once, store to local variable
+		  sut_parameters = $parameters[ @_sut.id ]
 
-		params[ 'filterProperties' ] = $last_parameter if sut_parameters[ :filter_properties, nil ]
-		params[ 'pluginBlackList'  ] = $last_parameter if sut_parameters[ :plugin_blacklist,  nil ]
-		params[ 'pluginWhiteList'  ] = $last_parameter if sut_parameters[ :plugin_whitelist,  nil ]
+		  params[ 'filterProperties' ] = $last_parameter if sut_parameters[ :filter_properties, nil ]
+		  params[ 'pluginBlackList'  ] = $last_parameter if sut_parameters[ :plugin_blacklist,  nil ]
+		  params[ 'pluginWhiteList'  ] = $last_parameter if sut_parameters[ :plugin_whitelist,  nil ]
 
-		case sut_parameters[ :filter_type, 'none' ]
-		  
-		when 'dynamic'
+		  case sut_parameters[ :filter_type, 'none' ]
+		    
+		  when 'dynamic'
 
-		  # updates the filter with the current backtrace file list
-		  MobyUtil::DynamicAttributeFilter.instance.update_filter( caller( 0 ) ) 
+		    # updates the filter with the current backtrace file list
+		    #MobyUtil::DynamicAttributeFilter.instance.update_filter( caller( 0 ) ) 
 
-		  white_list = MobyUtil::DynamicAttributeFilter.instance.filter_string
-		  params['attributeWhiteList'] = white_list if white_list
-		  
-		when 'static'
+		    white_list = MobyUtil::DynamicAttributeFilter.instance.filter_string
+		    params['attributeWhiteList'] = white_list if white_list
+		    
+		  when 'static'
 
-		  params['attributeBlackList'] = $last_parameter if sut_parameters[ :attribute_blacklist, nil ]
-		  params['attributeWhiteList'] = $last_parameter if sut_parameters[ :attribute_whitelist, nil ]
-		  
-		end
+		    params['attributeBlackList'] = $last_parameter if sut_parameters[ :attribute_blacklist, nil ]
+		    params['attributeWhiteList'] = $last_parameter if sut_parameters[ :attribute_whitelist, nil ]
+		    
+		  end
 
-		params		
+		  params		
 
 	  end
 	  
 	  def state_message
-		app_details = { :service => 'uiState', :name => @_application_name, :id => @_application_uid }
-		app_details[ :applicationUid ] = @_refresh_args[ :applicationUid ] if @_refresh_args.include?( :applicationUid )
+		  app_details = { :service => 'uiState', :name => @_application_name, :id => @_application_uid }
+		  app_details[ :applicationUid ] = @_refresh_args[ :applicationUid ] if @_refresh_args.include?( :applicationUid )
 		
-		case MobyUtil::Parameter[ @_sut.id ][ :filter_type, 'none' ]
-		when 'none' 
-		  command_xml = make_xml_message( app_details, 'UiState', @_flags || {} )
-		when 'dynamic'
-		  params = @_flags || {}
-		  params[ :filtered ] = 'true'
-		  command_xml = make_parametrized_message( app_details, 'UiState', params, make_filters )
-		else
-		  command_xml = make_parametrized_message( app_details, 'UiState', @_flags || {}, make_filters )
-		end
-		command_xml		
+		  case $parameters[ @_sut.id ][ :filter_type, 'none' ]
+		  when 'none' 
+		    command_xml = make_xml_message( app_details, 'UiState', @_flags || {} )
+		  when 'dynamic'
+		    params = @_flags || {}
+		    params[ :filtered ] = 'true'
+		    command_xml = make_parametrized_message( app_details, 'UiState', params, make_filters )
+		  else
+		    command_xml = make_parametrized_message( app_details, 'UiState', @_flags || {}, make_filters )
+		  end
+		  command_xml		
 	  end
 
 	  def run_message
-		#clone to not make changes permanent
-		arguments = MobyUtil::Parameter[ @_sut.id ][ :application_start_arguments, "" ].clone 
-		if @_arguments
-		  arguments << "," unless arguments.empty?
-		  arguments << @_arguments
-		end
-
-		parameters = { 
-		  'application_path' => @_application_name, 
-		  'arguments' => arguments, 
-		  'environment' => @_environment, 
-		  'events_to_listen' => @_events_to_listen, 
-		  'signals_to_listen' => @_signals_to_listen, 
-		  'start_command' => @_start_command 
-		}
-
-		make_xml_message({:service => 'startApplication'}, 'Run', parameters)				
+		  #clone to not make changes permanent
+		  arguments = $parameters[ @_sut.id ][ :application_start_arguments, "" ].clone 
+		  if @_arguments
+		    arguments << "," unless arguments.empty?
+		    arguments << @_arguments
+		  end
+
+		  parameters = { 
+		    'application_path' => @_application_name, 
+		    'arguments' => arguments, 
+		    'environment' => @_environment, 
+		    'events_to_listen' => @_events_to_listen, 
+		    'signals_to_listen' => @_signals_to_listen, 
+		    'start_command' => @_start_command 
+		  }
+
+		  make_xml_message({:service => 'startApplication'}, 'Run', parameters)				
 	  end
 
 	  def close_message
-		sut_id = @_sut.id
-
-		parameters = {
-		  'uid' => @_application_uid, 
-		  'kill' => ( @_flags || {} )[ :force_kill ] || MobyUtil::Parameter[ sut_id ][ :application_close_kill ], 
-		  'wait_time' => MobyUtil::Parameter[ sut_id ][ :application_close_wait ] 		  
-		}
+	  
+	    sut_parameters = $parameters[ @_sut.id ]
+	  
+		  parameters = {
+		    'uid' => @_application_uid, 
+		    'kill' => ( @_flags || {} )[ :force_kill ] || sut_parameters[ :application_close_kill ], 
+		    'wait_time' => sut_parameters[ :application_close_wait ] 		  
+		  }
 
-		make_xml_message({:service => 'closeApplication', :id => @_application_uid }, 'Close', parameters)
+		  make_xml_message({:service => 'closeApplication', :id => @_application_uid }, 'Close', parameters)
 	  end
-	  
+	
+    # enable hoo./base/test_object/factory.rb:king for performance measurement & debug logging
+    TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+  
 	end
+	
+	
 end