testability-driver 1.0.4 → 1.1.0

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

@@ -44,12 +44,12 @@ module TDriver
               if @@partial_match_allowed.include?( [ object_type, key ] )
                 
                 prefix_value = "[contains(.,#{ value })]"
-                attribute_value = "contains(value/text(),#{ value })"
+                attribute_value = "contains(value/.,#{ value })"
               
               else
 
                 prefix_value = "=#{ value }"
-                attribute_value = "value/text()=#{ value }"
+                attribute_value = "value/.=#{ value }"
               
               end
 

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

@@ -178,7 +178,7 @@ module MobyBehaviour
       # TODO: add behaviour logging?
 
       # raise exception if attribute name variable type is other than string
-      name.check_type( [ String, Symbol ], "Wrong argument type $1 for attribute (expected $2)" )
+      name.check_type( [ String, Symbol ], "wrong argument type $1 for attribute (expected $2)" )
       
       # convert name to string if variable type is symbol
       name = name.to_s if name.kind_of?( Symbol )
@@ -384,7 +384,7 @@ module MobyBehaviour
     def child( attributes )
 
       # verify attributes argument format
-      attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
+      attributes.check_type( Hash, "wrong argument type $1 for attributes (expected $2)" )
     
       get_child_objects( attributes )
     
@@ -424,10 +424,10 @@ module MobyBehaviour
     def children( attributes, find_all_children = true )
 
       # verify attributes argument format
-      attributes.check_type( Hash, "Wrong argument type $1 for attributes (expected $2)" )
+      attributes.check_type( Hash, "wrong argument type $1 for attributes (expected $2)" )
 
       # verify find_all_children argument format
-      find_all_children.check_type( [ TrueClass, FalseClass ], "Wrong argument type $1 for find_all_children (expected $2)" )
+      find_all_children.check_type( [ TrueClass, FalseClass ], "wrong argument type $1 for find_all_children (expected $2)" )
 
       # If empty or only special attributes then add :type => '*' to search all
       attributes[ :type ] = '*' if attributes.select{ | key, value | key.to_s !~ /^__/ ? true : false }.empty?
@@ -485,6 +485,9 @@ module MobyBehaviour
           # compare new environment value with previous 
           if @env != previous_environment
 
+            # remove cached behaviour module 
+            MobyBase::BehaviourFactory.instance.reset_modules_cache
+
             # reapply behaviours to test object if environment value has changed
             MobyBase::BehaviourFactory.instance.apply_behaviour!(
 
@@ -603,6 +606,20 @@ module MobyBehaviour
       #  NOTICE: Please do not add anything unnessecery to this method, it might cause a major performance impact
       #
             
+      # for backwards compatibility
+      if attributes.has_key?( :__logging )
+
+        # for backward compatibility          
+        if attributes[ :__logging ].kind_of?( String )
+          
+          warn "warning: deprecated variable type String for :__logging test object creation directive (expected TrueClass or FalseClass)"          
+
+          attributes[ :__logging ] = attributes[ :__logging ].to_boolean 
+          
+        end
+      
+      end
+            
       # store original hash
       creation_hash = attributes.clone
 
@@ -613,7 +630,7 @@ module MobyBehaviour
 
         [ TrueClass, FalseClass ], 
 
-        "Wrong value type $1 for :__logging test object creation directive (expected $2)" 
+        "wrong value type $1 for :__logging test object creation directive (expected $2)" 
 
       ) if dynamic_attributes.has_key?( :__logging )
 

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

@@ -95,7 +95,7 @@ module TDriver
       test_object_hash = test_object.hash
 
       if @objects.has_key?( test_object_hash )
-        warn( "Warning: Test object (#{ test_object_hash }) already exists in cache" )
+        warn( "warning: Test object (#{ test_object_hash }) already exists in cache" )
       end
     
       @objects[ test_object_hash ] = test_object

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

@@ -178,17 +178,37 @@ module MobyBase
 
           # Fixnum          
           when :__index, :__timeout
+
+            # for backward compatibility          
+            if value.kind_of?( String )
+            
+              warn "warning: deprecated variable type String for #{ key.inspect } test object identification directive (expected TrueClass or FalseClass)"          
+          
+              raise ArgumentError, "deprecated and wrong variable content format for #{ key.inspect } test object identification directive (expected Numeric string)" unless value.numeric?
+          
+              value = value.to_i
+              
+            end
           
             type = Fixnum
                     
           when :__logging, :__xy_sorting
+
+            # for backward compatibility          
+            if value.kind_of?( String )
+              
+              warn "warning: deprecated variable type String for #{ key.inspect } test object identification directive (expected TrueClass or FalseClass)"          
+
+              value = value.to_boolean 
+              
+            end
           
             type = [ TrueClass, FalseClass ]
           
         end
 
         # verify hash value if type defined 
-        value.check_type( type, "Wrong variable type $1 for #{ key.inspect } test object identification directive (expected $2)" ) unless type.nil?
+        value.check_type( type, "wrong variable type $1 for #{ key.inspect } test object identification directive (expected $2)" ) unless type.nil?
 
       }
             
@@ -499,7 +519,7 @@ module MobyBase
 
     def set_timeout( new_timeout )
 
-      warn( "Deprecated method: use timeout=(value) instead of TestObjectFactory#set_timeout( value )" )
+      warn "warning: deprecated method TestObjectFactory#set_timeout( value ); please use TestObjectFactory#timeout=( value ) instead"
 
       self.timeout = new_timeout
 
@@ -511,7 +531,7 @@ module MobyBase
     # Numeric:: Timeout
     def get_timeout
 
-      warn( "Deprecated method: use timeout instead of TestObjectFactory#get_timeout" )
+      warn "warning: deprecated method TestObjectFactory#get_timeout; please use TestObjectFactory#timeout instead"
 
       @timeout
 

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

@@ -1,20 +1,20 @@
 ############################################################################
-## 
-## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 
-## All rights reserved. 
-## Contact: Nokia Corporation (testabilitydriver@nokia.com) 
-## 
-## This file is part of Testability Driver. 
-## 
-## 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. 
-## 
+##
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (testabilitydriver@nokia.com)
+##
+## This file is part of Testability Driver.
+##
+## 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.
+##
 ############################################################################
 
 
@@ -88,7 +88,7 @@ module TDriverErrorRecovery
         current_reconnect_attempt+=1
       end
     end
-    Kernel::raise BehaviourError.new("Error Recovery", "Error recovery failed after #{attempt_reconnects} recovry attemprs") if b_error_recovery_succesful==false
+    Kernel::raise BehaviourError.new("Error Recovery", "Error recovery failed after #{attempt_reconnects} recovery attempts") if b_error_recovery_succesful==false
   end
 
   # Reconnects the devices without ping
@@ -96,7 +96,7 @@ module TDriverErrorRecovery
   # === returns
   # === raises
   def reconnect_devices()
-    begin
+
       MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
         suts=@recovery_settings.get_monitored_sut
         suts.each do |monitored_sut|
@@ -105,8 +105,7 @@ module TDriverErrorRecovery
           end
         end
       end
-    rescue
-    end
+
   end
 
   # Ping the current SUT by querying xml state
@@ -119,7 +118,7 @@ module TDriverErrorRecovery
   def ping_device(current_sut)
     begin
       xml_state=current_sut.get_ui_dump()
-      if xml_state==nil
+      if xml_state.to_s.include?("tasMessage")==false
         MobyUtil::Logger.instance.log "behaviour" , "WARNING;Device ping failed"
         false
       else
@@ -127,6 +126,8 @@ module TDriverErrorRecovery
         true
       end
     rescue Exception => e
+      puts e.message
+      puts e.backtrace
       MobyUtil::Logger.instance.log "behaviour" , "WARNING;Device ping failed"
       false
     end
@@ -139,7 +140,6 @@ module TDriverErrorRecovery
   def ping_devices_and_reconnect()
     resetted=false
     MobyBase::SUTFactory.instance.connected_suts.each do |sut_id, sut_attributes|
-      begin
         suts=@recovery_settings.get_monitored_sut
         suts.each do |monitored_sut|
           if sut_id.to_s==monitored_sut.to_s
@@ -149,8 +149,6 @@ module TDriverErrorRecovery
             end
           end
         end
-      rescue
-      end
     end
     resetted
   end

data/lib/tdriver/report/report.rb

@@ -17,6 +17,8 @@
 ##
 ############################################################################
 
+require 'fileutils'
+require 'date'
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'error_recovery/tdriver_error_recovery_settings' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'error_recovery/tdriver_error_recovery' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'error_recovery/tdriver_custom_error_recovery' ) )
@@ -24,7 +26,12 @@ require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_file_capt
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_crash_file_capture' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_javascript' ) )
 
-require 'chronic_duration' if Gem.available?('chronic_duration')
+begin
+  #Gem for formatting execution duration time
+  require 'chronic_duration'
+rescue LoadError
+  #Gem not available do nothing
+end
 
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_writer' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_combine' ) )

data/lib/tdriver/report/report_api.rb

@@ -20,6 +20,24 @@
 
 module TDriverReportAPI
 
+  def tdriver_get_current_by_status( status_type )
+    Kernel::raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
+    ret = []
+    if $tdriver_reporter!=nil
+      ret = $tdriver_reporter.parse_results_for_current_test(status_type)
+    end
+    return ret
+  end
+
+  def tdriver_get_status(status_type)
+    Kernel::raise TypeError.new("Argument to method cannot be nil.") if status_type.nil?
+    ret = []
+    if $tdriver_reporter!=nil
+      ret = $tdriver_reporter.read_result_storage(status_type)
+    end
+    return ret
+  end
+  
   def tdriver_log_data(data)
     Kernel::raise TypeError.new("Argument to method cannot be nil.") if data.nil?
     if $tdriver_reporter!=nil

data/lib/tdriver/report/report_combine.rb

@@ -44,7 +44,7 @@ class ReportCombine
 
       @total_passed=read_result_storage('passed').count
       @total_failed=read_result_storage('failed').count
-      @total_not_run=read_result_storage('not run').count
+      @total_not_run=read_result_storage('not_run').count
       @total_run=read_result_storage('all').count
       
       $test_case_run_index+=executed_tests.count.to_i

data/lib/tdriver/report/report_creator.rb

@@ -65,6 +65,7 @@ module TDriverReportCreator
         $tdriver_reporter.update_test_case_summary_pages('failed')
         $tdriver_reporter.update_test_case_summary_pages('not run')
         $tdriver_reporter.update_test_case_summary_pages('statistics')
+        $tdriver_reporter.group_results_by_test_case()
         $tdriver_reporter.create_csv if MobyUtil::Parameter[ :create_run_table_csv, false ]=='true'
         $new_junit_xml_results.create_junit_xml()
         #$tdriver_reporter.delete_result_storage()
@@ -159,7 +160,8 @@ module TDriverReportCreator
       $new_test_case.test_case_total_data_sent,
       $new_test_case.test_case_total_data_received
     )
-
+    
+    
     $tdriver_reporter.set_end_time(Time.now)
     $tdriver_reporter.set_total_run(1)
     $tdriver_reporter.update_summary_page('inprogress')
@@ -169,11 +171,13 @@ module TDriverReportCreator
         $run_status_thread_active=true
         Thread.new do
           begin
+            #Update test case summary pages            
             $tdriver_reporter.update_test_case_summary_pages('all')
             $tdriver_reporter.update_test_case_summary_pages('passed')
             $tdriver_reporter.update_test_case_summary_pages('failed')
             $tdriver_reporter.update_test_case_summary_pages('not run')
             $tdriver_reporter.update_test_case_summary_pages('statistics')
+            $tdriver_reporter.group_results_by_test_case()
             $new_junit_xml_results.create_junit_xml()
             #tdriver_log_page $tdriver_reporter.update_tdriver_log_page()
             #ML: Update summary every 10 seconds improves performance during execution

data/lib/tdriver/report/report_execution_statistics.rb

@@ -25,7 +25,7 @@ class ReportingStatistics
     @pass_statuses=MobyUtil::Parameter[ :report_passed_statuses, "passed" ].split('|')
     @fail_statuses=MobyUtil::Parameter[ :report_failed_statuses, "failed" ].split('|')
     @not_run_statuses=MobyUtil::Parameter[ :report_not_run_statuses, "not run" ].split('|')
-    @test_results_per_page=MobyUtil::Parameter[ :report_results_per_page, 10]
+    @test_results_per_page=MobyUtil::Parameter[ :report_results_per_page, 50]
     @statistics_arr=Array.new
     @total_statistics_arr=Array.new
     @summary=summary
@@ -52,8 +52,9 @@ class ReportingStatistics
     @total_statistics_arr << ["dump count",0]
     @total_statistics_arr << ["sent bytes",0]
     @total_statistics_arr << ["received bytes",0]
-    @total_statistics_arr << ["used mem difference",0]
-    @all_statuses << "reboots" << "crashes" << "duration" << "dump count" << "sent bytes" << "received bytes" << "used mem difference"
+    @total_statistics_arr << ["used mem",0]
+    @total_statistics_arr << ["pass rate",0]
+    @all_statuses << "reboots" << "crashes" << "duration" << "dump count" << "sent bytes" << "received bytes" << "used mem" << "pass rate"
   end
 
   def generate_statistics_headers()
@@ -74,86 +75,102 @@ class ReportingStatistics
     status_heads << "<th abbr=\"link_column\"><b>Sent bytes</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Received bytes</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Used mem</b></th>"
+    status_heads << "<th abbr=\"link_column\"><b>Pass %</b></th>"
     status_heads
   end
 
   def update_total_execution_statistics(tc_status,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
     current_index=0
     @total_statistics_arr.each do |total_status|
-        if tc_status==total_status[0]
-          @total_statistics_arr[current_index]=[tc_status,total_status[1].to_i+1]
-        end
-        if total_status[0]=="reboots"
-          @total_statistics_arr[current_index]=["reboots",total_status[1].to_i+reboots.to_i]
-        end
-        if total_status[0]=="crashes"
-          @total_statistics_arr[current_index]=["crashes",total_status[1].to_i+crashes.to_i]
-        end
-        if total_status[0]=="total"
-          @total_statistics_arr[current_index]=["total",total_status[1].to_i+1]
-        end
-        if total_status[0]=="duration"
-          @total_statistics_arr[current_index]=["duration",""]
-        end
-        if total_status[0]=="dump count"          
-          @total_statistics_arr[current_index]=["dump count",total_status[1].to_i+dump_count.to_i]
-        end
-        if total_status[0]=="sent bytes"
-          @total_statistics_arr[current_index]=["sent bytes",total_status[1].to_i+sent_bytes.to_i]
-        end
-        if total_status[0]=="received bytes"
-          @total_statistics_arr[current_index]=["received bytes",total_status[1].to_i+received_bytes.to_i]
-        end
-        if total_status[0]=="used mem difference"
-          @total_statistics_arr[current_index]=["used mem difference",""]
-        end
-        current_index+=1
+      if tc_status==total_status[0]
+        @total_statistics_arr[current_index]=[tc_status,total_status[1].to_i+1]
+      end
+      if total_status[0]=="reboots"
+        @total_statistics_arr[current_index]=["reboots",total_status[1].to_i+reboots.to_i]
       end
+      if total_status[0]=="crashes"
+        @total_statistics_arr[current_index]=["crashes",total_status[1].to_i+crashes.to_i]
+      end
+      if total_status[0]=="total"
+        @total_statistics_arr[current_index]=["total",total_status[1].to_i+1]
+      end
+      if total_status[0]=="duration"
+        @total_statistics_arr[current_index]=["duration",""]
+      end
+      if total_status[0]=="dump count"
+        @total_statistics_arr[current_index]=["dump count",total_status[1].to_i+dump_count.to_i]
+      end
+      if total_status[0]=="sent bytes"
+        @total_statistics_arr[current_index]=["sent bytes",total_status[1].to_i+sent_bytes.to_i]
+      end
+      if total_status[0]=="received bytes"
+        @total_statistics_arr[current_index]=["received bytes",total_status[1].to_i+received_bytes.to_i]
+      end
+      if total_status[0]=="used mem"
+        @total_statistics_arr[current_index]=["used mem",""]
+      end
+      if total_status[0]=="pass rate"
+        @total_statistics_arr[current_index]=["pass rate",""]
+      end
+      current_index+=1
+    end
   end
 
   def update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
     b_test_in_statistics=false
     current_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]
-        end
-        if total_status[1]=="reboots" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"reboots",total_status[2].to_i+reboots.to_i,tc_execution,tc_link]
-        end
-        if total_status[1]=="crashes" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"crashes",total_status[2].to_i+crashes.to_i,tc_execution,tc_link]
-        end
-        if total_status[1]=="total" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"total",total_status[2].to_i+1,tc_execution,tc_link]
-        end
-        if total_status[1]=="duration" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"duration",duration,tc_execution,tc_link]
-        end
-        if total_status[1]=="dump count" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"dump count",total_status[2].to_i+dump_count.to_i,tc_execution,tc_link]
-        end
-        if total_status[1]=="sent bytes" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"sent bytes",total_status[2].to_i+sent_bytes.to_i,tc_execution,tc_link]
-        end
-        if total_status[1]=="received bytes" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"received bytes",total_status[2].to_i+received_bytes.to_i,tc_execution,tc_link]
-        end
-        if total_status[1]=="used mem difference" && total_status[0]==tc_name
-          b_test_in_statistics=true
-          @statistics_arr[current_index]=[tc_name,"used mem difference",total_status[2].to_i,tc_execution,tc_link]
-        end
-        current_index+=1
+    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    
+        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
+        @statistics_arr[current_index]=[tc_name,"reboots",total_status[2].to_i+reboots.to_i,tc_execution,tc_link]
       end
-      b_test_in_statistics
+      if total_status[1]=="crashes" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"crashes",total_status[2].to_i+crashes.to_i,tc_execution,tc_link]
+      end
+      if total_status[1]=="total" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"total",total_status[2].to_i+1,tc_execution,tc_link]
+        total_run=total_status[2].to_i+1
+      end
+      if total_status[1]=="duration" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"duration",duration,tc_execution,tc_link]
+      end
+      if total_status[1]=="dump count" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"dump count",total_status[2].to_i+dump_count.to_i,tc_execution,tc_link]
+      end
+      if total_status[1]=="sent bytes" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"sent bytes",total_status[2].to_i+sent_bytes.to_i,tc_execution,tc_link]
+      end
+      if total_status[1]=="received bytes" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"received bytes",total_status[2].to_i+received_bytes.to_i,tc_execution,tc_link]
+      end
+      if total_status[1]=="used mem" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"used mem",total_status[2].to_i,tc_execution,tc_link]
+      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]
+      end
+      current_index+=1
+    end
+    b_test_in_statistics
   end
 
   def collect_test_case_statistics()
@@ -181,14 +198,20 @@ class ReportingStatistics
       b_test_in_statistics=update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
 
       if b_test_in_statistics==false
+        total_run=0
+        total_not_run=0
+        total_passed=0
         @all_statuses.each do |status|
           if status==tc_status
             @statistics_arr << [tc_name,tc_status,1,tc_execution,tc_link]
+            total_passed=1 if @pass_statuses.include?(tc_status)
+            total_not_run=1 if @not_run_statuses.include?(tc_status)
           elsif status=="reboots"
             @statistics_arr << [tc_name,"reboots",reboots.to_i,tc_execution,tc_link]
           elsif status=="crashes"
             @statistics_arr << [tc_name,"crashes",crashes.to_i,tc_execution,tc_link]
           elsif status=="total"
+            total_run=1
             @statistics_arr << [tc_name,"total",1,tc_execution,tc_link]
           elsif status=="duration"
             @statistics_arr << [tc_name,"duration",duration,tc_execution,tc_link]
@@ -198,8 +221,12 @@ class ReportingStatistics
             @statistics_arr << [tc_name,"sent bytes",sent_bytes,tc_execution,tc_link]
           elsif status=="received bytes"
             @statistics_arr << [tc_name,"received bytes",received_bytes,tc_execution,tc_link]
-          elsif status=="used mem difference"
-            @statistics_arr << [tc_name,"used mem difference",memory_usage,tc_execution,tc_link]
+          elsif status=="used mem"
+            @statistics_arr << [tc_name,"used mem",memory_usage,tc_execution,tc_link]
+          elsif status=="pass rate"
+            pass_rate=(total_passed.to_f/(total_run.to_f-total_not_run.to_f))*100
+            pass_rate="%0.2f" % pass_rate
+            @statistics_arr << [tc_name,"pass rate",pass_rate,tc_execution,tc_link]
           else
             @statistics_arr << [tc_name,status,0,tc_execution,tc_link]
           end
@@ -231,16 +258,16 @@ class ReportingStatistics
       tc_link='<a href="cases/'+result_page.to_i.to_s+'_chronological_total_run_index.html">'
       tc_link='<a href="cases/1_reboot_index.html">' if status=="reboots" && total>0
       tc_link='<a href="cases/1_crash_index.html">' if status=="crashes" && total>0
-      tc_link='<a href="cases/'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @pass_statuses.first + '">' if @pass_statuses.include?(status) && total>0
-      tc_link='<a href="cases/'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @fail_statuses.first + '">' if @fail_statuses.include?(status) && total>0
-      tc_link='<a href="cases/'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @not_run_statuses.first + '">' if @not_run_statuses.include?(status) && total>0
+      tc_link='<a href="cases/1_'+@pass_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @pass_statuses.include?(status) && total>0
+      tc_link='<a href="cases/1_'+@fail_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @fail_statuses.include?(status) && total>0
+      tc_link='<a href="cases/1_'+@not_run_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @not_run_statuses.include?(status) && total>0
     else
       tc_link='<a href="'+result_page.to_i.to_s+'_chronological_total_run_index.html">'
       tc_link='<a href="1_reboot_index.html">' if status=="reboots" && total>0
       tc_link='<a href="1_crash_index.html">' if status=="crashes" && total>0
-      tc_link='<a href="'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @pass_statuses.first + '">' if @pass_statuses.include?(status) && total>0
-      tc_link='<a href="'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @fail_statuses.first + '">' if @fail_statuses.include?(status) && total>0
-      tc_link='<a href="'+result_page.to_i.to_s+'_chronological_total_run_index.html#'+test_case.gsub(' ','_')+'_' + @not_run_statuses.first + '">' if @not_run_statuses.include?(status) && total>0
+      tc_link='<a href="1_'+@pass_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @pass_statuses.include?(status) && total>0
+      tc_link='<a href="1_'+@fail_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @fail_statuses.include?(status) && total>0
+      tc_link='<a href="1_'+@not_run_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @not_run_statuses.include?(status) && total>0
     end
     tc_link