testability-driver 1.2.1 → 1.3.0

data/lib/tdriver/base/test_object/factory.rb

@@ -70,9 +70,12 @@ module MobyBase
       # retrieve sut objects test object adapter
       test_object_adapter = sut.instance_variable_get( :@test_object_adapter )
 
+      # add object identification attribute keys to dynamic attributes white list
+      TDriver::AttributeFilter.add_attributes( rules[ :object_attributes_hash ].keys )
+
       # search parameters for find_objects feature    
       search_parameters = make_object_search_params( rules[ :parent ], rules[ :object_attributes_hash ] )
-            
+      
       # default rules      
       directives.default_values(
       
@@ -100,7 +103,34 @@ module MobyBase
         :__retriable_allowed_exceptions => [ MobyBase::TestObjectNotFoundError, MobyBase::MultipleTestObjectsIdentifiedError ]
                  
       )
-       
+
+      # if sorting enabled; retrieve application layout direction first
+      if directives[ :__xy_sorting ] == true
+
+        parent_application = directives[ :__parent_application ] || rules[ :parent_application ]
+
+        unless parent_application.nil?
+
+          begin
+
+            application_layout_direction = parent_application.attribute( 'layoutDirection' ).to_s
+
+            raise if application_layout_direction.empty?
+
+          rescue
+
+            application_layout_direction = 'LeftToRight'
+
+          end
+
+        else
+
+          raise RuntimeError, 'parent application not given, unable to retrieve layoutDirection'
+
+        end
+
+      end
+
       # identify objects until desired matches found or timeout exceeds
       MobyUtil::Retryable.until( 
 
@@ -169,12 +199,9 @@ module MobyBase
 
         # sort matches if enabled
         if directives[ :__xy_sorting ] == true
-                  
+
           # sort elements
-          test_object_adapter.sort_elements( 
-            matches, 
-            test_object_adapter.application_layout_direction( sut )
-          )
+          test_object_adapter.sort_elements( matches, application_layout_direction )
 
         end
 
@@ -282,7 +309,7 @@ module MobyBase
       end
       
       # add object identification attribute keys to dynamic attributes white list
-      MobyUtil::DynamicAttributeFilter.instance.add_attributes( object_attributes_hash.keys )
+      #TDriver::AttributeFilter.add_attributes( object_attributes_hash.keys )
 
       child_objects = identify_object( rules ).collect{ | test_object_xml |
 
@@ -443,6 +470,9 @@ module MobyBase
 
       else
         
+        #trick
+        #rules[ :parent_application ] = parent if parent.type == 'vkb'
+
         # create test object
         test_object = MobyBase::TestObject.new( 
         
@@ -467,18 +497,18 @@ module MobyBase
         obj_type << ';*' unless obj_type == 'application'
 
         # apply behaviours to test object
-        MobyBase::BehaviourFactory.instance.apply_behaviour!(
+        TDriver::BehaviourFactory.apply_behaviour(
 
-          :object => test_object,
-          :object_type => [ *obj_type.split(';') ], 
-          :input_type => [ '*', sut.input.to_s ],
-          :env => [ '*', *env.to_s.split(";") ],
-          :version => [ '*', sut.ui_version.to_s ]
+          :object       => test_object,
+          :object_type  => [ *obj_type.split(';')       ], 
+          :input_type   => [ '*', sut.input.to_s        ],
+          :env          => [ '*', *env.to_s.split(";")  ],
+          :version      => [ '*', sut.ui_version.to_s   ]
 
         )
 
         # create child accessors
-        test_object_adapter.create_child_accessors!( xml_object, test_object )
+        #test_object_adapter.create_child_accessors!( xml_object, test_object )
 
         # add created test object to parents child objects cache, unless explicitly disabled
         parent_cache.add_object( test_object ) unless identification_directives[ :__no_caching ] == true

data/lib/tdriver/base/test_object/xml/adapter.rb

@@ -95,6 +95,38 @@ module TDriver
             
           end # xpath_attributes
    
+          #merges elements from the nodeset, used in hybrid app situations
+          def create_merged_element(nodeset, environments, close_element=true)
+            merged_element_set = false
+
+            merged_xml = ""
+
+            nodeset.each{ | object |        
+             
+              # only one top element
+              unless merged_element_set
+
+                # retrieve object attributes
+                attributes = object.attributes
+                
+                # merge env to attributes hash
+                attributes['env'] = environments.join(';')
+                
+                # add application object xml element to new xml string
+                merged_xml << "<obj #{ hash_to_element_attributes( attributes ) }>"
+                
+                # merged element is now set, no need to do it again
+                merged_element_set = true
+                
+              end
+              
+              # append all found elements
+              object.xpath('./*').each{ | object | merged_xml << object.to_s }
+            }
+            merged_xml << "</obj>" if close_element and merged_element_set
+            merged_xml
+          end
+
           # TODO: document me
           def initialize_class
 
@@ -341,11 +373,13 @@ module TDriver
       # TODO: document me
       def self.test_object_element_attributes( source_data )
 
-        Hash[
-          source_data.attributes.collect{ | key, value | 
-            [ key.to_s, value.to_s ]
-          }
-        ]
+        #Hash[
+        #  source_data.attributes.collect{ | key, value | 
+        #    [ key.to_s, value.to_s ]
+        #  }
+        #]
+
+        source_data.attributes
 
       end
 
@@ -439,50 +473,51 @@ module TDriver
 
       # TODO: document me
       def self.test_object_attributes( source_data, inclusive_filter = [] )
-        
+
         # convert all keys to lowercase
         inclusive_filter.collect!{ | key | key.to_s.downcase } unless inclusive_filter.empty?
-        
+
         # return hash of test object attributes
-        Hash[ 
+        object_attributes = {}
 
-          # iterate each attribute and collect name and value      
-          source_data.xpath( 'attr' ).collect{ | value | 
+          # iterate each attribute and collect name and value
+          source_data.xpath( 'attr' ).collect{ | value |
 
             # retrieve attribute name
             name = value.attribute('name').to_s
 
             # collect attribute elements name and content
             unless inclusive_filter.empty?
-            
-              [ name, value.content ] if inclusive_filter.include?( name.downcase )
-                      
-            else
 
+              object_attributes[name]=value.content if inclusive_filter.include?( name.downcase )
+
+            else
               # pass the attribute pair - no filtering done
-              [ name, value.content ]
-            
+              if object_attributes[name]
+                object_attributes[name]="#{object_attributes[name]},#{value.content}"
+              else
+                object_attributes[name]=value.content
+              end
             end
 
           }
 
-        ]
+        object_attributes
 
       end
 
       # TODO: document me
       def self.application_layout_direction( sut )
 
-        # temporary fix until testobject will be associated to parent application object
-        unless MobyUtil::DynamicAttributeFilter.instance.has_attribute?( 'layoutDirection' )
-          
-          # temporary fix: add 'layoutDirection' to dynamic attributes filtering whitelist...
-          MobyUtil::DynamicAttributeFilter.instance.add_attribute( 'layoutDirection' ) 
-          
+        # temporary fix until testobject will be associated to parent application object; add 'layoutDirection' to dynamic attributes filtering whitelist...
+        TDriver::AttributeFilter.add_attribute( 'layoutDirection' ){ 
+
+          # this block will be executed if attribute was not in filter list
+
           # temporary fix: ... and refresh sut to retrieve updated xml data
           sut.refresh
-        
-        end 
+
+        }
               
         # TODO: parent application test object should be passed to get_test_objects; TestObjectAdapter#test_object_attribute( @app.xml_data, 'layoutDirection')
         #( sut.xml_data.at_xpath('*//obj[@type="application"]/attr[@name="layoutDirection"]/text()').content || 'LeftToRight' ).to_s
@@ -528,14 +563,17 @@ module TDriver
 
       # TODO: document me
       def self.state_object_xml( source_data, id )
-      
+
         # collect each object from source xml
-        objects = source_data.xpath( 'tasInfo/obj' ).collect{ | element | element.to_s }.join
-      
+        #objects = source_data.xpath( 'tasInfo/obj' ).collect{ | element | element.to_s }.join
+
+        # return xml root element
+        #MobyUtil::XML.parse_string( 
+        #  "<sut name='sut' type='sut' id='#{ id }'>#{ objects }</sut>"
+        #).root
+
         # return xml root element
-        MobyUtil::XML.parse_string( 
-          "<sut name='sut' type='sut' id='#{ id }'>#{ objects }</sut>"
-        ).root
+        MobyUtil::XML.parse_string( "<sut name='sut' type='sut' id='#{ id }'>#{ source_data.xpath('tasInfo/obj').inject(""){ | result, element | result << element.to_s; } }</sut>" ).root
       
       end
 
@@ -660,32 +698,17 @@ module TDriver
           # collect environment values
           environments = document_root.xpath('/tasMessage/tasInfo/obj[@type="application"]/@env').collect{ | attribute | attribute.to_s }
 
-          # iterate through each object found in xml
-          nodeset.each{ | object |        
-    
-            # only one application element
-            unless application_element_set
-            
-              #application_objects << object
-
-              # retrieve object attributes
-              attributes = object.attributes
-
-              # merge env to attributes hash
-              attributes['env'] = environments.join(';')
-
-              # add application object xml element to new xml string
-              new_xml << "<obj #{ hash_to_element_attributes( attributes ) }>"
-            
-              # application element is now set, no need to do it again
-              application_element_set = true
-              
-            end
-
-            # append all found elements
-            object.xpath('./*').each{ | object | new_xml << object.to_s }
-            
-          }
+          #limit to apps
+          nodeset = document_root.xpath('/tasMessage/tasInfo/obj[@type="application"]')          
+          close_vkb = false
+          if nodeset.count > 0
+            new_xml << create_merged_element(nodeset, environments, false) 
+            close_vkb = true
+          end
+          # do the same to the vkbs
+          environments = document_root.xpath('/tasMessage/tasInfo/obj[@type="vkb_app"]/@env').collect{ | attribute | attribute.to_s }
+          nodeset = document_root.xpath('/tasMessage/tasInfo/obj[@type="vkb_app"]')
+          new_xml << create_merged_element(nodeset, environments, close_vkb)
 
           # multiple applications found, return merged application xml
           new_xml << "</obj></tasInfo></tasMessage>"

data/lib/tdriver/report/error_recovery/tdriver_error_recovery.rb

@@ -45,6 +45,7 @@ module TDriverErrorRecovery
   # === raises
   def start_error_recovery()
     resetted=false
+    initialize_error_recovery if @recovery_settings==nil
     if @recovery_settings.get_error_recovery_enabled=='true'
       MobyUtil::Logger.instance.log "behaviour" , "PASS;Starting error recovery"
       if @recovery_settings.get_reconnect_device=='true'

data/lib/tdriver/report/report.rb

@@ -48,6 +48,7 @@ require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_cucumber_
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_rspec' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_test_unit' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_grouping' ) )
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_graph_generator' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_execution_statistics' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_data_presentation' ) )
 
@@ -57,4 +58,4 @@ unless $parameters[ :custom_error_recovery_module, nil ].nil?
 
 end
 
-include TDriverReportAPI
+#include TDriverReportAPI

data/lib/tdriver/report/report_crash_file_capture.rb

@@ -64,6 +64,18 @@ class TDriverReportCrashFileCapture
     end
   end
 
+  def confirm_crash_notes
+    MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+        if sut_attributes[:is_connected]
+          @crash_file_suts.each do |monitored_sut|
+            if monitored_sut == sut_id.to_s
+              sut_attributes[:sut].clear_crash_notes(5)
+            end
+          end
+        end
+      end
+  end
+
   def list_sut_crash_files(current_sut)
     crash_file_arr=Array.new
     @crash_file_count=0

data/lib/tdriver/report/report_creator.rb

@@ -286,6 +286,10 @@ module TDriverReportCreator
       $new_test_case.clean_crash_files_from_sut()
       $tdriver_reporter.set_total_crash_files(amount_of_crash_files.to_i)
       $new_test_case.set_test_case_crash_files(amount_of_crash_files.to_i)
+    else
+      if $parameters[ :report_crash_file_monitor_confirm_any_crash_note, false ]=='true'
+        $new_test_case.confirm_crash_notes
+      end
     end
 
     amount_of_files=$new_test_case.check_if_files_exist()
@@ -316,7 +320,7 @@ module TDriverReportCreator
 
         each_video_device do | video_device, device_index |
           begin
-            FileUtils.copy( "cam_" + device_index + "_" + @_video_file_name, "cam_" + device_index + "_" + @_previous_video_file_name )
+            FileUtils.mv( "cam_" + device_index + "_" + @_video_file_name, "cam_" + device_index + "_" + @_previous_video_file_name )
           rescue
             # do nothing..
           end
@@ -344,7 +348,7 @@ module TDriverReportCreator
   # === raises
   def update_test_case(details)
     if $new_test_case==nil
-      @_stored_details<<details
+      @_stored_details << details
     else
       if @_stored_details!=[]
         @_stored_details.each do |detail|

data/lib/tdriver/report/report_execution_statistics.rb

@@ -122,12 +122,13 @@ class ReportingStatistics
     total_run=0
     total_not_run=0
     total_passed=0
-    @statistics_arr.each do |total_status|        
-      if total_status[1]==tc_status && total_status[0]==tc_name    
+    total_not_run_index=0
+    total_passed_index=0
+    pass_rate_index=0
+    @statistics_arr.each do |total_status|
+      if total_status[1]==tc_status && total_status[0]==tc_name
         b_test_in_statistics=true
         @statistics_arr[current_index]=[tc_name,tc_status,total_status[2].to_i+1,tc_execution,tc_link]
-        total_passed=total_status[2].to_i+1 if @pass_statuses.include?(total_status[1])
-        total_not_run=total_status[2].to_i+1 if @not_run_statuses.include?(total_status[1])        
       end
       if total_status[1]=="reboots" && total_status[0]==tc_name
         b_test_in_statistics=true
@@ -164,17 +165,32 @@ class ReportingStatistics
       end
       if total_status[1]=="pass rate" && total_status[0]==tc_name
         b_test_in_statistics=true
-        pass_rate=(total_passed.to_f/(total_run.to_f-total_not_run.to_f))*100
-        pass_rate="%0.2f" % pass_rate
-        @statistics_arr[current_index]=[tc_name,"pass rate",pass_rate,tc_execution,tc_link]
+        pass_rate_index=current_index
+      end
+      if @pass_statuses.include?(total_status[1]) && total_status[0]==tc_name
+        total_passed_index=current_index
+      end
+      if @not_run_statuses.include?(total_status[1]) && total_status[0]==tc_name
+        total_not_run_index=current_index
       end
       current_index+=1
     end
+
+    if b_test_in_statistics==true
+      total_passed_result=@statistics_arr[total_passed_index]
+      total_not_run_result=@statistics_arr[total_not_run_index]
+      total_passed=total_passed_result[2].to_i
+      total_not_run=total_not_run_result[2].to_i
+      pass_rate=(total_passed.to_f/(total_run.to_f-total_not_run.to_f))*100
+      pass_rate="%0.2f" % pass_rate
+      @statistics_arr[pass_rate_index]=[tc_name,"pass rate",pass_rate,tc_execution,tc_link]
+    end
+
     b_test_in_statistics
   end
 
   def collect_test_case_statistics()
-    total_duration = 0.0   
+    total_duration = 0.0
     @group_test_case_arr.each do |test_case|
       tc_status=test_case[7]
       tc_name=test_case[0].to_s.gsub('_',' ')
@@ -188,7 +204,7 @@ class ReportingStatistics
       memory_usage=test_case[6].to_i
 
       duration=test_case[5].to_f
-      total_duration = total_duration + duration      
+      total_duration = total_duration + duration
       b_test_in_statistics=false
 
       #Update total statistics
@@ -290,8 +306,8 @@ class ReportingStatistics
       @statistics_arr.each do |test_case|
         tc_name=test_case[0].to_s.gsub('_',' ')
         if test_case_added.include?(tc_name)==false && test_case[1].to_s=="duration"
-	      	durations << test_case[2]
-	      	labels[current_index] = "#{current_index + 1}" #tc_name
+          durations << test_case[2]
+          labels[current_index] = "#{current_index + 1}" #tc_name
           current_index += 1
           test_case_added << tc_name
         end