testability-driver 1.3.0 → 1.3.1

data/lib/tdriver/report/report_crash_file_capture.rb

@@ -17,9 +17,6 @@
 ## 
 ############################################################################
 
-
-
-
 class TDriverReportCrashFileCapture
   include TDriverReportFileCapture
   def initialize
@@ -48,7 +45,7 @@ class TDriverReportCrashFileCapture
 
   def clean_crash_files_from_sut()
     if @monitor_crash_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.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
@@ -65,7 +62,7 @@ class TDriverReportCrashFileCapture
   end
 
   def confirm_crash_notes
-    MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+    TDriver::SUTFactory.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
@@ -127,7 +124,7 @@ class TDriverReportCrashFileCapture
   def check_if_crash_files_exist()
     sut_crash_files=Array.new
     if @monitor_crash_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.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
@@ -144,7 +141,7 @@ class TDriverReportCrashFileCapture
 
   def download_crash_files(download_folder)
    if @monitor_crash_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.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

data/lib/tdriver/report/report_creator.rb

@@ -62,7 +62,7 @@ module TDriverReportCreator
         puts 'Generating total run table...'
         $tdriver_reporter.update_test_case_summary_pages('all')
         puts 'Total run table generated...'
-        if $tdriver_reporter.report_exclude_passed_cases=='false'          
+        if $tdriver_reporter.report_exclude_passed_cases=='false'
           puts 'Generating passed cases table...'
           $tdriver_reporter.update_test_case_summary_pages('passed')
           puts 'Passed table generated...'
@@ -93,7 +93,7 @@ module TDriverReportCreator
         puts 'Report generated to:'
         puts $tdriver_reporter.report_folder()
         clean_video_files
-        ending_test_set_run if $parameters[ :custom_error_recovery_module, nil ]!=nil        
+        ending_test_set_run if $parameters[ :custom_error_recovery_module, nil ]!=nil
         if $tdriver_reporter.total_failed.to_i > 0
           Kernel.exit(1)
         elsif $tdriver_reporter.total_run.to_i == 0
@@ -115,10 +115,6 @@ module TDriverReportCreator
   # nil
   # === raises
   def error_in_connection_detected
-    if start_error_recovery()==true
-      $tdriver_reporter.set_total_device_resets(1)
-      $new_test_case.set_test_case_reboots(1) if $new_test_case!=nil
-    end
     error_in_connection if $parameters[ :custom_error_recovery_module, nil ]!=nil
   end
   #This method returns the group where the test case belongs
@@ -276,11 +272,11 @@ module TDriverReportCreator
     $new_test_case.read_crash_monitor_settings()
 
     $new_test_case.read_file_monitor_settings()
-    
+
     $new_test_case.clean_crash_files_from_sut() if $test_case_run_index==1 && $parameters[ :report_crash_file_monitor_crash_file_cleanup, false ]=='true'
 
     amount_of_crash_files=$new_test_case.check_if_crash_files_exist()
-    
+
     if amount_of_crash_files.to_i > 0
       $new_test_case.capture_crash_files()
       $new_test_case.clean_crash_files_from_sut()
@@ -302,7 +298,7 @@ module TDriverReportCreator
 
     if $parameters[ :report_monitor_memory, 'false']=='true'
       begin
-        MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+        TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
           $new_test_case.set_tc_memory_amount_total($tdriver_reporter.get_sut_total_memory(sut_id,sut_attributes))
           $new_test_case.set_tc_memory_amount_start($tdriver_reporter.get_sut_used_memory(sut_id,sut_attributes))
         end
@@ -337,7 +333,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=logging_enabled
     end
     update_test_case_user_data()
-    starting_test_case(test_case, MobyBase::SUTFactory.instance.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
+    starting_test_case(test_case, TDriver::SUTFactory.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
   end
   #This method updates the current test case execution log
   #
@@ -364,7 +360,7 @@ module TDriverReportCreator
         begin
           start_memory=$new_test_case.tc_memory_amount_start()
           if start_memory=='-'
-            MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+            TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
               memory=$tdriver_reporter.get_sut_used_memory(sut_id,sut_attributes)
               $new_test_case.set_tc_memory_amount_start(memory)
             end
@@ -408,11 +404,11 @@ module TDriverReportCreator
       if $new_test_case.video_recording?
         $new_test_case.copy_video_capture()
       end
-      error_in_test_case(MobyBase::SUTFactory.instance.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
+      error_in_test_case(TDriver::SUTFactory.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
       begin
-        
+
           error_in_connection_detected
-      
+
       rescue Exception => e
         update_test_case("Error recovery failed Exception: #{e.message} Backtrace: #{e.backtrace}")
         end_test_case($new_test_case.test_case_name,'failed')
@@ -431,7 +427,7 @@ module TDriverReportCreator
   # === raises
   def update_test_case_memory_usage()
     begin
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         if sut_attributes[:is_connected]
           memory=$tdriver_reporter.get_sut_used_memory(sut_id,sut_attributes)
           $tdriver_reporter.get_sut_total_dump_count(sut_id,sut_attributes)
@@ -466,7 +462,7 @@ module TDriverReportCreator
   end
 
   def calculate_execution_footprint_data_for_test_case
-    MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+    TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
       if sut_attributes[:is_connected]
         $tdriver_reporter.get_sut_total_dump_count(sut_id,sut_attributes)
         $tdriver_reporter.get_sut_total_sent_data(sut_id,sut_attributes)
@@ -598,15 +594,15 @@ module TDriverReportCreator
       $new_test_case.clean_files_from_sut()
 
       update_run($new_test_case.test_case_name.to_s,status,$new_test_case.test_case_reboots,$new_test_case.test_case_crash_files,execution_log)
-      
+
       $new_junit_xml_results.add_test_result(status, $new_test_case.test_case_start_time, $new_test_case.test_case_end_time)
-      tdriver_update_sequential_fails( status ) if $parameters[ :runner_sequence_skip, "false" ] == "true"   
-      
+      tdriver_update_sequential_fails( status ) if $parameters[ :runner_sequence_skip, "false" ] == "true"
+
       $new_test_case=nil
       execution_log=nil
 
     end
-    ending_test_case(status, MobyBase::SUTFactory.instance.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
+    ending_test_case(status, TDriver::SUTFactory.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
   end
   def add_report_group(value)
     $tdriver_reporter.set_generic_reporting_groups(value)

data/lib/tdriver/report/report_file_capture.rb

@@ -47,7 +47,7 @@ module TDriverReportFileCapture
   def clean_files_from_sut()
 
     if @monitor_files == 'true' && @clean_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         if sut_attributes[:is_connected]
           @file_suts.each do |monitored_sut|
             if monitored_sut == sut_id.to_s
@@ -107,7 +107,7 @@ module TDriverReportFileCapture
   def check_if_files_exist()
     sut_files=Array.new
     if @monitor_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         if sut_attributes[:is_connected]
           @file_suts.each do |monitored_sut|
             if monitored_sut == sut_id.to_s
@@ -124,7 +124,7 @@ module TDriverReportFileCapture
 
   def download_files(download_folder)
     if @monitor_files == 'true'
-      MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+      TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
         if sut_attributes[:is_connected]
           @file_suts.each do |monitored_sut|
             if monitored_sut == sut_id.to_s

data/lib/tdriver/report/report_javascript.rb

@@ -20,7 +20,7 @@
 
 module TDriverReportJavascript
 
-  def get_expand_collapse_java_script()
+  def self.get_expand_collapse_java_script
     java_script='<script type="text/javascript">'<<
       '/* Only set closed if JS-enabled */'<<
       "document.getElementsByTagName('html')[0].className = 'isJS';"<<
@@ -45,8 +45,8 @@ module TDriverReportJavascript
     java_script
   end
   
-  def get_table_sorting_java_script()
-    java_script="
+  def self.get_table_sorting_java_script
+  java_script="
   function TSorter(){
     var table = Object;
     var trs = Array;

data/lib/tdriver/report/report_test_case_run.rb

@@ -509,7 +509,7 @@ module TDriverReportCreator
         write_page_end(@test_case_folder+'/index.html')
 
       rescue Exception => e
-        Kernel::raise e
+        raise e
       end
       return nil
     end
@@ -571,7 +571,7 @@ module TDriverReportCreator
         if File::directory?(dump_folder)==false
           FileUtils.mkdir_p dump_folder
         end
-        MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+        TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
 
           t = Time.now
           time_stamp=t.strftime( "%Y%m%d%H%M%S" )
@@ -600,15 +600,25 @@ module TDriverReportCreator
           end
 
           begin
-            failed_xml_state=sut_attributes[:sut].xml_data() if sut_attributes[:is_connected]
-            File.open(dump_folder+'/'+time_stamp+'_'+sut_id.to_s+'_state.xml', 'w') { |file| file.write(failed_xml_state) }
-            state_html='<a href="state_xml/'<<
-              time_stamp+'_'+sut_id.to_s+'_state.xml'<<
-              '">'+time_stamp+'_'+sut_id.to_s+'_state.xml'+'</a>'
-            self.set_test_case_execution_log(state_html.to_s)
+            if sut_attributes[:is_connected]
+              original_filter=sut_attributes[:sut].parameter[ :filter_type]
+              original_find=sut_attributes[:sut].parameter[ :use_find_object]
+              sut_attributes[:sut].parameter[ :filter_type] = 'none'
+              sut_attributes[:sut].parameter[ :use_find_object] = 'false'
+              sut_attributes[:sut].refresh
+              failed_xml_state=sut_attributes[:sut].xml_data()
+              File.open(dump_folder+'/'+time_stamp+'_'+sut_id.to_s+'_state.xml', 'w') { |file| file.write(failed_xml_state) }
+              state_html='<a href="state_xml/'<<
+                time_stamp+'_'+sut_id.to_s+'_state.xml'<<
+                '">'+time_stamp+'_'+sut_id.to_s+'_state.xml'+'</a>'
+              self.set_test_case_execution_log(state_html.to_s)
+            end
           rescue Exception=>e
             @failed_dump_error="Unable to capture state xml #{sut_id}: " + e.message
             self.set_test_case_execution_log(@failed_dump_error.to_s)
+          ensure
+            sut_attributes[:sut].parameter[ :filter_type]=original_filter
+            sut_attributes[:sut].parameter[ :use_find_object]=original_find
           end
   			end
       rescue Exception => e
@@ -664,7 +674,7 @@ module TDriverReportCreator
           FileUtils.mkdir_p @test_case_folder
         end
       rescue Exception => e
-        Kernel::raise e
+        raise e
       end
       return nil
     end
@@ -691,7 +701,7 @@ module TDriverReportCreator
           @test_case_folder=new_test_case_folder
         end
       rescue Exception => e
-        Kernel::raise e
+        raise e
       end
       return nil
     end

data/lib/tdriver/report/report_test_run.rb

@@ -17,7 +17,6 @@
 ##
 ############################################################################
 
-
 module TDriverReportCreator
 
   #Test run class for new test run
@@ -513,7 +512,7 @@ module TDriverReportCreator
           
         end
       rescue Exception => e
-        Kernel::raise e, "Unable to create report folder: #{@report_folder}", caller
+        raise e, "Unable to create report folder: #{@report_folder}", caller
       end
       return nil
     end
@@ -562,7 +561,7 @@ module TDriverReportCreator
           write_page_end(@report_folder+'/index.html')
         end
       rescue Exception => e
-        Kernel::raise e, "Unable to update summary page", e.backtrace
+        raise e, "Unable to update summary page", e.backtrace
       end
       return nil
     end
@@ -593,7 +592,7 @@ module TDriverReportCreator
           FileUtils.copy('/etc/tdriver/tdriver_parameters.xml',@report_folder+'/environment/tdriver_parameters.xml') if File.file?('/etc/tdriver/tdriver_parameters.xml')
         end
         if $parameters[ :report_monitor_memory, 'false']=='true'
-          MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+          TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
             if sut_attributes[:is_connected]
               @memory_amount_start=get_sut_used_memory(sut_id, sut_attributes) if @memory_amount_start==nil || @memory_amount_start=='-'
               @memory_amount_end=get_sut_used_memory(sut_id, sut_attributes)
@@ -605,7 +604,7 @@ module TDriverReportCreator
           end
         end
         if $parameters[ :report_collect_environment_data_from_sut, 'true']=='true'
-          MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+          TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
             begin
               if sut_attributes[:is_connected]
                 sw_version=get_sut_sw_version(sut_id, sut_attributes)
@@ -636,7 +635,9 @@ module TDriverReportCreator
         write_page_end(@report_folder+'/environment/index.html')
         $new_junit_xml_results.test_suite_properties(RUBY_PLATFORM,sw_version,variant,product,language,loc,@memory_amount_total,@memory_amount_start,@memory_amount_end)
       rescue Exception => e
-        Kernel::raise e, "Unable to update environment page", caller
+        p e.message
+        p e.backtrace
+        raise e, "Unable to update environment page"
       end
       return nil
     end
@@ -653,7 +654,7 @@ module TDriverReportCreator
         write_tdriver_log_body(@report_folder+'/cases/tdriver_log_index.html',@test_run_behaviour_log)
         write_page_end(@report_folder+'/cases/tdriver_log_index.html')
       rescue Exception => e
-        Kernel::raise e
+        raise e
       end
       return nil
     end
@@ -1213,7 +1214,7 @@ module TDriverReportCreator
     # === raises
     def disconnect_connected_devices()
       if $parameters[ :report_disconnect_connected_devices, false ] == 'true'
-        MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
+        TDriver::SUTFactory.connected_suts.each do |sut_id, sut_attributes|
           sut_attributes[:sut].disconnect() if sut_attributes[:is_connected]
         end
       end
@@ -1335,7 +1336,7 @@ module TDriverReportCreator
         @all_cases_arr=nil
         update_test_case_summary_pages_for_crashes_and_reboots(rewrite)
       rescue Exception => e
-        Kernel::raise e, "Unable to update test case summary pages", caller
+        raise e, "Unable to update test case summary pages", caller
       end
       return nil
     end
@@ -1346,7 +1347,7 @@ module TDriverReportCreator
         update_test_case_summary_page('crash',rewrite,'Crash')
         update_test_case_summary_page('reboot',rewrite,'Reboot')
       rescue Exception => e
-        Kernel::raise e, "Unable to update test case summary pages for crashes and reboots", caller
+        raise e, "Unable to update test case summary pages for crashes and reboots", caller
       end
       return nil
     end

data/lib/tdriver/report/report_writer.rb

@@ -17,7 +17,6 @@
 ##
 ############################################################################
 
-include TDriverReportJavascript
 module TDriverReportWriter
 
   def write_style_sheet(page)
@@ -489,15 +488,15 @@ display: block;
     end
   end
 
-  def copy_code_file_to_test_case_report(file,folder,linen)
+  def copy_code_file_to_test_case_report(file,folder,linen,time_stamp)
     begin
       FileUtils.mkdir_p(folder.to_s+'/stack_files') if File::directory?(folder.to_s+'/stack_files')==false
       if File.directory?("#{Dir.pwd}/#{@report_folder}/#{folder}")
-        write_stack_file_to_html(file,"#{Dir.pwd}/#{@report_folder}/#{folder}/stack_files/#{File.basename(file)}.html",linen)
-        FileUtils.copy(file,"#{Dir.pwd}/#{@report_folder}/#{folder}/stack_files/#{File.basename(file)}")
+        write_stack_file_to_html(file,"#{Dir.pwd}/#{@report_folder}/#{folder}/stack_files/stk_#{time_stamp}.html",linen)
+        FileUtils.copy(file,"#{Dir.pwd}/#{@report_folder}/#{folder}/stack_files/stk_#{time_stamp}.rb")
       else
-        write_stack_file_to_html(file,"#{folder}/stack_files/#{File.basename(file)}.html",linen)
-        FileUtils.copy(file,"#{folder}/stack_files/#{File.basename(file)}")
+        write_stack_file_to_html(file,"#{folder}/stack_files/stk_#{time_stamp}.html",linen)
+        FileUtils.copy(file,"#{folder}/stack_files/stk_#{time_stamp}.rb")
       end
 
     rescue Exception => e
@@ -508,6 +507,9 @@ display: block;
 
   def reporter_link_to_code(log_line,folder=nil)
     begin
+      t = Time.now
+      time_stamp=t.strftime( "%Y%m%d%H%M%S" )
+
       log_line.gsub(/([\w \*\/\w\/\.-]+)\:(\d+)/) do |match|
         line=match[/\:(\d+)/]
         f=match[/([\w \*\/\w\/\.-]+)/]
@@ -515,9 +517,9 @@ display: block;
         file = file if File.exist?(file)
         file = "#{Dir.pwd}/#{file}" if File.exist?("#{Dir.pwd}/#{file}")
         if File.exist?(file) && match.include?('testability-driver')==false
-          copy_code_file_to_test_case_report(file,folder,line.gsub(':','').strip)
-          link_to_stack='<a style="color: #FF0000" href="stack_files/'<<
-            File.basename(file.to_s)+'.html#'+line.to_s.gsub(':','')<<
+          copy_code_file_to_test_case_report(file,folder,line.gsub(':','').strip,time_stamp)
+          link_to_stack='<a style="color: #FF0000" href="stack_files/stk_'<<
+            time_stamp+'.html#'+line.to_s.gsub(':','')<<
             '">'+match+'</a>'
           log_line=log_line.gsub(match,link_to_stack)
         end
@@ -683,7 +685,7 @@ display: block;
       '<html xmlns="http://www.w3.org/1999/xhtml">'<<
       '<head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"><META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">'<<
       stylesheet<<
-      get_expand_collapse_java_script()<<
+      get_java_script<<
       '<title>'+title+'</title>'<<
       '</head><body>'
     File.open(page, 'w') do |f2|
@@ -1495,7 +1497,7 @@ display: block;
     page_ready
   end
   def get_java_script()
-    get_expand_collapse_java_script()
+    TDriverReportJavascript.get_expand_collapse_java_script()
   end
 
   def scan_rdoc_file_for_method(file,method_name)   

data/lib/tdriver/tdriver.rb

@@ -46,18 +46,18 @@ module TDriver
     # hash:: Defines SUT type, identification attributes etc. 
     #   :id:: Valid id that can be matched in tdriver_parameters.xml
     # === raises
-    # ArgumentError:: Wrong argument Type '%s' (Expected Hash)
+    # ArgumentError:: Wrong argument type <class> (expected Hash)
     # ArgumentError:: SUT type not defined
-    # ArgumentError:: SUT type '%s' not supported
+    # ArgumentError:: SUT type <name> not supported
     # ArgumentError:: Sut id not given
     # MobyUtil::ParameterFileNotFoundError:: if paramter file (tdriver_parameters.xml in TDriver home directory) is not found
     # === returns
-    # Object:: Object that SutFactory returns 
+    # Object:: Object that SUTFactory returns 
     # === example
     #  @sut = TDriver.connect_sut(:Id =>'sut_qt') # for qt, id in configuration file sut_qt
     def connect_sut( sut_attributes = {} )
 
-      MobyBase::SUTFactory.instance.make( sut_attributes )
+      TDriver::SUTFactory.make( sut_attributes )
 
     end
 
@@ -74,7 +74,7 @@ module TDriver
     #  @sut = TDriver.disconnect_sut(:Id =>'sut_qt') # for qt, should be connected already
     def disconnect_sut( sut_attributes = {} )
 
-      MobyBase::SUTFactory.instance.disconnect_sut( sut_attributes )
+      TDriver::SUTFactory.disconnect_sut( sut_attributes )
 
     end
 
@@ -89,7 +89,7 @@ module TDriver
     #  @sut = TDriver.reboot_sut(:Id => 'sut_qt') # for Qt, should be connected already   
     def reboot_sut( sut_attributes = {} )
 
-      MobyBase::SUTFactory.instance.reboot_sut( sut_attributes )
+      TDriver::SUTFactory.reboot_sut( sut_attributes )
 
     end