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

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

@@ -20,6 +20,160 @@
 module MobyUtil
 
 	module MessageComposer
+
+    class TasCommands
+
+      # TODO: document me
+      def initialize( options = {} )
+      
+        @command_attributes = options
+            
+        @targets = []
+        
+      end # initialize
+
+      # TODO: document me
+      def target( options = {} )
+       
+        @targets << { :arguments => options, :objects => [], :commands => [] }
+      
+      end # target
+      
+      # TODO: document me
+      def targets
+      
+        @targets
+      
+      end # targets
+
+      def object( *arguments )
+      
+      end
+
+      # TODO: document me
+      def command( *arguments )
+      
+        command_hash = { :parameters => [] }
+      
+        while arguments.count > 0
+        
+          value = arguments.shift
+          
+          if value.kind_of?( Hash )
+          
+            command_hash[ :arguments ] = value
+          
+          else
+
+            command_hash[ :value ] = value
+          
+          end
+        
+        end
+      
+        @targets.last[ :commands ] << command_hash
+        
+      end # command
+
+      # TODO: document me
+      def parameter( *arguments )
+
+        params_hash = {}
+
+        while arguments.count > 0
+        
+          value = arguments.shift
+          
+          if value.kind_of?( Hash )
+          
+            params_hash[ :arguments ] = value
+          
+          else
+
+            params_hash[ :value ] = value
+          
+          end
+        
+        end
+      
+        @targets.last[ :commands ][ :parameters ] << params_hash
+      
+      end # parameter
+
+      # TODO: document me
+      def to_xml
+      
+        targets = targets_to_xml 
+      
+        if targets.length > 0
+        
+          "<TasCommands #{ @command_attributes.to_attributes }>#{ targets }</TasCommands>"
+          
+        else
+
+          "<TasCommands #{ @command_attributes.to_attributes } />"
+          
+        end
+      
+        
+      end # to_xml
+
+    private
+      
+      # TODO: document me
+      def targets_to_xml
+      
+        @targets.collect do | target |
+
+          commands = target[ :commands ].collect do | command |
+
+            value = command[ :value ]
+
+            params = command[ :parameters ].collect do | parameter |
+            
+              if parameter.has_key?( :value )
+
+                "<param #{ parameters[ :arguments ].to_attributes }>#{ parameters[ :value ] }</param>"
+              
+              else
+
+                "<param #{ parameters[ :arguments ].to_attributes } />"
+              
+              end
+                          
+            end.join
+            
+            value = params if params.count > 0
+
+            unless value.nil?
+
+              "<Command #{ command[ :arguments ].to_attributes }>#{ command[ :value ] }</Command>"
+            
+            else
+
+              "<Command #{ command[ :arguments ].to_attributes } />"
+            
+            end
+          
+          end
+          
+          if commands.count > 0
+          
+            commands.unshift("<Target #{ target[ :arguments ].to_attributes }></Target>")
+          
+          else
+          
+            commands.unshift("<Target #{ target[ :arguments ].to_attributes } />")
+          
+          end
+        
+          commands.join
+        
+        end.join
+      
+      end # targets_to_xml
+
+    end # TasCommands
 	 
 	  def make_parametrized_message( service_details, command_name, params, command_params = {} )		
 		service_details[:plugin_timeout] = $parameters[ @_sut.id ][ :qttas_plugin_timeout, 10000 ] if @_sut
@@ -121,9 +275,6 @@ module MobyUtil
 		    
 		  when 'dynamic'
 
-		    # 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
 		    
@@ -139,20 +290,35 @@ module MobyUtil
 	  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[ :checksum ] = @_checksum unless @_checksum.nil?
+
+	    params = @_flags || {}
 		
 		  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 )
+
+		    when 'none' 
+
+		      command_xml = make_xml_message( app_details, 'UiState', params )
+
+		    when 'dynamic'
+
+		      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 )
+
+		    command_xml = make_parametrized_message( app_details, 'UiState', params, make_filters )
+
 		  end
+
 		  command_xml		
+
 	  end
 
 	  def run_message

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

@@ -62,12 +62,12 @@ module MobyUtil
 
        rescue Exception => e
 
-         $logger.log "behaviour" , "FAIL;Failed #{behavior_name} with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
+         $logger.behaviour "FAIL;Failed #{behavior_name} with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
          Kernel::raise e
 
        end
 
-       $logger.log "behaviour" , "PASS;Operation #{behavior_name} executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
+       $logger.behaviour "PASS;Operation #{behavior_name} executed successfully with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
 
        nil
 

data/xml/behaviour/qt.xml

@@ -715,6 +715,14 @@
                 <description>Stop cpu logging and get the results.</description>
                 <example>stop_cpu_log</example>
             </method>
+            <method name="log_pwr">
+                <description>Log the power usage of the process</description>
+                <example>log_pwr</example>
+            </method>
+            <method name="stop_pwr_log">
+                <description>Stop power logging and get the results.</description>
+                <example>stop_pwr_log</example>
+            </method>
             <method name="log_mem">
                 <description>Log memory usage.</description>
                 <example>log_mem</example>
@@ -735,6 +743,10 @@
                 <description>Load cpu logging results.</description>
                 <example>load_cpu_log</example>
             </method>
+            <method name="load_pwr_log">
+                <description>Load power logging results.</description>
+                <example>load_pwr_log</example>
+            </method>
             <method name="load_gpu_log">
                 <description>Load Gpu logging results.</description>
                 <example>load_gpu_log</example>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-qt-sut-plugin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - TDriver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: testability-driver
@@ -79,6 +79,7 @@ files:
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/infologger_command.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/qt.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/tap.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/version.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/commands/widget.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/application.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/configure_command.rb
@@ -89,6 +90,7 @@ files:
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/key_sequence.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/screen_capture.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/tap.rb
+- lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/version.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/controllers/widget.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/plugin.rb
 - lib/testability-driver-plugins/testability-driver-qt-sut-plugin/sut/adapter.rb