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

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

@@ -72,6 +72,7 @@ module MobyBehaviour
       def enable_events(filter_array = nil, params = {})
 
         begin
+
           command = plugin_command #in qt_behaviour 
           command.command_name( 'EnableEvents' )
           params_str = ''
@@ -81,15 +82,18 @@ module MobyBehaviour
           command.service( 'collectEvents' ) 
           @sut.execute_command( command)
           @@_events_enabled = true
-        rescue Exception => e
+
+        rescue
 
           $logger.behaviour "FAIL;Failed enable_events with refresh \"#{filter_array.to_s}\".;#{ identity };enable_events;"
-          Kernel::raise e
+          raise $!
 
         end
 
         $logger.behaviour "PASS;Operation enable_events executed successfully with refresh \"#{ filter_array.to_s }\".;#{ identity };enable_events;"
+
         nil
+
       end
 
       # == description
@@ -104,37 +108,46 @@ module MobyBehaviour
       # Exception
       #  description: In case of an error
       #    
-      def disable_events()
+      def disable_events
 
         begin
+        
           command = plugin_command #in qt_behaviour
           command.command_name( 'DisableEvents' )
           command.service( 'collectEvents' )
           @sut.execute_command( command)
           @@_events_enabled = false
-        rescue Exception => e
+          
+        rescue
+        
           $logger.behaviour "FAIL;Failed disable_events.;#{ identity };disable_events;"
-          Kernel::raise e 
+          
+          raise $!
+          
         end 
 
         $logger.behaviour "PASS;Operation disable_events executed successfully.;#{ identity };disable_events;"
+
         nil
 
       end
 
       # == description
-      # Gets event list occured since the enabling of events. The format of the XML string is the same as with the UI state.
+      # Gets event list occured since the enabling of events. The format of the XML string is the same as with the UI state.\n
+      # [b]NOTE:[/b] It is highly recommended to create a StateObject with result XML and access the data through appropriate API.\n
+      # \n
+      # See [link="#GenericSut:state_object"]state_object[/link] method for more details.
       #
       # == returns
       # String
-      #  description: Xml listing containing the details of the events logger since enable_events
+      #  description: XML containing the details of the events logger since enable_events
       #  example: -
       #
       # == exceptions
       # Exception
       #  description: In case of an error
       #    
-      def get_events()
+      def get_events
       
         ret = nil
 
@@ -146,10 +159,11 @@ module MobyBehaviour
           ret = @sut.execute_command( command)
           # TODO: how to parse the output?
 
-        rescue Exception => e
+        rescue
 
           $logger.behaviour "FAIL;Failed get_events.;#{ identity };get_events;"
-          Kernel::raise e
+          
+          raise $!
     
         end
 

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

@@ -144,7 +144,7 @@ module MobyBehaviour
 
         if arguments[ :file ]!=nil
           file=arguments[ :file ].gsub('\\','/')
-        else file='*.*'
+        else
           file='*.*'
         end
 
@@ -165,13 +165,13 @@ module MobyBehaviour
             end_index=(name.index File.basename(name))-1
             start_index=(name.index device_path)+device_path.length
             file_folder=name[start_index..end_index]
-            write_file("#{tmp_path}#{file_folder}",name)
+            receive_file_from_device(name,File.join("#{tmp_path}#{file_folder}",File.basename(name)))
           end
           return list_of_files
         else
           Kernel::raise ArgumentError.new( "Argument :file not found") unless arguments.include?( :file )
-          new_file=write_file(tmp_path,file)
-          return new_file
+          return receive_file_from_device(File.join(tmp_path,name),File.join(tmp_path,name))
+
         end
       end
 
@@ -223,10 +223,10 @@ module MobyBehaviour
           Kernel::raise ArgumentError.new( "Argument :from not found") unless arguments.include?( :from )
           local_dir.entries.each do | local_file_or_subdir |
             if !File.directory?( File.join( arguments[ :from ], local_file_or_subdir ) )
-              fixture("file","write_file",
-                {:file_name=>arguments[ :to ]+'/'+File.basename(local_file_or_subdir),
-                  :file_data=>Base64.encode64(read_file(File.join( arguments[ :from ],
-                        local_file_or_subdir )))})
+              send_file_to_device(
+                      File.join( arguments[ :from ], local_file_or_subdir ),
+                      File.join( arguments[ :to ], File.basename(local_file_or_subdir))
+              )
               transfered_files << "#{arguments[ :to ]}/#{File.basename(local_file_or_subdir)}"
             elsif local_file_or_subdir != "." && local_file_or_subdir != ".."
               fixture("file","mk_dir",{:file_name=>"#{arguments[ :to ]}/#{local_file_or_subdir}"})
@@ -237,10 +237,10 @@ module MobyBehaviour
         elsif  arguments.include?( :file ) &&  arguments.include?( :from )
           local_dir.entries.each do | local_file_or_subdir |
             if !File.directory?( File.join( arguments[ :from ], local_file_or_subdir ) )
-              fixture("file","write_file",
-                {:file_name=>arguments[ :to ]+'/'+File.basename(local_file_or_subdir),
-                  :file_data=>Base64.encode64(read_file(File.join( arguments[ :from ],
-                        local_file_or_subdir )))}) if local_file_or_subdir.include?(file)
+              send_file_to_device(
+                      File.join( arguments[ :from ],local_file_or_subdir ),
+                      File.join( arguments[ :to ], File.basename(local_file_or_subdir))
+              ) if local_file_or_subdir.include?(file)
               transfered_files << "#{arguments[ :to ]}/#{File.basename(local_file_or_subdir)}"
             elsif local_file_or_subdir != "." && local_file_or_subdir != ".."
               fixture("file","mk_dir",{:file_name=>"#{arguments[ :to ]}/#{local_file_or_subdir}"})
@@ -251,9 +251,10 @@ module MobyBehaviour
         else
           Kernel::raise ArgumentError.new( "Argument :file not found") unless arguments.include?( :file )
           fixture("file","mk_dir",{:file_name=>{:file_name=>arguments[ :to ]}})
-          fixture("file","write_file",
-            {:file_name=>arguments[ :to ]+'/'+File.basename(file),
-              :file_data=>Base64.encode64(read_file(file))})
+          send_file_to_device(
+                  File.join(Dir.pwd,file),
+                  File.join(arguments[ :to ],File.basename(file))
+          )
           transfered_files << "#{arguments[ :to ]}/#{File.basename(file)}"
         end
         return transfered_files
@@ -300,40 +301,52 @@ module MobyBehaviour
 
       private
 
-      def write_file(target_folder,source_file)
-        if File::directory?(target_folder)==false
-          FileUtils.mkdir_p target_folder
+      def receive_file_from_device(device_file,local_file)
+        if File::directory?(File.dirname(local_file))==false
+          FileUtils.mkdir_p File.dirname(local_file)
+        end
+        new_file = File.new(local_file, 'wb')
+        block_size = 100000
+        temp_size = block_size
+        offset = 0
+        while( temp_size == block_size )
+          temp_data = Base64.decode64( fixture("file", "read_file_part", 
+                                               {:file_name => device_file,
+                                                :file_offset => offset,
+                                                :data_lenght => block_size
+                                                }) ) 
+          temp_size = temp_data.size
+          offset = offset + temp_size
+          new_file.write(temp_data)
         end
-        new_file = File.open(target_folder + "/" + File.basename(source_file), 'w')
-        new_file << Base64.decode64( fixture("file", "read_file", {:file_name => source_file}) )
         new_file.close
-        return target_folder + "/" + File.basename(source_file)
+        return local_file
       end
 
-      def read_file(source_file)
-=begin
-        file_data=''
-        if File.file?(source_file)
-          open_file = File.open(source_file, 'r')
-          open_file.each_line do |line|
-            file_data += line
+      def send_file_to_device(local_file, device_file)
+          fixture("file", "delete_file", {:file_name => device_file})
+          block_max_size = 100000
+          offset = 0
+          file_size = File.stat(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)
+              block_size = block_max_size
+            end
+            buff = file_to_be_sent.readpartial(block_size)
+            if(buff != nil)
+              file_data = Base64.encode64(buff)
+              fixture("file","write_file_append",
+              { :file_name=>device_file,
+                :file_data=>file_data,
+                :file_offset=>offset,
+                :data_lenght=>buff.size} )
+              offset = offset + buff.size
+            end
           end
-        end
-        return file_data.to_s
-=end
-
-        begin
-
-          # return file content as string
-          File.open( source_file, 'rb:binary' ).read
-
-        rescue
-
-          # return empty string in case of exception raised
-          ''
-
-        end
-
+          file_to_be_sent.close
       end
 
 

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

@@ -274,7 +274,7 @@ module MobyBehaviour
         #  description:  In case the given parameters are not valid.
         #    
         # == info
-        # See method rotate
+        # See [link="#QtMultitouch:rotate"]rotate[/link] method for more details
         #
 	      def one_point_rotate(radius, start_angle, rotate_direction, distance, speed, center_point = nil)
 		      params = {:type => :one_point, :radius => radius, :rotate_direction => rotate_direction, :distance => distance, :speed => speed, :direction => start_angle}

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

@@ -164,26 +164,12 @@ module MobyBehaviour
 
       end
       
-      # == description
-      # Returns list of crashed applications running on SUT known to qttasserver
-      # == returns
-      # String
-      #  description: XML string containing crashed applications, their names, process ids and crash times
-      #  example: "<tasMessage dateTime="2010.11.02 14:48:11.056" version="0.9.1" ><tasInfo id="1" name="Qt4.6.2" type="qt" ><object id="" name="QApplications" type="applications" ></object></tasInfo></tasMessage>"
+      # == nodoc
+      # NOT SUPPORTED ANYMORE
       def list_crashed_apps
     
-        apps = nil
+        raise ArgumentError, 'Behaviour "list_crashed_apps" is no longer supported.'
 
-        begin
-          # execute the application control service request
-          apps = execute_command( MobyCommand::Application.new( :ListCrashedApps ) )
-          $logger.behaviour "PASS;Successfully listed crashed applications.;#{ id };sut;{};list_crashed_apps;"
-        rescue Exception => e
-          $logger.behaviour "FAIL;Failed to list crashed applications.;#{ id };sut;{};list_crashed_apps;"
-          raise RuntimeError, "Unable to list crashed applications: Exception: #{ e.message } (#{ e.class })"
-        end
-
-        apps     
       end
 
       # == description

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

@@ -133,7 +133,11 @@ module MobyBehaviour
             
         ensure
 
-          self.fixture( "signal", "remove_signals" )
+          begin
+            self.fixture( "signal", "remove_signals" )
+          rescue Exception => e  
+            $logger.warning "Fixture removal failed. Message received: #{e.message}"
+          end
 
         end
 

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

@@ -104,17 +104,6 @@ module MobyController
 
             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
 

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

@@ -18,7 +18,9 @@
 ############################################################################
 
 # verify that TDriver is loaded
-Kernel::raise RuntimeError.new( "This SUT plugin requires Testability Driver and cannot be launched in standalone mode" ) unless (defined?( MATTI ) || defined?( TDriver ))
+raise RuntimeError, 'This SUT plugin requires Testability Driver and cannot be launched in standalone mode' unless (defined?( MATTI ) || defined?( TDriver ))
+
+raise RuntimeError, 'Installed Testability Driver is too old; please update to later version' unless defined?( TDriver::TestObjectFactory ) || defined?( TDriver::SUTFactory )
 
 include TDriverVerify
 
@@ -97,7 +99,7 @@ module MobyPlugin
 
 			end
 
-			# returns SUT object - this method will be called from MobyBase::SUTFactory
+			# returns SUT object - this method will be called from TDriver::SUTFactory
 			def self.make_sut( sut_id )
 
         # retrieve sut specific parameters
@@ -133,7 +135,7 @@ module MobyPlugin
           sut_controller,
 
           # pass test object factory class
-					MobyBase::TestObjectFactory.instance,
+					TDriver::TestObjectFactory,
 
           # pass sut id
 					sut_id 

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

@@ -36,7 +36,8 @@ module MobyController
         :socket_read_timeout,
         :socket_write_timeout,
         :deflate_service_request,
-        :defalte_minimum_size
+        :deflate_minimum_size,
+        :deflate_compression_level
       )
       
       # TODO: better way to set the host and port parameters   
@@ -86,14 +87,10 @@ module MobyController
         # determine which inflate method to use
         if _sut_parameters[ :win_native, false ].to_s.true?
 
-          @zlib_inflate_method = Zlib::Inflate.new( -Zlib::MAX_WBITS ).method( :inflate )
-
           @inflate_method = method( :inflate_windows_native )
 
         else
 
-          @zlib_inflate_method = Zlib::Inflate.method( :inflate )
-
           @inflate_method = method( :inflate )
 
         end
@@ -384,18 +381,17 @@ module MobyController
       # inflate to be used in native windows env.
       def inflate_windows_native( body )
 
-        tmp = body
-
-        unless tmp.empty?
-
-          @zlib_inflate_method.call( tmp )
-
-        else  
-
-          tmp
+        unless body.empty?
+		
+          zstream = Zlib::Inflate.new( -Zlib::MAX_WBITS )
+          body = zstream.inflate( body )
+          zstream.finish
+          zstream.close
 
         end 
 
+        body
+
       end
 
       # inflate to be used by default
@@ -405,15 +401,13 @@ module MobyController
         tmp = body[ 4 .. -1 ]
 
         unless tmp.empty?
-
-          @zlib_inflate_method.call( tmp )
-
-        else
-
-          tmp
-
+		
+          tmp = Zlib::Inflate.inflate( tmp )
+          
         end
 
+        tmp
+
       end
 
       # enable hooking for performance measurement & debug logging

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver-qt-sut-plugin
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - TDriver team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +03:00
+date: 2011-09-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency