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

data/installer/extconf.rb

@@ -27,7 +27,7 @@ begin
 
 rescue LoadError => exception
 
-	Kernel::raise LoadError.new( "SUT plugin requires TDriver" )
+	raise LoadError, 'SUT plugin requires TDriver'
 
 end
 

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

@@ -85,12 +85,12 @@ module MobyBehaviour
 					command.command_params( 'id' => id )
 
 					@sut.execute_command( command )
-					self.force_refresh({:id => get_application_id}) if refresh
+					force_refresh(:id => get_application_id) if refresh
 
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed hover with refresh \"#{ refresh.to_s }\".;#{ identity };hover;"
-					Kernel::raise e
+					raise e
 
 				end
 
@@ -133,12 +133,12 @@ module MobyBehaviour
 					command.command_params( 'id'=>id )
 
 					@sut.execute_command( command )
-					self.force_refresh({:id => get_application_id}) if refresh
+					force_refresh(:id => get_application_id) if refresh
 
 				rescue Exception => e
 
 					$logger.behaviour "FAIL;Failed trigger with refresh \"#{ refresh.to_s }\".;#{ identity };trigger;"
-					Kernel::raise e
+					raise e
 
 				end
 

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

@@ -47,11 +47,12 @@ module MobyBehaviour
     #
 	  module Application
 
-
       @@__multitouch_operation = false
 
       def multitouch_ongoing?
+
         @@__multitouch_operation
+
       end
 
 	    # == description
@@ -239,6 +240,7 @@ module MobyBehaviour
 	    # direction
 	    #  Symbol
 	    #   description: For future support
+	    #   example: -
 	    #
 	    # == returns
 	    # NilClass
@@ -259,7 +261,8 @@ module MobyBehaviour
 		    find_object_state = @sut.parameter[ :use_find_object, false ]
 
 		    @sut.parameter[ :use_find_object ] = false 
-		    self.force_refresh
+
+		    force_refresh
 
 		    @sut.freeze
 		

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

@@ -19,7 +19,7 @@
 
 module MobyBehaviour
 
-	module QT
+  module QT
 
     # == description
     # Behaviours for handling attributes
@@ -42,11 +42,11 @@ module MobyBehaviour
     # == objects
     # *
     #
-		module Attribute
+    module Attribute
 
-			include MobyBehaviour::QT::Behaviour
+      include MobyBehaviour::QT::Behaviour
 
-			# == description
+      # == description
       # Sets an attribute of the target object.
       #
       # == arguments
@@ -95,8 +95,8 @@ module MobyBehaviour
       #   default: nil
       #
       # == tables
-	    # attribute_types_table
-	    #  title: Valid type argument values
+      # attribute_types_table
+      #  title: Valid type argument values
       #  |Type|Example|
       #  |QRect|'10,10,150,150'|
       #  |QPoint|'100,200'|
@@ -114,7 +114,7 @@ module MobyBehaviour
       #  description: One of the arguments is not valid   
       # RuntimeError
       #  description: Setting of the attribute failed
-			def set_attribute( attribute, value, type = nil )
+      def set_attribute( attribute, value, type = nil )
 
         # verify attribute argument variable type
         attribute.check_type [ Symbol, String ], 'wrong argument type $1 for attribute name (expected $2)'
@@ -131,131 +131,170 @@ module MobyBehaviour
         type.not_empty 'argument type must be either nil or non empty string' if type.kind_of?( String )
 
         # in qt_behaviour 
-				command = command_params 
+        command = command_params 
 
-				command.transitions_off 
+        command.transitions_off 
 
-				command.command_name( 'SetAttribute' )
+        command.command_name( 'SetAttribute' )
 
-				case type
+        case type
 
-					when nil
+          when nil
 
-						# Implicit typing
+            # Implicit typing
 
-						# by class
-						if value.kind_of? Integer
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.strip, 'attribute_type' => 'int'} 
+            # by class
+            if value.kind_of? Integer
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.strip, 'attribute_type' => 'int'} 
 
-						elsif value.kind_of? Date
-							temp_date = value.day.to_s << '.' << value.month.to_s << '.' << value.year.to_s
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => temp_date, 'attribute_type' => 'QDate' }
+            elsif value.kind_of? Date
+              temp_date = value.day.to_s << '.' << value.month.to_s << '.' << value.year.to_s
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => temp_date, 'attribute_type' => 'QDate' }
 
-						elsif value.kind_of? Time
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_i.to_s, 'attribute_type' => 'QDateTime' }
+            elsif value.kind_of? Time
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_i.to_s, 'attribute_type' => 'QDateTime' }
 
-						elsif value.kind_of? DateTime
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => Time.parse(value.to_s).to_i.to_s, 'attribute_type' => 'QDateTime' }
+            elsif value.kind_of? DateTime
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => Time.parse(value.to_s).to_i.to_s, 'attribute_type' => 'QDateTime' }
 
-						elsif value.kind_of? TrueClass
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
+            elsif value.kind_of? TrueClass
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
 
-						elsif value.kind_of? FalseClass
-							params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
+            elsif value.kind_of? FalseClass
+              params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
 
-						else
-							# by format
-							# if ( value.kind_of?( Integer ) || ( value.kind_of?( String ) && value.strip == value.strip.to_i.to_s ) )
-							if value.kind_of?( String ) && value.strip == value.strip.to_i.to_s
-								params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.strip, 'attribute_type' => 'int'}
+            else
+              # by format
+              # if ( value.kind_of?( Integer ) || ( value.kind_of?( String ) && value.strip == value.strip.to_i.to_s ) )
+              if value.kind_of?( String ) && value.strip == value.strip.to_i.to_s
+                params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.strip, 'attribute_type' => 'int'}
 
-							elsif (value == true || value == false || (value.kind_of?(String) && (value.strip.downcase == "true" || value.strip.downcase == "false")))
-								params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
+              elsif (value == true || value == false || (value.kind_of?(String) && (value.strip.downcase == "true" || value.strip.downcase == "false")))
+                params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s.downcase, 'attribute_type' => 'bool'}
 
-							else
-								params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'string'}
+              else
+                params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'string'}
 
-							end 
+              end 
 
-						end
+            end
 
-					when "QRect"
-						params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QRect'}
+          when "QRect"
+            params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QRect'}
 
-					when "QPoint"
-						params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QPoint'} 
+          when "QPoint"
+            params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QPoint'} 
 
-					when "QSize"
-						params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QSize'}
+          when "QSize"
+            params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => 'QSize'}
 
-					when "QDateTime"
+          when "QDateTime"
 
-						params = { 'attribute_name' => attribute.to_s, 'attribute_type' => 'QDateTime' }
+            params = { 'attribute_name' => attribute.to_s, 'attribute_type' => 'QDateTime' }
 
-						if value.kind_of? String
-							params[ 'attribute_value' ] = value.to_s
+            if value.kind_of? String
+              params[ 'attribute_value' ] = value.to_s
 
-						elsif value.kind_of? Integer
-							params[ 'attribute_value' ] = value.to_s
+            elsif value.kind_of? Integer
+              params[ 'attribute_value' ] = value.to_s
 
-						elsif value.kind_of? Time 
-							params[ 'attribute_value' ] = value.to_i.to_s
+            elsif value.kind_of? Time 
+              params[ 'attribute_value' ] = value.to_i.to_s
 
-						elsif value.kind_of? DateTime 
-							params[ 'attribute_value' ] = Time.parse( value.to_s ).to_i.to_s
+            elsif value.kind_of? DateTime 
+              params[ 'attribute_value' ] = Time.parse( value.to_s ).to_i.to_s
 
-						else
-							Kernel::raise ArgumentError.new( "The value for QDateTime type attributes must be of type String, Integer, Time or DateTime, it was #{value.class.to_s}." )
+            else
+              raise ArgumentError.new( "The value for QDateTime type attributes must be of type String, Integer, Time or DateTime, it was #{value.class.to_s}." )
 
-						end 
+            end 
 
-					when "QDate"
+          when "QDate"
 
-						params = { 'attribute_name' => attribute.to_s, 'attribute_type' => 'QDate' }
+            params = { 'attribute_name' => attribute.to_s, 'attribute_type' => 'QDate' }
 
-						if value.kind_of? String
-							params[ 'attribute_value' ] = value.to_s
+            if value.kind_of? String
+              params[ 'attribute_value' ] = value.to_s
 
-						elsif value.kind_of? Date
-							temp_date = value.day.to_s << '.' << value.month.to_s << '.' << value.year.to_s
-							params[ 'attribute_value' ] = temp_date
+            elsif value.kind_of? Date
+              temp_date = value.day.to_s << '.' << value.month.to_s << '.' << value.year.to_s
+              params[ 'attribute_value' ] = temp_date
 
-						else
-							Kernel::raise ArgumentError.new( "The value for QDate type attributes must be of type String or Date, it was #{value.class.to_s}." )
+            else
+              raise ArgumentError.new( "The value for QDate type attributes must be of type String or Date, it was #{value.class.to_s}." )
 
-						end
+            end
 
-				else
+        else
 
-					#puts "Unidentified.\nName: " << attribute.to_s << "\nValue: " << value.to_s << "\nType: " << type.to_s
-					params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => type.to_s }
+          #puts "Unidentified.\nName: " << attribute.to_s << "\nValue: " << value.to_s << "\nType: " << type.to_s
+          params = { 'attribute_name' => attribute.to_s, 'attribute_value' => value.to_s, 'attribute_type' => type.to_s }
 
-				end 
+        end 
 
-				command.command_params( params )
-				command.service( 'objectManipulation' )
-				returnValue = @sut.execute_command( command )
-			  
-   			    returnValue = "OK"
-			    begin 
-				  returnValue = @sut.execute_command( command )
-				rescue
-				  $logger.behaviour "FAIL;Failed when calling method set_attribute with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
-				  Kernel::raise RuntimeError.new("Setting attribute '%s' to value '%s' failed with error: %s" % [attribute, value, returnValue])
-				end
-			  
-			    $logger.behaviour "PASS;The method set_attribute was executed successfully with with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
-	  
-			    nil
+        command.command_params( params )
+        command.service( 'objectManipulation' )
+        returnValue = @sut.execute_command( command )
+        
+             returnValue = "OK"
+          begin 
+          returnValue = @sut.execute_command( command )
+        rescue
+          $logger.behaviour "FAIL;Failed when calling method set_attribute with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
+          raise RuntimeError.new("Setting attribute '%s' to value '%s' failed with error: %s" % [attribute, value, returnValue])
+        end
+        
+          $logger.behaviour "PASS;The method set_attribute was executed successfully with with values attribute:#{attribute.to_s} value:#{value.to_s}.;#{identity};set_attribute;"
+    
+          nil
 
 
-			end
+      end
 
-				# enable hooking for performance measurement & debug logging
-				TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+      # == description
+      # Wrapper method to set test object's attribute value. See  [link="#QtAttribute:set_attribute"]supported value argument types[/link] and [link="#attribute_types_table"]attribute types table[/link].\n\n
+      # Minimum number of required arguments is 2; attribute name and new value. Please see examples for correct call sequence.
+      #
+      # == arguments
+      # name
+      #  String
+      #   description: Attribute name
+      #   example: "attribute_name"
+      # *arguments
+      #  Array
+      #   description: Attribute value and type
+      #   example: ["0,0", "QPoint"] 
+      #
+      # == returns
+      # NilClass
+      #   description: -
+      #   example: -
+      def []=( name, *arguments )
+
+        _argument_count = arguments.count
+
+        if _argument_count == 0 || _argument_count > 2
+
+          raise ArgumentError, "wrong number of arguments (#{ _argument_count } of 2)"
+        
+        elsif _argument_count == 2
+
+          # set_attribute( name, arguments.last, arguments.first )
+          arguments.reverse!
+        
+        end
+      
+        # do magic
+        set_attribute( name, *arguments )
+
+        nil
+    
+      end
 
+      # enable hooking for performance measurement & debug logging
+      TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
-		end
+    end
 
-	end
+  end
 end

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

@@ -228,7 +228,7 @@ module MobyBehaviour
 		    rescue Exception => e
 		      
 		      $logger.behaviour "FAIL;Failed to enable event logging. With event_list \"#{event_list};log_events"
-		      Kernel::raise e        
+		      raise e        
 
 		    end      
 
@@ -253,7 +253,7 @@ module MobyBehaviour
 		    rescue Exception => e
 		      
 		      $logger.behaviour "FAIL;Failed to stop event logging.;stop_event_logging"
-		      Kernel::raise e        
+		      raise e        
 
 		    end      
 
@@ -288,7 +288,7 @@ module MobyBehaviour
 		    rescue Exception => e
 		      
 		      $logger.behaviour "FAIL;Failed to configure logger. With params \"#{params_hash.to_s};configure_logger"
-		      Kernel::raise e        
+		      raise e        
 
 		    end      
 

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

@@ -60,6 +60,11 @@ module MobyBehaviour
       #   description: Array of the event named to listen
       #   example: ["Timer","MouseButtonPress","45677","67889"]
       #
+      # params
+      #  Hash
+      #   description: -
+      #   example: -
+      #  
       # == returns
       # NilClass
       #   description: -

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

@@ -70,8 +70,9 @@ module MobyBehaviour
       #
 			# == info			
       #
-      def delete_from_sut(arguments)
-        MobyBase::Error.raise( :WrongArgumentType, arguments.class, "hash" ) unless arguments.kind_of?( Hash )
+      def delete_from_sut( arguments )
+
+        arguments.check_type Hash, "wrong argument type $1 for #{ __method__.to_s } method (expected $2)"
 
         if arguments.include?( :file )
 
@@ -107,8 +108,8 @@ module MobyBehaviour
 
         else
 
-          Kernel::raise ArgumentError.new( "Argument :file not found") unless arguments.include?( :file )
-          Kernel::raise ArgumentError.new( "Argument :dir not found") unless arguments.include?( :dir )
+          arguments.require_key :file, 'Argument $1 not found'
+          arguments.require_key :dir, 'Argument $1 not found'
 
         end
 
@@ -137,8 +138,9 @@ module MobyBehaviour
       #
 			# == info			
       #
-      def copy_from_sut(arguments)
-        MobyBase::Error.raise( :WrongArgumentType, arguments.class, "hash" ) unless arguments.kind_of?( Hash )
+      def copy_from_sut( arguments )
+
+        arguments.check_type Hash, "wrong argument type $1 for #{ __method__.to_s } method (expected $2)"
 
         device_path=arguments[ :from ].gsub('\\','/') if arguments.include?( :from )
 
@@ -169,8 +171,10 @@ module MobyBehaviour
           end
           return list_of_files
         else
-          Kernel::raise ArgumentError.new( "Argument :file not found") unless arguments.include?( :file )
-          return receive_file_from_device(File.join(tmp_path,name),File.join(tmp_path,name))
+
+          arguments.require_key :file, 'Argument $1 not found'
+
+          receive_file_from_device(file,File.join(arguments[ :to ],File.basename(file)))
 
         end
       end
@@ -200,13 +204,15 @@ module MobyBehaviour
 			# == info			
       #
       def copy_to_sut(arguments)
-        MobyBase::Error.raise( :WrongArgumentType, arguments.class, "hash" ) unless arguments.kind_of?( Hash )
-        Kernel::raise ArgumentError.new( "Argument :to not found") unless arguments.include?( :to )
+
+        arguments.check_type Hash, "wrong argument type $1 for #{ __method__.to_s } method (expected $2)"
+
+        arguments.require_key :to, 'Argument $1 not found'
 
         begin
           local_dir = Dir.new( arguments[ :from ] ) if arguments.include?( :from )
-        rescue Errno::ENOENT => ee
-          Kernel::raise RuntimeError.new( "The source folder does not exist. Details:\n" + ee.inspect )
+        rescue Errno::ENOENT
+          raise RuntimeError, "The source folder does not exist. Details:\n#{ $!.inspect }"
         end
 
         if arguments[ :file ]!=nil
@@ -220,7 +226,9 @@ module MobyBehaviour
         fixture("file","mk_dir",{:file_name=>"#{arguments[ :to ]}"})
         
         if arguments.include?( :file )==false
-          Kernel::raise ArgumentError.new( "Argument :from not found") unless arguments.include?( :from )
+
+          arguments.require_key :from, 'Argument $1 not found'
+
           local_dir.entries.each do | local_file_or_subdir |
             if !File.directory?( File.join( arguments[ :from ], local_file_or_subdir ) )
               send_file_to_device(
@@ -249,10 +257,12 @@ module MobyBehaviour
             end
           end
         else
-          Kernel::raise ArgumentError.new( "Argument :file not found") unless arguments.include?( :file )
+
+          arguments.require_key :file, 'Argument $1 not found'
+
           fixture("file","mk_dir",{:file_name=>{:file_name=>arguments[ :to ]}})
           send_file_to_device(
-                  File.join(Dir.pwd,file),
+                  file,
                   File.join(arguments[ :to ],File.basename(file))
           )
           transfered_files << "#{arguments[ :to ]}/#{File.basename(file)}"
@@ -282,9 +292,12 @@ module MobyBehaviour
       #
 			# == Info			
       #
-      def list_files_from_sut(arguments)
-        MobyBase::Error.raise( :WrongArgumentType, arguments.class, "hash" ) unless arguments.kind_of?( Hash )
-        Kernel::raise ArgumentError.new( "Argument :from not found") unless arguments.include?( :from )
+      def list_files_from_sut( arguments )
+
+        arguments.check_type Hash, "wrong argument type $1 for #{ __method__.to_s } method (expected $2)"
+
+        arguments.require_key :from, 'Argument $1 not found'
+
         device_path=arguments[ :from ].gsub('\\','/')
 
         if arguments[ :file ]!=nil
@@ -306,7 +319,7 @@ module MobyBehaviour
           FileUtils.mkdir_p File.dirname(local_file)
         end
         new_file = File.new(local_file, 'wb')
-        block_size = 100000
+        block_size = sut_parameters[:qt_file_transfer_block_size].to_i
         temp_size = block_size
         offset = 0
         while( temp_size == block_size )
@@ -318,6 +331,7 @@ module MobyBehaviour
           temp_size = temp_data.size
           offset = offset + temp_size
           new_file.write(temp_data)
+          print "\r Downloaded #{offset} bytes of #{device_file}"
         end
         new_file.close
         return local_file
@@ -325,11 +339,10 @@ module MobyBehaviour
 
       def send_file_to_device(local_file, device_file)
           fixture("file", "delete_file", {:file_name => device_file})
-          block_max_size = 100000
+          block_max_size = sut_parameters[:qt_file_transfer_block_size].to_i
           offset = 0
-          file_size = File.stat(local_file).size
-          
-          file_to_be_sent = File.open(local_file,"rb")
+          file_size = File::Stat.new(local_file).size          
+          file_to_be_sent = File.open(local_file,"rb")                    
           while(offset < file_size)
             block_size = file_size - offset
             if(block_size > block_max_size)
@@ -345,13 +358,14 @@ module MobyBehaviour
                 :data_lenght=>buff.size} )
               offset = offset + buff.size
             end
+            print "\r Uploaded #{offset}/#{file_size} bytes of #{local_file}"
+            
           end
           file_to_be_sent.close
       end
 
-
-				# enable hooking for performance measurement & debug logging
-				TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
+			# enable hooking for performance measurement & debug logging
+			TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 
 		end