testability-driver 1.0.4 → 1.1.0

data/lib/tdriver/report/report_test_case_run.rb

@@ -440,7 +440,7 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def update_test_case_page()
+    def update_test_case_page(rewrite=false)
       begin
         #Calculate run time
         @test_case_run_time=Time.now-@test_case_start_time
@@ -467,6 +467,7 @@ module TDriverReportCreator
           @test_case_total_data_received
         )
         write_page_end(@test_case_folder+'/index.html')
+                
       rescue Exception => e
         Kernel::raise e
       end

data/lib/tdriver/report/report_test_run.rb

@@ -88,7 +88,7 @@ module TDriverReportCreator
       @total_received_data=Hash.new
       @total_sent_data=Hash.new
       $result_storage_in_use=false
-      @pages=MobyUtil::Parameter[ :report_results_per_page, 10]
+      @pages=MobyUtil::Parameter[ :report_results_per_page, 50]
       @duration_graph=MobyUtil::Parameter[ :report_generate_duration_graph, false]
       @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
       @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
@@ -335,7 +335,7 @@ module TDriverReportCreator
     # === raises
     def get_not_run_cases_arr()
       #@not_run_cases_arr
-      read_result_storage('not run')
+      read_result_storage('not_run')
     end
     #This method gets the passed cases name array
     #
@@ -478,6 +478,28 @@ module TDriverReportCreator
       return nil
     end
 
+    #This method generates the tdriver test run summary page grouped by test case
+    #
+    # === params
+    # nil
+    # === returns
+    # nil
+    # === raises
+    def group_results_by_test_case()
+      @all_cases_arr=read_result_storage('all')
+      created_grouped_test_result=[]
+
+      @all_cases_arr.each do |test_case|
+        #name, status
+        tc=[test_case[7],test_case[0]]
+        if !created_grouped_test_result.include?(tc)
+          update_test_case_summary_page(test_case[7],false,"Test: #{test_case[0]} Result: #{test_case[7]}",test_case[0])
+          created_grouped_test_result << tc
+        end
+      end
+
+    end
+
     #This method updates the tdriver test run summary page
     #
     # === params
@@ -912,7 +934,9 @@ module TDriverReportCreator
       end
     end
 
-    def read_result_storage(results)
+    def parse_results_for_current_test( by_status )
+
+      ret_xml = nil
       while $result_storage_in_use==true
         sleep 1
       end
@@ -922,12 +946,72 @@ module TDriverReportCreator
         result_storage=Array.new
         storage_file='all_cases.xml'
 
+
         file=@report_folder+'/'+storage_file
         if File.exist?(file)
           io = File.open(file, 'r')
+          ret_xml = Nokogiri::XML(io){ |config| config.options = Nokogiri::XML::ParseOptions::STRICT }
+
+          io.close
+
+          status_search = ""
+
+          case by_status
+          when "all"
+            status_search = ""
+          when "passed"
+            status_search = " and (status='"
+            status_search << @pass_statuses.join("' or status='")
+            status_search << "')"
+          when "failed"
+            status_search = " and (status='"
+            status_search << @fail_statuses.join("' or status='")
+            status_search << "')"
+          when "not run"
+            status_search = " and (status='"
+            status_search << @not_run_statuses.join("' or status='")
+            status_search << "')"
+          else
+            status_search = " and status='" + by_status + "'"
+          end
+
+          ret_xml = ret_xml.root.xpath("//tests/test[name='#{$new_test_case.test_case_name}' and group='#{$new_test_case.test_case_group}'#{status_search}]")
+        else
+          #puts "No file " << storage_file
+        end
+      rescue Exception => e
+        $result_storage_in_use=false
+        raise e
+
+      end
+
+      $result_storage_in_use=false
+
+      ret_xml
+
+    end
+
+    def read_result_storage(results,case_name=nil)
+      while $result_storage_in_use==true
+        sleep 1
+      end
+      $result_storage_in_use=true
+      begin
+        result_storage=nil
+        result_storage=Array.new
+        storage_file='all_cases.xml'
+
+        file=@report_folder+'/'+storage_file
+        if File.exist?(file)
+          io = File.open(file, 'rb')
           xml_data = Nokogiri::XML(io){ |config| config.options = Nokogiri::XML::ParseOptions::STRICT }
           io.close
-          xml_data.root.xpath("//tests/test").each do |node|
+          if case_name
+            nodes=xml_data.root.xpath("//tests/test[name='#{case_name}']")
+          else
+            nodes=xml_data.root.xpath("//tests/test")
+          end
+          nodes.each do |node|
             value=node.search("name").text #0
             group=node.search("group").text #1
             reboots=node.search("reboots").text #2
@@ -950,125 +1034,89 @@ module TDriverReportCreator
               user_data[value_name] = val
             end
 
+            current_record=[value,
+              group,
+              reboots,
+              crashes,
+              start_time,
+              duration,
+              memory_usage,
+              status,
+              index,
+              log,
+              comment,
+              link,
+              user_data,
+              dump_count,
+              sent_bytes,
+              received_bytes
+            ]
             case results
             when 'passed'
-              if @pass_statuses.include?(status)
-                result_storage << [value,
-                  group,
-                  reboots,
-                  crashes,
-                  start_time,
-                  duration,
-                  memory_usage,
-                  status,
-                  index,
-                  log,
-                  comment,
-                  link,
-                  user_data,
-                  dump_count,
-                  sent_bytes,
-                  received_bytes
-                ]
+              if case_name
+                if @pass_statuses.include?(status) && value==case_name
+                  result_storage << current_record
+                end
+              else
+                if @pass_statuses.include?(status)
+                  result_storage << current_record
+                end
               end
+
             when 'failed'
-              if @fail_statuses.include?(status)
-                result_storage << [value,
-                  group,
-                  reboots,
-                  crashes,
-                  start_time,
-                  duration,
-                  memory_usage,
-                  status,
-                  index,
-                  log,
-                  comment,
-                  link,
-                  user_data,
-                  dump_count,
-                  sent_bytes,
-                  received_bytes
-                ]
+              if case_name
+                if @fail_statuses.include?(status) && value==case_name
+                  result_storage << current_record
+                end
+              else
+                if @fail_statuses.include?(status)
+                  result_storage << current_record
+                end
               end
+
             when 'not_run'
-              if @not_run_statuses.include?(status)
-                result_storage << [value,
-                  group,
-                  reboots,
-                  crashes,
-                  start_time,
-                  duration,
-                  memory_usage,
-                  status,
-                  index,
-                  log,
-                  comment,
-                  link,
-                  user_data,
-                  dump_count,
-                  sent_bytes,
-                  received_bytes
-                ]
+              if case_name
+                if @not_run_statuses.include?(status) && value==case_name
+                  result_storage << current_record
+                end
+              else
+                if @not_run_statuses.include?(status)
+                  result_storage << current_record
+                end
               end
+
             when 'crash'
               if crashes.to_i > 0
-                result_storage << [value,
-                  group,
-                  reboots,
-                  crashes,
-                  start_time,
-                  duration,
-                  memory_usage,
-                  status,
-                  index,
-                  log,
-                  comment,
-                  link,
-                  user_data,
-                  dump_count,
-                  sent_bytes,
-                  received_bytes
-                ]
+                result_storage << current_record
               end
+
             when 'reboot'
               if reboots.to_i > 0
-                result_storage << [value,
-                  group,
-                  reboots,
-                  crashes,
-                  start_time,
-                  duration,
-                  memory_usage,
-                  status,
-                  index,
-                  log,
-                  comment,
-                  link,
-                  user_data,
-                  dump_count,
-                  sent_bytes,
-                  received_bytes
-                ]
+                result_storage << current_record
               end
+
             when 'all'
-              result_storage << [value,
-                group,
-                reboots,
-                crashes,
-                start_time,
-                duration,
-                memory_usage,
-                status,
-                index,
-                log,
-                comment,
-                link,
-                user_data,
-                dump_count,
-                sent_bytes,
-                received_bytes
-              ]
+              if case_name
+                if value==case_name
+                  result_storage << current_record
+                end
+              else
+                result_storage << current_record
+              end
+            else
+              if @pass_statuses.include?(status)
+                if (( case_name and value==case_name ) or !case_name )
+                  result_storage << current_record
+                end
+              elsif @fail_statuses.include?(status)
+                if (( case_name and value==case_name ) or !case_name )
+                  result_storage << current_record
+                end
+              elsif @not_run_statuses.include?(status)
+                if (( case_name and value==case_name ) or !case_name )
+                  result_storage << current_record
+                end
+              end
             end
           end
           xml_data=nil
@@ -1143,18 +1191,41 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def update_test_case_summary_page(status,rewrite=false,title="")
+    def update_test_case_summary_page(status,rewrite=false,title="",test_case_name=nil,tc_result_arr=nil)
       @cases_arr=Array.new
-
-      @cases_arr=read_result_storage(status)
+      search_case = nil
+      if @pass_statuses.include?(status)
+        search_case = "passed"
+      elsif @fail_statuses.include?(status)
+        search_case = "failed"
+      elsif @not_run_statuses.include?(status)
+        search_case = "not_run"
+      else
+        search_case = status
+      end
+      status=status.gsub(' ','_')
+      if test_case_name
+        @cases_arr=read_result_storage(search_case,test_case_name)
+      else
+        @cases_arr=read_result_storage(search_case)
+      end
       splitted_arr=Array.new
       splitted_arr=split_array(@cases_arr,@pages.to_i)
       page=1
       splitted_arr.each do |case_arr|
-        if @report_pages_ready.include?("#{page}_passed")==false || rewrite==true
-          write_page_start(@report_folder+"/cases/#{page}_#{status}_index.html",title,page,splitted_arr.length)
-          write_test_case_summary_body(@report_folder+"/cases/#{page}_#{status}_index.html",status,case_arr,nil)
-          page_ready=write_page_end(@report_folder+"/cases/#{page}_#{status}_index.html",page,splitted_arr.length)
+
+        if test_case_name
+          if @report_pages_ready.include?("#{page}_#{status}_#{test_case_name}")==false || rewrite==true
+            write_page_start(@report_folder+"/cases/#{page}_#{status}_#{test_case_name}_index.html",title,page,splitted_arr.length)
+            write_test_case_summary_body(@report_folder+"/cases/#{page}_#{status}_#{test_case_name}_index.html",status,case_arr,nil)
+            page_ready=write_page_end(@report_folder+"/cases/#{page}_#{status}_#{test_case_name}_index.html",page,splitted_arr.length)
+          end
+        else
+          if @report_pages_ready.include?("#{page}_#{status}")==false || rewrite==true
+            write_page_start(@report_folder+"/cases/#{page}_#{status}_index.html",title,page,splitted_arr.length)
+            write_test_case_summary_body(@report_folder+"/cases/#{page}_#{status}_index.html",status,case_arr,nil)
+            page_ready=write_page_end(@report_folder+"/cases/#{page}_#{status}_index.html",page,splitted_arr.length)
+          end
         end
         if page_ready!=nil
           @report_pages_ready << "#{page_ready}_#{status}"

data/lib/tdriver/report/report_writer.rb

@@ -438,9 +438,10 @@ display: block;
   end
 
   def format_duration(seconds)
-    if Gem.available?('chronic_duration')      
+    begin
+      require 'chronic_duration'
       duration_str=ChronicDuration.output(seconds)
-    else
+    rescue LoadError
       m, s = seconds.divmod(60)
       duration_str="#{m}m#{'%.3f' % s}s"
     end
@@ -467,7 +468,7 @@ display: block;
   def copy_code_file_to_test_case_report(file,folder,linen)
     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}")        
+      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)}")
       else
@@ -483,16 +484,16 @@ display: block;
 
   def reporter_link_to_code(log_line,folder=nil)
     begin
-      log_line.gsub(/([\w\*\/\w\/\.-]+)\:(\d+)/) do |match|
-        line=match[/(\d+)/]
-        f=match[/([\w\*\/\w\/\.-]+)/]
+      log_line.gsub(/([\w \*\/\w\/\.-]+)\:(\d+)/) do |match|
+        line=match[/\:(\d+)/]
+        f=match[/([\w \*\/\w\/\.-]+)/]
         file="#{File.dirname(f.strip)}/#{File.basename(f.strip)}"
         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.strip)
+          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<<
+            File.basename(file.to_s)+'.html#'+line.to_s.gsub(':','')<<
             '">'+match+'</a>'
           log_line=log_line.gsub(match,link_to_stack)
         end
@@ -645,7 +646,12 @@ display: block;
     when "TDriver test environment","Total run","Statistics","Passed","Failed","Not run","Crash","Reboot","TDriver log"
       stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../tdriver_report_style.css"/>'
     else
-      stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../../tdriver_report_style.css"/>'
+      if title.include?("Test:")
+        stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../tdriver_report_style.css"/>'
+      else
+        stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../../tdriver_report_style.css"/>'
+      end
+      
     end
     html_start='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' <<
       '<html xmlns="http://www.w3.org/1999/xhtml">'<<
@@ -896,12 +902,11 @@ display: block;
     end
     tdriver_group = nil
     html_body=nil
-    GC.start
+    
   end
-  def write_test_case_summary_body(page,status,tc_arr,chronological_page=nil,report_page=nil)
+  def write_test_case_summary_body(page,status,tc_arr,chronological_page=nil,report_page=nil,test_case_name=nil)
     html_body=Array.new
-    case status
-    when 'passed'
+    if @pass_statuses.include?(status) || status == "passed"
       title='<div class="page_title"><center><h1>Passed</h1></center></div>'<<
         '<div class="summary_passed">' <<
         '<form action="save_total_run_results" >'
@@ -915,7 +920,7 @@ display: block;
       html_body << '<form action="save_results_to" ><input type="submit" name="save_results_to" value="Download report" /></form>' if @report_editable=='true'
       tdriver_group=nil
       html_result=nil
-    when 'failed'
+    elsif @fail_statuses.include?(status) || status == "failed" 
       title='<div class="page_title"><center><h1>Failed</h1></center></div>'<<
         '<div class="summary_failed">' <<
         '<form action="save_total_run_results" >'
@@ -929,7 +934,7 @@ display: block;
       html_body << '<form action="save_results_to" ><input type="submit" name="save_results_to" value="Download report" /></form>' if @report_editable=='true'
       tdriver_group=nil
       html_result=nil
-    when 'not_run'
+   elsif @not_run_statuses.include?(status) || status == "not_run"
       title='<div class="page_title"><center><h1>Not run</h1></center></div>'<<
         '<div class="summary_not_run">' <<
         '<form action="save_total_run_results" >'
@@ -943,6 +948,8 @@ display: block;
       html_body << '<form action="save_results_to" ><input type="submit" name="save_results_to" value="Download report" /></form>' if @report_editable=='true'
       tdriver_group=nil
       html_result=nil
+    else
+	case status
     when 'crash'
       title='<div class="page_title"><center><h1>Crash</h1></center></div>'<<
         '<div class="summary_crash">' <<
@@ -1017,25 +1024,27 @@ display: block;
       tdriver_group=nil
       chronological_html_result=nil
       chronological_html_body=nil
-    end
+    end # case
+	end # if
+	
     html_body << '</div>'
     File.open(page, 'a') do |f2|
       f2.puts html_body
     end
     html_body=nil
-    GC.start
+    
   end
 
   def write_summary_body(page,start_time,end_time,run_time,total_run,total_passed,total_failed,total_not_run,total_crash_files,total_device_resets,summary_arr=nil)
-    fail_rate=0
-    pass_rate=0
-    if total_run.to_i > 0
+    fail_rate="0"
+    pass_rate="0"
+    if total_run.to_i > total_not_run.to_i
       begin
         fail_rate=(total_failed.to_f/(total_run.to_f-total_not_run.to_f))*100
         pass_rate=(total_passed.to_f/(total_run.to_f-total_not_run.to_f))*100
         fail_rate="%0.2f" % fail_rate
         pass_rate="%0.2f" % pass_rate
-      rescue
+      rescue # Note that 0.0/0.0 does result in NaN, it does not cause an exception
         fail_rate="0"
         pass_rate="0"
       end
@@ -1310,14 +1319,25 @@ display: block;
       failed_link="#{report_page}_failed_index.html\""
       not_run_link="#{report_page}_not_run_index.html\""
     else
-      tdriver_test_results_link='../../index.html"'
-      tdriver_test_environment_link='../../environment/index.html"'
-      tdriver_log_link='../tdriver_log_index.html"'
-      total_run_link="../1_total_run_index.html\""
-      statistics_link='../statistics_index.html"'
-      passed_link="../1_passed_index.html\""
-      failed_link="../1_failed_index.html\""
-      not_run_link="../1_not_run_index.html\""
+      if title.include?("Test:")
+        tdriver_test_results_link='../index.html"'
+        tdriver_test_environment_link='../environment/index.html"'
+        tdriver_log_link='tdriver_log_index.html"'
+        total_run_link="1_total_run_index.html\""
+        statistics_link='statistics_index.html"'
+        passed_link="1_passed_index.html\""
+        failed_link="#{report_page}_failed_index.html\" class=\"current\""
+        not_run_link="1_not_run_index.html\""
+      else
+        tdriver_test_results_link='../../index.html"'
+        tdriver_test_environment_link='../../environment/index.html"'
+        tdriver_log_link='../tdriver_log_index.html"'
+        total_run_link="../1_total_run_index.html\""
+        statistics_link='../statistics_index.html"'
+        passed_link="../1_passed_index.html\""
+        failed_link="../1_failed_index.html\""
+        not_run_link="../1_not_run_index.html\""
+      end
     end
     html_body='<div class="navigation_section"><div class="navigation_tabs">'<<
       '<ul id="navigation_tabs_ul">'<<