testability-driver-qt-sut-plugin 1.3.1 → 1.3.2

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

@@ -23,23 +23,13 @@ module MobyController
   
     module Application 
       
-      include MobyUtil::MessageComposer
-
-      def set_adapter( adapter )
-    
-        @sut_adapter = adapter
-    
-      end           
+      include MobyController::Abstraction
 
+      include MobyUtil::MessageComposer
       
-      # 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
-    
+      # create message to be sent sut SUT adapter - returns [ "message_body", boolean ]
+      def make_message
+
         return_response_crc = false
 
         case @_command
@@ -176,14 +166,26 @@ module MobyController
           raise ArgumentError, "Unknown command! #{ @_command.to_s }"
           
         end
+
+        [ Comms::MessageGenerator.generate( command_xml ), return_response_crc ]
+
+      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
     
-        message = Comms::MessageGenerator.generate( command_xml )
+        message, return_response_crc = make_message
 
         @sut_adapter.send_service_request( message, return_response_crc ) if message    
 
       end
 
-    end # application
+    end # Application
 
   end  # QT    
 

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

@@ -23,6 +23,8 @@ module MobyController
 
     module Group
 
+      include MobyController::Abstraction
+
       # Execute the command). 
       # Sends the message to the device using the @sut_adapter (see base class)     
       # == params         
@@ -30,25 +32,26 @@ module MobyController
       # == 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)
+
+          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
+        @sut_adapter.set_message_builder( builder )
 
-      end
+        @block.call
+
+        @sut_adapter.send_grouped_request
 
-      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 # Group
 
-  end #module QT
+  end # QT
 
-end #module MobyController
+end # MobyController

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

@@ -23,37 +23,40 @@ module MobyController
 
     module WidgetCommand 
 
-      # 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
 
-        command_params = { :eventType => get_event_type, :name => get_command_name }
+      # generate service request
+      def make_message
 
-        command_params.merge!( get_command_params ) if get_command_params
+        # reduce AST calls
+        _application_id = @_application_id
+        _transitions = @_transitions
+        _service = @_service
+
+        _object_id = @_object_id
+        _object_type = @_object_type
+        _command_value = @_command_value
+
+        # Object#not_nil return self if value not nil
+        _command_params = { :eventType => @_event_type.not_nil('Assert: event_type must be set!'), :name => @_command_name }.merge!( @_command_params || {} )
 
         builder = Nokogiri::XML::Builder.new{
 
-          TasCommands( :id => get_application_id, :transitions => get_transitions, :service => get_service || 'uiCommand' ) {
+          TasCommands( :id => _application_id, :transitions => _transitions, :service => _service || 'uiCommand' ) {
 
-            Target( :TasId => get_object_id, :type => get_object_type ) {
+            Target( :TasId => _object_id, :type => _object_type ) {
 
-            if get_command_value.kind_of?( Array )
+            if _command_value.kind_of?( Array )
 
-              get_command_value.each do | command_part |
-                Command( command_part[ :value ], command_part[ :params ] )
-              end
+              _command_value.each do | command_part | Command( command_part[ :value ], command_part[ :params ] ); end
 
-            elsif get_command_value
+            elsif _command_value
 
-                Command( get_command_value, command_params )
+                Command( _command_value, _command_params )
 
             else
 
-                Command( command_params )
+                Command( _command_params )
 
             end
 
@@ -61,17 +64,27 @@ module MobyController
           }
         }              
 
+      end
+
+      # 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
+
+        message = make_message
+
         if @sut_adapter.group?
-          @sut_adapter.append_command( builder.doc.root.children )
-        else
-          @sut_adapter.send_service_request( Comms::MessageGenerator.generate( builder.to_xml ) )
-        end
 
-      end
+          @sut_adapter.append_command( message.doc.root.children )
 
-      def set_adapter( adapter )
+        else
+
+          @sut_adapter.send_service_request( Comms::MessageGenerator.generate( message.to_xml ) )
 
-        @sut_adapter = adapter
+        end
 
       end
 

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

@@ -152,18 +152,17 @@ module MobyPlugin
             # send service request for agent version number
             agent_version = sut_controller.__send__( :execute_command, MobyCommand::VersionCommand.new )
 
-            case agent_version
-
-              when "1.3"
-
-                # use optimized XML format; if adapter is not found we're going through rescue block
-                adapter = TDriver::OptimizedXML::TestObjectAdapter
+            # agent version 1.3 or later supports new smaller xml format
+            if agent_version >= "1.3"
+            
+              # use optimized XML format; if adapter is not found we're going through rescue block
+              adapter = TDriver::OptimizedXML::TestObjectAdapter
 
             else
 
               # didn't recognize the version number use old TDriver::TestObjectAdapter
               raise
-
+            
             end
 
           rescue

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

@@ -34,7 +34,7 @@ module MobyUtil
 
 		def add_parameter( hash )
 
-			Kernel::raise ArgumentError.new("Argument :value and :type must be defined. Actual hash: #{ hash.inspect }") unless hash.has_key?( :type ) and hash.has_key?( :value )
+			raise ArgumentError.new("Argument :value and :type must be defined. Actual hash: #{ hash.inspect }") unless hash.has_key?( :type ) and hash.has_key?( :value )
 
 			@parameters.push( hash )
 

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

@@ -37,9 +37,6 @@ module MobyUtil
            use_tap_screen = $parameters[ @sut.id ][ :use_tap_screen, 'false' ]
          end
 
-
-
-
          raise ArgumentError.new( "Coordinate x:#{x} x_abs:#{x} outside object." ) unless (x <= attribute('width').to_i and x >= 0)
          raise ArgumentError.new( "Coordinate y:#{y} y_abs:#{y} outside object." ) unless (y <= attribute('height').to_i and y >= 0)
 
@@ -63,7 +60,7 @@ module MobyUtil
        rescue Exception => e
 
          $logger.behaviour "FAIL;Failed #{behavior_name} with x \"#{x}\", y \"#{y}\", button \"#{button.to_s}\".;#{identity};#{behavior_name};"
-         Kernel::raise e
+         raise e
 
        end
 

data/xml/template/qt.xml

@@ -84,6 +84,7 @@
     <parameter name="qttas_plugin_timeout" value="10000" />
     <!-- QT Server port -->  
     <parameter name="qt_tcp_server_port" value="1514" /> <!-- JKo: what is this?? is it actually used anywhere? -->
+    <parameter name="qt_file_transfer_block_size" value="4096" />
   </template>
 
   <template name="qt_fixtures">

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-qt-sut-plugin
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - TDriver team
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 +03:00
+date: 2011-10-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: testability-driver
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: testabilitydriver@nokia.com
 executables: []
@@ -97,6 +109,7 @@ files:
 - xml/keymap/win.xml
 - xml/keymap/qt.xml
 - xml/template/qt.xml
+- installer/extconf.rb
 has_rdoc: true
 homepage: http://gitorious.org/tdriver
 licenses: []
@@ -107,21 +120,27 @@ rdoc_options: []
 require_paths: 
 - lib/testability-driver-plugins/
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Testability Driver - Testability Driver Interface Qt SUT plugin