testability-driver 0.9.2 → 1.0.0

data/lib/tdriver/report/report_test_case_run.rb

@@ -370,6 +370,28 @@ module TDriverReportCreator
 		
     end
 	  
+    def target_video_alive
+   
+      ret = ""
+      each_video_device do | video_device, device_index |
+     
+        check_fps = MobyUtil::Parameter[:report_activity_fps, '3']
+        check_frame_min = MobyUtil::Parameter[:report_activity_frame_treshold, '8']
+        check_video_min = MobyUtil::Parameter[:report_activity_video_treshold, '29']
+        
+        ret_n = MobyUtil.video_alive? "cam_" + device_index + "_" + @tc_video_filename, check_fps.to_f, check_frame_min.to_f, check_video_min.to_f, false
+        
+        if !ret_n
+          ret += ", " if !ret.empty?
+          ret += "cam_" + device_index + "_" + @tc_video_filename
+        end
+                
+      end   
+      
+      return ret
+    
+    end
+    
     def stop_video_recording()
 	
 

data/lib/tdriver/report/report_test_run.rb

@@ -1,20 +1,20 @@
 ############################################################################
-## 
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-## All rights reserved. 
-## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
-## 
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
 ## This file is part of TDriver.
-## 
-## If you have questions regarding the use of this file, please contact 
-## Nokia at testabilitydriver@nokia.com . 
-## 
-## This library is free software; you can redistribute it and/or 
-## modify it under the terms of the GNU Lesser General Public 
-## License version 2.1 as published by the Free Software Foundation 
-## and appearing in the file LICENSE.LGPL included in the packaging 
-## of this file. 
-## 
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at testabilitydriver@nokia.com .
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation
+## and appearing in the file LICENSE.LGPL included in the packaging
+## of this file.
+##
 ############################################################################
 
 
@@ -86,7 +86,7 @@ module TDriverReportCreator
       @memory_amount_total='-'
       @total_dump_count=Hash.new
       @total_received_data=Hash.new
-      @total_sent_data=Hash.new      
+      @total_sent_data=Hash.new
       $result_storage_in_use=false
       @pages=MobyUtil::Parameter[ :report_results_per_page, 10]
       @duration_graph=MobyUtil::Parameter[ :report_generate_duration_graph, false]
@@ -129,7 +129,7 @@ module TDriverReportCreator
     # === raises
     # TypeError exception
     def set_user_data(value)
-      if value==nil        
+      if value==nil
         @test_case_user_data = Array.new
         @test_case_user_data_columns = Array.new
       else
@@ -146,13 +146,13 @@ module TDriverReportCreator
     #
     # === params
     # column_name: the column name in chronological table
-    # value: the data 
+    # value: the data
     # === returns
     # nil
     # === raises
     def set_user_table_data(column_name,value)
       if (!column_name.empty? && column_name!=nil)
-        @test_case_user_chronological_table_data[column_name.to_s]=value.to_s 
+        @test_case_user_chronological_table_data[column_name.to_s]=value.to_s
       end
     end
     #This method sets the test run behaviour log
@@ -325,7 +325,7 @@ module TDriverReportCreator
     def set_memory_amount_total(value)
       @memory_amount_total=value
     end
-    
+
     #This method gets the not run cases name array
     #
     # === params
@@ -370,7 +370,7 @@ module TDriverReportCreator
       #@all_cases_arr
       read_result_storage('all')
     end
-    
+
     #This method gets reporting groups
     #
     # === params
@@ -385,7 +385,7 @@ module TDriverReportCreator
       end
       @reporting_groups
     end
-    
+
     #This method gets user created data
     #
     # === params
@@ -396,7 +396,7 @@ module TDriverReportCreator
     def get_user_data()
       return @test_case_user_data,@test_case_user_data_columns
     end
-    
+
     #This method sets user data to display in chronological table
     #
     # === params
@@ -450,13 +450,13 @@ module TDriverReportCreator
           FileUtils.mkdir_p @report_folder+'/environment'
           FileUtils.mkdir_p @report_folder+'/cases'
           FileUtils.mkdir_p @report_folder+'/junit_xml'
-          
+
         else
           if b_fixed_report_folder==true
             FileUtils::remove_entry_secure(@report_folder, :force => true)
             FileUtils.mkdir_p @report_folder+'/environment'
             FileUtils.mkdir_p @report_folder+'/cases'
-            FileUtils.mkdir_p @report_folder+'/junit_xml'            
+            FileUtils.mkdir_p @report_folder+'/junit_xml'
           end
         end
         write_style_sheet(@report_folder+'/tdriver_report_style.css')
@@ -500,7 +500,7 @@ module TDriverReportCreator
           write_page_end(@report_folder+'/index.html')
         end
       rescue Exception => e
-        Kernel::raise e, "Unable to update summary page", caller
+        Kernel::raise e, "Unable to update summary page", e.backtrace
       end
       return nil
     end
@@ -729,7 +729,7 @@ module TDriverReportCreator
     # === raises
     def get_sut_total_dump_count(sut_id, sut_attributes)
 
-      dump_count=sut_attributes[:sut].dump_count     
+      dump_count=sut_attributes[:sut].dump_count
       @total_dump_count[sut_id.to_sym]=dump_count
       @total_dump_count
 
@@ -760,7 +760,15 @@ module TDriverReportCreator
       @total_sent_data[sut_id.to_sym]=data
       @total_sent_data
     end
-    
+
+    def calculate_total_values_from_hash(values)
+      total=0
+      values.each_value do |val|
+        total+=val
+      end
+      total
+    end
+
     def write_to_result_storage(status,
         testcase,
         group,
@@ -774,15 +782,15 @@ module TDriverReportCreator
         log='',
         comment='',
         link='',
-        total_dump=nil,
-        total_sent=nil,
-        total_received=nil )
+        total_dump=0,
+        total_sent=0,
+        total_received=0 )
       while $result_storage_in_use==true
         sleep 1
       end
       $result_storage_in_use=true
       begin
-        storage_file=nil       
+        storage_file=nil
         html_link=status+'_'+index.to_s+'_'+testcase+'/index.html' if link==''
         storage_file='all_cases.xml'
 
@@ -818,12 +826,12 @@ module TDriverReportCreator
           test_link = Nokogiri::XML::Node.new("link",test)
           test_link.content = html_link
           test_dump_count = Nokogiri::XML::Node.new("dump_count",test)
-          test_dump_count.content = total_dump
+          test_dump_count.content = calculate_total_values_from_hash(total_dump)
           test_sent_bytes = Nokogiri::XML::Node.new("sent_bytes",test)
-          test_sent_bytes.content = total_sent
+          test_sent_bytes.content = calculate_total_values_from_hash(total_sent)
           test_received_bytes = Nokogiri::XML::Node.new("received_bytes",test)
-          test_received_bytes.content = total_received
-      
+          test_received_bytes.content = calculate_total_values_from_hash(total_received)
+
           test << test_name
           test << test_group
           test << test_reboots
@@ -839,10 +847,10 @@ module TDriverReportCreator
           test << test_dump_count
           test << test_sent_bytes
           test << test_received_bytes
-         
+
           if user_data!=nil && !user_data.empty?
             test_data = Nokogiri::XML::Node.new("user_display_data",test)
-            user_data.each { |key,value| 
+            user_data.each { |key,value|
               data_value=Nokogiri::XML::Node.new("data",test_data)
               data_value.content = value.to_s
               data_value.set_attribute("id",key.to_s)
@@ -878,13 +886,13 @@ module TDriverReportCreator
                 xml.log log
                 xml.comment comment
                 xml.link html_link
-                xml.dump_count total_dump
-                xml.sent_bytes total_sent
-                xml.received_bytes total_received
+                xml.dump_count calculate_total_values_from_hash(total_dump)
+                xml.sent_bytes calculate_total_values_from_hash(total_sent)
+                xml.received_bytes calculate_total_values_from_hash(total_received)
                 if user_data!=nil && !user_data.empty?
                   xml.user_display_data {
                     (0..counter).each { |i|
-                      xml.data("id"=>user_data_keys.at(i).to_s){ 
+                      xml.data("id"=>user_data_keys.at(i).to_s){
                         xml.text user_data_values.at(i).to_s{
                         }
                       }
@@ -903,7 +911,7 @@ module TDriverReportCreator
         $stderr.puts "caught exception when writing results: #{e}"
       end
     end
-    
+
     def read_result_storage(results)
       while $result_storage_in_use==true
         sleep 1
@@ -925,7 +933,7 @@ module TDriverReportCreator
             reboots=node.search("reboots").text #2
             crashes=node.search("crashes").text #3
             start_time=node.search("start_time").text #4
-            duration=node.search("duration").text #5
+            duration="%0.2f" % node.search("duration").text #5
             memory_usage=node.search("memory_usage").text #6
             status=node.search("status").text #7
             index=node.search("index").text #8
@@ -935,14 +943,13 @@ module TDriverReportCreator
             dump_count=node.search("dump_count").text #12
             sent_bytes=node.search("sent_bytes").text #13
             received_bytes=node.search("received_bytes").text #14
-            
             user_data = Hash.new
             node.xpath("user_display_data/data").each do |data_node|
-              value_name =  data_node.get_attribute("id")  
+              value_name =  data_node.get_attribute("id")
               val = data_node.text
               user_data[value_name] = val
             end
-        
+
             case results
             when 'passed'
               if @pass_statuses.include?(status)
@@ -1167,11 +1174,11 @@ module TDriverReportCreator
     def update_test_case_summary_pages(status,rewrite=false)
 
       @all_cases_arr=Array.new
-      begin        
+      begin
         case status
         when 'passed'
           update_test_case_summary_page(status,rewrite,'Passed')
-          
+
         when 'failed'
           update_test_case_summary_page(status,rewrite,'Failed')
 
@@ -1216,7 +1223,7 @@ module TDriverReportCreator
     end
 
     def update_test_case_summary_pages_for_crashes_and_reboots(rewrite=false)
-      
+
       begin
         update_test_case_summary_page('crash',rewrite,'Crash')
         update_test_case_summary_page('reboot',rewrite,'Reboot')
@@ -1225,13 +1232,13 @@ module TDriverReportCreator
       end
       return nil
     end
-    
+
     def create_csv
       storage_file='all_cases.xml'
       csv_file = 'all_cases.csv'
       csv_array = Array.new
       not_added=false
-    
+
       file=@report_folder+'/'+storage_file
       csv =  nil
       begin
@@ -1241,10 +1248,10 @@ module TDriverReportCreator
           xml_data = Nokogiri::XML(io){ |config| config.options = Nokogiri::XML::ParseOptions::STRICT }
           io.close
           xml_data.root.xpath("//tests/test").each do |node|
-        
+
             line=Array.new
             first_line=Array.new
-        
+
             value=node.search("name").text
             first_line<<"name" if !not_added
             line<<value
@@ -1281,6 +1288,6 @@ module TDriverReportCreator
         puts e.to_s
       end
     end
-  
+
   end
 end

data/lib/tdriver/report/report_writer.rb

@@ -17,8 +17,10 @@
 ##
 ############################################################################
 
+include TDriverReportJavascript
 
 module TDriverReportWriter
+
   def write_style_sheet(page)
     css='body
 {
@@ -29,7 +31,7 @@ module TDriverReportWriter
 .navigation_section
 {
 	background-color:#0191C8;
-	width:800px;
+	width:1024px;
 	height:40px;
     margin-left : auto;
     margin-right: auto;
@@ -46,7 +48,7 @@ module TDriverReportWriter
 .page_navigation_section
 {
 	background-color:#0191C8;
-	width:800px;
+	width:1024px;
 	height:40px;
     margin-left : auto;
     margin-right: auto;
@@ -65,7 +67,7 @@ module TDriverReportWriter
 .summary
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -80,7 +82,7 @@ module TDriverReportWriter
 .summary_total_run
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -95,7 +97,7 @@ module TDriverReportWriter
 .summary_passed
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -110,7 +112,7 @@ module TDriverReportWriter
 .summary_crash
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -125,7 +127,7 @@ module TDriverReportWriter
 .summary_reboot
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -140,7 +142,7 @@ module TDriverReportWriter
 .statistics
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -155,7 +157,7 @@ module TDriverReportWriter
 .summary_failed
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -170,7 +172,7 @@ module TDriverReportWriter
 .summary_not_run
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -185,7 +187,7 @@ module TDriverReportWriter
 .test_passed
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -200,7 +202,7 @@ module TDriverReportWriter
 .test_failed
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -215,7 +217,7 @@ module TDriverReportWriter
 .test_not_run
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -230,7 +232,7 @@ module TDriverReportWriter
 .environment
 {
 	background-color:White;
-	width:800px;
+	width:1024px;
 	height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -245,7 +247,7 @@ module TDriverReportWriter
 .page_title
 {
 	background-color:#0191C8;
-	width:800px;
+	width:1024px;
 	min-height:100%;
 	margin-left : auto;
     margin-right: auto;
@@ -318,7 +320,7 @@ a:hover { color:White; background-color:#005B9A;}
 }
 
 #statistics_table
-{	
+{
 	font-size: 12px;
 	text-align: left;
 	border-collapse: collapse;
@@ -328,12 +330,12 @@ a:hover { color:White; background-color:#005B9A;}
 	font-size: 13px;
 	font-weight: normal;
 	padding: 8px;
-	background: #b9c9fe;	
+	background: #b9c9fe;
 	color: #039;
 }
 #statistics_table td
 {
-	padding: 8px;	
+	padding: 8px;
 	border-bottom: 1px solid Black;
 	color: #669;
 	border-top: 1px solid transparent;
@@ -437,8 +439,14 @@ display: none;
     css=nil
   end
   def format_duration(seconds)
-    m, s = seconds.divmod(60)
-    "#{m}m#{'%.3f' % s}s"
+    if Gem.available?('chronic_duration')
+      require 'chronic_duration'
+      duration_str=ChronicDuration.output(seconds)
+    else
+      m, s = seconds.divmod(60)
+      duration_str="#{m}m#{'%.3f' % s}s"
+    end
+    duration_str
   end
   def behaviour_log_summary(log,log_format='string')
     begin
@@ -578,7 +586,7 @@ display: none;
     when "TDriver test results"
       stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="tdriver_report_style.css"/>'
     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"/>'    
+      stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../tdriver_report_style.css"/>'
     else
       stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../../tdriver_report_style.css"/>'
     end
@@ -586,7 +594,7 @@ display: none;
       '<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_java_script()<<
+      get_expand_collapse_java_script()<<
       '<title>'+title+'</title>'<<
       '</head><body>'
     File.open(page, 'w') do |f2|
@@ -816,15 +824,15 @@ display: none;
     html_body='</dd>'<<
       '</dl>'
     html_body
-  end  
+  end
   def write_duration_graph(page, folder, graph_file_name, tc_arr)
-  
+
     tdriver_group=ReportingStatistics.new(tc_arr)
     tdriver_group.generate_duration_graph(folder + '/cases/' + graph_file_name)
-	
+
     html_body=Array.new
     html_body << '<div>'
-    html_body << '<H1 ALIGN=center><img border="0" src="./'+graph_file_name+'"/></H1>'    
+    html_body << '<H1 ALIGN=center><img border="0" src="./'+graph_file_name+'"/></H1>'
     html_body << '</div>'
     File.open(page, 'a') do |f2|
       f2.puts html_body
@@ -965,8 +973,15 @@ display: none;
     fail_rate=0
     pass_rate=0
     if total_run.to_i > 0
-      fail_rate=(total_failed.to_f/total_run.to_f)*100
-      pass_rate=(total_passed.to_f/total_run.to_f)*100
+      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
+        fail_rate="0"
+        pass_rate="0"
+      end
     end
 
     html_body='<div class="page_title"><center><h1>TDriver test results</h1></center></div>'<<
@@ -1031,18 +1046,18 @@ display: none;
     end
     html_body << '<tr>'<<
       '<td><b>Pass %</b></td>'<<
-      '<td>'+pass_rate.to_f.to_s+'%</td>'<<
+      '<td>'+pass_rate.to_s+'%</td>'<<
       '</tr>'<<
       '<tr>'<<
       '<td><b>Fail %</b></td>'<<
-      '<td>'+fail_rate.to_f.to_s+'%</td>'<<
+      '<td>'+fail_rate.to_s+'%</td>'<<
       '</tr>'<<
       '</table></div><p />'
     if summary_arr
       html_body << '<div class="statistics">'
-       tdriver_group=ReportingStatistics.new(summary_arr,true)
-       html_result=tdriver_group.generate_statistics_table()
-       html_body << html_result << '</div>'
+      tdriver_group=ReportingStatistics.new(summary_arr,true)
+      html_result=tdriver_group.generate_statistics_table()
+      html_body << html_result << '</div>'
     end
 
     File.open(page, 'a') do |f2|
@@ -1280,10 +1295,10 @@ display: none;
 
   def write_page_navigation_div(page,report_page,report_pages)
     page_with_no_number=page.gsub("#{report_page}_","")
-    page_base_name=File.basename(page_with_no_number)    
+    page_base_name=File.basename(page_with_no_number)
     div_body=Array.new
     div_body<<"<div class=\"page_navigation_section\"><center>"<<
-      "<ul id=\"navigation\">"      
+      "<ul id=\"navigation\">"
     max=10
     start_page=report_page/max
     if start_page==0
@@ -1319,8 +1334,8 @@ display: none;
 
   def write_page_end(page,report_page=nil,report_pages=nil)
     page_ready=nil
-    if report_page!=nil      
-      navigation_div="#{write_page_navigation_div(page,report_page,report_pages)}"      
+    if report_page!=nil
+      navigation_div="#{write_page_navigation_div(page,report_page,report_pages)}"
       html_end="#{navigation_div}</body></html>"
       doc = Nokogiri::HTML(open(page))
       b_div_found=false
@@ -1328,10 +1343,10 @@ display: none;
         if div.text.include?('Next')
           page_ready=report_page
         end
-        b_div_found=true          
+        b_div_found=true
         div.replace(Nokogiri.make(navigation_div))
-      end     
-      if b_div_found==false 
+      end
+      if b_div_found==false
         File.open(page, 'a') do |f|
           f.puts html_end
         end
@@ -1345,26 +1360,12 @@ display: none;
       File.open(page, 'a') do |f|
         f.puts html_end
       end
-    end    
+    end
     html_end=nil
     page_ready
   end
   def get_java_script()
-    java_script='<script type="text/javascript">'<<
-      '/* Only set closed if JS-enabled */'<<
-      "document.getElementsByTagName('html')[0].className = 'isJS';"<<
-      'function tog(dt)'<<
-      '{'<<
-      'var display, dd=dt;'<<
-      '/* get dd */'<<
-      "do{ dd = dd.nextSibling } while(dd.tagName!='DD');"<<
-      'toOpen =!dd.style.display;'<<
-      "dd.style.display = toOpen? 'block':'';"<<
-      "dt.getElementsByTagName('span')[0].innerHTML"<<
-      "= toOpen? '<input id=\"Button1\" type=\"button\" value=\"Close\" class=\"btn\" style=\"background-color: #FFFFFF\" />':'<input id=\"Button1\" type=\"button\" value=\"Open\" class=\"btn\" />' ;"<<
-      '}'<<
-      '</script>'
-    java_script
+    get_expand_collapse_java_script()
   end
   def format_user_log_table(user_data_rows,user_data_columns)
     begin