testability-driver 1.0.3 → 1.0.4

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

@@ -511,7 +511,7 @@ module MobyBase
 		end
 
 		# enable hooking for performance measurement & debug logging
-		MobyUtil::Hooking.instance.hook_methods( self ) if defined?( MobyUtil::Hooking )
+		TDriver::Hooking.hook_methods( self ) if defined?( TDriver::Hooking )
 
 	end # TestObjectIdentificator
 

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

@@ -21,7 +21,7 @@
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'abstract' ) )
 
 # load test object identificator
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'identificator' ) )
+#require File.expand_path( File.join( File.dirname( __FILE__ ), 'identificator' ) )
 
 # load test object factory
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'factory' ) )

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

@@ -9,13 +9,13 @@ module TDriver
       # TODO: Document me (TestObjectFactory::check_verify_always_reporting_settings)
       def check_verify_always_reporting_settings
 
-        @@reporter_attached = MobyUtil::Parameter[ :report_attach_continuous_verification_to_reporter, 'false' ]
+        @@reporter_attached = $parameters[ :report_attach_continuous_verification_to_reporter, 'false' ]
 
-        @@rcv_raise_errors = MobyUtil::Parameter[ :report_continuous_verification_raise_errors, 'true' ]
+        @@rcv_raise_errors = $parameters[ :report_continuous_verification_raise_errors, 'true' ]
 
-        @@rcv_fail_test_case = MobyUtil::Parameter[ :report_continuous_verification_fail_test_case_on_error, 'true' ]
+        @@rcv_fail_test_case = $parameters[ :report_continuous_verification_fail_test_case_on_error, 'true' ]
 
-        @@rvc_capture_screen = MobyUtil::Parameter[ :report_continuous_verification_capture_screen_on_error, 'true' ]
+        @@rvc_capture_screen = $parameters[ :report_continuous_verification_capture_screen_on_error, 'true' ]
 
       end
 
@@ -35,13 +35,13 @@ module TDriver
       def initialize_settings
 
         # defaults
-        @@global_reporter_attached = MobyUtil::Parameter[ :report_attach_continuous_verification_to_reporter, 'false' ]
+        @@global_reporter_attached = $parameters[ :report_attach_continuous_verification_to_reporter, 'false' ]
 
-        @@rcv_global_raise_errors = MobyUtil::Parameter[ :report_continuous_verification_raise_errors, 'true' ]
+        @@rcv_global_raise_errors = $parameters[ :report_continuous_verification_raise_errors, 'true' ]
 
-        @@rcv_global_fail_test_case = MobyUtil::Parameter[ :report_continuous_verification_fail_test_case_on_error, 'true' ]
+        @@rcv_global_fail_test_case = $parameters[ :report_continuous_verification_fail_test_case_on_error, 'true' ]
 
-        @@rvc_global_capture_screen = MobyUtil::Parameter[ :report_continuous_verification_capture_screen_on_error, 'true' ]
+        @@rvc_global_capture_screen = $parameters[ :report_continuous_verification_capture_screen_on_error, 'true' ]
 
         @@inside_verify = false
 
@@ -64,7 +64,7 @@ module TDriver
 
         @@inside_verify = true
 
-        logging_enabled = MobyUtil::Logger.instance.enabled
+        logging_enabled = $logger.enabled
 
         sut.verify_blocks.each do | verify |
 
@@ -72,7 +72,7 @@ module TDriver
 
           begin
 
-            MobyUtil::Logger.instance.enabled = false
+            $logger.enabled = false
 
             begin
             
@@ -103,8 +103,8 @@ module TDriver
 
                 TDriverReportAPI::tdriver_report_log("<hr />")
                 
-                MobyUtil::Logger.instance.enabled = logging_enabled
-                MobyUtil::Logger.instance.log "behaviour" , "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
+                $logger.enabled = logging_enabled
+                $logger.log "behaviour", "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
 
               end
 
@@ -142,9 +142,9 @@ module TDriver
                 
                 TDriverReportAPI::tdriver_report_log("<hr />")
 
-                MobyUtil::Logger.instance.enabled = logging_enabled
+                $logger.enabled = logging_enabled
                 
-                MobyUtil::Logger.instance.log "behaviour" , "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
+                $logger.log "behaviour", "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
 
               end
             
@@ -152,9 +152,9 @@ module TDriver
 
           rescue Exception => e
 
-            MobyUtil::Logger.instance.enabled = logging_enabled
+            $logger.enabled = logging_enabled
 
-            MobyUtil::Logger.instance.log "behaviour" , "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
+            $logger.log "behaviour", "FAIL;Verification #{verify.message.nil? ? '' : '\"' << verify.message << '\" '}failed:#{e.to_s}.\n#{verify.timeout.nil? ? '' : ' using timeout ' + verify.timeout.to_s}.;#{sut.id.to_s+';sut'};{};verify_always;" << verify.expected.to_s
 
             @@inside_verify = false
 
@@ -169,7 +169,7 @@ module TDriver
 
       ensure
 
-        MobyUtil::Logger.instance.enabled = logging_enabled
+        $logger.enabled = logging_enabled
         @@inside_verify = false      
 
       end

data/lib/tdriver/loader.rb

@@ -19,18 +19,29 @@
 
 # load globally used external modules
 require 'singleton'
-require 'set'
 
-# load native extensions if available
-begin; require File.expand_path( File.join( File.dirname( __FILE__ ), 'native_extensions' ) ); rescue LoadError; end
+#require 'set'
 
-# generic utility modules
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'util/loader' ) )
+begin
+
+  # load native extensions if available
+  require File.expand_path( File.join( File.dirname( __FILE__ ), 'native_extensions' ) )
+
+rescue LoadError
+
+  # do nothing
+
+end
+
+# utility modules
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'util/loader.rb' ) )
 
 # base modules
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'base/loader' ) )
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'base/loader.rb' ) )
+
+# reporting modules
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'report/report.rb' ) )
 
-# misc modules
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'report/report' ) )
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'verify/verify' ) )
+# verify module
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'verify/verify.rb' ) )
 

data/lib/tdriver/report/report.rb

@@ -23,6 +23,9 @@ require File.expand_path( File.join( File.dirname( __FILE__ ), 'error_recovery/t
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_file_capture' ) )
 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')
+
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_writer' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_combine' ) )
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_data_table' ) )
@@ -42,7 +45,9 @@ require File.expand_path( File.join( File.dirname( __FILE__ ), 'report_data_pres
 
 
 if MobyUtil::Parameter[ :custom_error_recovery_module, nil ]!=nil
+
   require MobyUtil::Parameter[ :custom_error_recovery_module ]
+
 end
 
 

data/lib/tdriver/report/report_creator.rb

@@ -280,7 +280,7 @@ module TDriverReportCreator
 
         each_video_device do | video_device, device_index |
           begin
-            File.copy( "cam_" + device_index + "_" + @_video_file_name, "cam_" + device_index + "_" + @_previous_video_file_name )
+            FileUtils.copy( "cam_" + device_index + "_" + @_video_file_name, "cam_" + device_index + "_" + @_previous_video_file_name )
           rescue
             # do nothing..
           end
@@ -594,4 +594,4 @@ end #TDriverReportCreator
 
 
 
- 
+ 

data/lib/tdriver/report/report_cucumber_listener.rb

@@ -51,21 +51,21 @@ module TDriverReport
     # === raises
     def step_name(keyword, step_match, status, source_indent, background)
       if status == :passed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} PASSED")
         @tc_status='passed'
       end
       if status == :failed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} FAILED")
         @tc_status='failed'
       end
       if status == :skipped
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} SKIPPED")
       end
       if status == :undefined
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} NOT RUN")
         @tc_status='not run'
       end

data/lib/tdriver/report/report_cucumber_reporter.rb

@@ -49,21 +49,21 @@ module TDriverReport
     # === raises
     def step_name(keyword, step_match, status, source_indent, background)
       if status == :passed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} PASSED")
         @tc_status='passed'
       end
       if status == :failed
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} FAILED")
         @tc_status='failed'
       end
       if status == :skipped
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} SKIPPED")
       end
       if status == :undefined
-        step_name = step_match.format_args(lambda{|param| "*#{param}*"})
+        step_name = step_match.format_args(lambda{|param| "#{param}"})
         update_test_case("#{step_name} NOT RUN")
         @tc_status='not run'
       end

data/lib/tdriver/report/report_execution_statistics.rb

@@ -59,21 +59,21 @@ class ReportingStatistics
   def generate_statistics_headers()
     status_heads=Array.new
     @pass_statuses.each do |status|
-      status_heads << "<td><b>#{status}</b></td>"
+      status_heads << "<th abbr=\"link_column\"><b>#{status}</b></th>"
     end
     @fail_statuses.each do |status|
-      status_heads << "<td><b>#{status}</b></td>"
+      status_heads << "<th abbr=\"link_column\"><b>#{status}</b></th>"
     end
     @not_run_statuses.each do |status|
-      status_heads << "<td><b>#{status}</b></td>"
+      status_heads << "<th abbr=\"link_column\"><b>#{status}</b></th>"
     end
-    status_heads << "<td><b>Reboots</b></td>"
-    status_heads << "<td><b>Crashes</b></td>"
-    status_heads << "<td><b>Duration</b></td>"
-    status_heads << "<td><b>Dump count</b></td>"
-    status_heads << "<td><b>Sent bytes</b></td>"
-    status_heads << "<td><b>Received bytes</b></td>"
-    status_heads << "<td><b>Used mem</b></td>"
+    status_heads << "<th abbr=\"link_column\"><b>Reboots</b></th>"
+    status_heads << "<th abbr=\"link_column\"><b>Crashes</b></th>"
+    status_heads << "<th abbr=\"link_column\"><b>Duration</b></th>"
+    status_heads << "<th abbr=\"link_column\"><b>Dump count</b></th>"
+    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
   end
 
@@ -289,16 +289,16 @@ class ReportingStatistics
     table_body=Array.new
     reset_total_statistics()
     collect_test_case_statistics()
-    table_body='<table id="statistics_table" align="center" border="0" cellspacing="0" style="width:100%;">'<<
-      '<tr>'<<
-      '<td>'<<
-      '<b>Row</b></td>'<<
-      '<td>'<<
-      '<b>Name</b></td>'<<
-      '<td>'<<
-      '<b>Total</b></td>'<<
+    table_body='<table id="statistics_table" class="sortable" align="center" border="0" cellspacing="0" style="width:100%;">'<<
+      '<thead><tr>'<<
+      '<th>'<<
+      '<b>Row</b></th>'<<
+      '<th abbr="link_column">'<<
+      '<b>Name</b></th>'<<
+      '<th abbr="link_column">'<<
+      '<b>Total</b></th>'<<
       generate_statistics_headers.to_s <<
-      '</tr>'
+      '</tr></thead><tbody>'
 
     test_case_added=Array.new
     row=1
@@ -326,14 +326,14 @@ class ReportingStatistics
     end
 
 
-    table_body << '<tr></tr>'
-    table_body << '<tr>' <<
+    table_body << '</tbody>'
+    table_body << '<tfoot><tr>' <<
       '<td></td><td>'<<
       '<b>Total</b></td>'
     @total_statistics_arr.each do |statistic|
       table_body << "<td><b>#{statistic[1]}</b></td>"
     end
-    table_body << '</tr>' <<
+    table_body << '</tr></tfoot>' <<
       '</table>'
 
 

data/lib/tdriver/report/report_grouping.rb

@@ -102,7 +102,7 @@ class ReportingGroups
       test_statistics=tog_list_statistics(tc_arr,name,status)
       if test_statistics != 0
         html_body='<dl class="togList">'<<
-          '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b><span><input id="Button1" type="button" value="Open" class="btn" /></span> '<<
+          '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b><span><input id="Button1" type="button" value="Close" class="btn" /></span> '<<
           name.to_s<<
           '</b> '<<
           '</dt>'<<
@@ -115,7 +115,7 @@ class ReportingGroups
       end
     else
       html_body='<dl class="togList">'<<
-        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b><span><input id="Button1" type="button" value="Open" class="btn" /></span> '<<
+        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b><span><input id="Button1" type="button" value="Close" class="btn" /></span> '<<
         name.to_s<<
         '</b> '<<
         '</dt>'<<

data/lib/tdriver/report/report_javascript.rb

@@ -30,10 +30,17 @@ module TDriverReportJavascript
       '/* get dd */'<<
       "do{ dd = dd.nextSibling } while(dd.tagName!='DD');"<<
       'toOpen =!dd.style.display;'<<
-      "dd.style.display = toOpen? 'block':'';"<<
+      "dd.style.display = toOpen? 'none':'';"<<
       "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\" />' ;"<<
+      "= toOpen? '<input id=\"Button1\" type=\"button\" value=\"Open\" class=\"btn\" />':'<input id=\"Button1\" type=\"button\" value=\"Close\" class=\"btn\" style=\"background-color: #FFFFFF\" />' ;"<<
       '}'<<
+      get_table_sorting_java_script <<
+      'function init()
+      {
+        var Table1Sorter = new TSorter;
+        Table1Sorter.init(\'statistics_table\');
+      }
+      window.onload = init;'<<
       '</script>'
     java_script
   end
@@ -111,11 +118,11 @@ module TDriverReportJavascript
       {
         case \"link_column\":
           get = function(index){
-            return  getCell(index).firstChild.firstChild.nodeValue;
+            return  parseFloat(getCell(index).firstChild.firstChild.nodeValue);
           };
           break;
         default:
-          get = function(index){	return getCell(index).firstChild.nodeValue;};
+          get = function(index){	return parseInt(getCell(index).firstChild.nodeValue);};
           break;
       };
     }

data/lib/tdriver/report/report_test_case_run.rb

@@ -491,13 +491,13 @@ module TDriverReportCreator
         each_video_device do | video_device, device_index |
                     
           begin		
-            File.copy("cam_" + device_index + "_" + @tc_video_filename, video_folder)
+            FileUtils.copy("cam_" + device_index + "_" + @tc_video_filename, video_folder)
           rescue
             # Copy failed, do nothing
           end
           
           begin
-            File.copy("cam_" + device_index + "_" + @tc_previous_video_filename, video_folder)
+            FileUtils.copy("cam_" + device_index + "_" + @tc_previous_video_filename, video_folder)
           rescue
             # Copy failed, do nothing
           end

data/lib/tdriver/report/report_test_run.rb

@@ -473,7 +473,7 @@ module TDriverReportCreator
         write_page_start(@report_folder+'/cases/statistics_index.html','Statistics')
         write_page_end(@report_folder+'/cases/statistics_index.html')
       rescue Exception => e
-        Kernel::raise e, "Unable to create report folder", caller
+        Kernel::raise e, "Unable to create report folder: #{@report_folder}", caller
       end
       return nil
     end
@@ -606,7 +606,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=false
       lang_version='-'
       begin
-        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='S60QT'
+        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='Symbian'
           lang_version=sut_attributes[:sut].sysinfo( :Lang_version )
         end
         if MobyUtil::Parameter[sut_id][:type]=='QT'
@@ -637,7 +637,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=false
       sw_version='-'
       begin
-        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='S60QT'
+        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='Symbian'
           sw_version=sut_attributes[:sut].sysinfo( :Sw_version )
         end
         if MobyUtil::Parameter[sut_id][:type]=='QT'
@@ -668,7 +668,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=false
       memory=0
       begin
-        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='S60QT'
+        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='Symbian'
           memory=sut_attributes[:sut].sysinfo( :Get_used_ram )
         end
         if MobyUtil::Parameter[sut_id][:type]=='QT'
@@ -700,7 +700,7 @@ module TDriverReportCreator
       MobyUtil::Logger.instance.enabled=false
       memory=0
       begin
-        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='S60QT'
+        if MobyUtil::Parameter[sut_id][:type]=='S60' || MobyUtil::Parameter[sut_id][:type]=='Symbian'
           memory=sut_attributes[:sut].sysinfo( :Get_total_ram )
         end
         if MobyUtil::Parameter[sut_id][:type]=='QT'

data/lib/tdriver/report/report_test_unit.rb

@@ -1,32 +1,50 @@
 ############################################################################
-## 
-## 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.
+##
 ############################################################################
 
 
 require File.expand_path( File.join( File.dirname( __FILE__ ), 'report' ) )
-#Report module which contains the Cucumber, Test::Unit and RSpec report formatters
-module TDriverReport
+#Report module which contains the Test::Unit report formatter
+def create_global_reporter_hook_for_test_unit()
+   eval("
+    module Test #:nodoc:all
+      module Unit
+        module UI
+          module Console
+            class TestRunner
+              def create_mediator(suite)
+                # swap in TDriver custom mediator
+                return TDriverReportTestUnit::TestUnit.new(suite)
+              end
+            end #TestRunner
+          end #Console
+        end #UI
+      end #Unit
+    end #Test
+      ")
+end
+module TDriverReportTestUnit
   def create_test_unit_formatter()
     eval "
       require 'test/unit'
       require 'test/unit/ui/console/testrunner'
 #class for listening test unit execution process
-    class TestUnit < Test::Unit::UI::TestRunnerMediator       
+    class TestUnit < Test::Unit::UI::TestRunnerMediator
       include TDriverReportCreator
         def initialize(suite, report_mgr = nil)
           super(suite)
@@ -36,13 +54,13 @@ module TDriverReport
           add_listener(Test::Unit::UI::TestRunnerMediator::STARTED, &method(:started))
           add_listener(Test::Unit::TestCase::STARTED, &method(:test_started))
           add_listener(Test::Unit::TestCase::FINISHED, &method(:test_finished))
-          add_listener(Test::Unit::TestResult::FAULT, &method(:fault))          
+          add_listener(Test::Unit::TestResult::FAULT, &method(:fault))
         end
         def get_class_name(full_test_name) #:nodoc:
           begin
             name=full_test_name
             name=name.gsub(/[)]/,'')
-            name_arr=name.split('(')            
+            name_arr=name.split('(')
             return [name_arr[1].gsub(/[:]/,'_'),name_arr[0].gsub(/[:]/,'_')]
           rescue
             return ['Ruby test',full_test_name]
@@ -53,7 +71,7 @@ module TDriverReport
         # === params
         # === returns
         # === raises
-        def started(result)          
+        def started(result)
           start_run()
           add_report_group(@current_suite_name+'|')
         end
@@ -64,7 +82,7 @@ module TDriverReport
         # === raises
         def test_started(name)
           full_name=get_class_name(name)
-          @current_test_name=full_name[1]          
+          @current_test_name=full_name[1]
           add_report_group(@current_suite_name+':'+full_name[0]+'|')
           start_test_case(@current_test_name)
           add_test_case_group(full_name[0])
@@ -90,14 +108,42 @@ module TDriverReport
           capture_screen_test_case()
           update_test_case(fault)
           @tc_result='failed'
-        end        
+        end
     end
     "
-  end      
+  end
+
+  def TDriverReportTestUnit.included(mod)
+
+    create_test_unit_formatter()
+    create_global_reporter_hook_for_test_unit()
+
+  end
+
 end
 
-module MattiReport
+module TDriverReport
   def create_test_unit_formatter()
+    $stderr.puts "Warning: TDriverReport#create_test_unit_formatter() is deprecated please use only \"include TDriverReportTestUnit\" instead of
+    begin
+  include TDriverReport
+  create_test_unit_formatter()
+  end
+  module Test #:nodoc:all
+    module Unit
+      module UI
+        module Console
+          class TestRunner
+            def create_mediator(suite)
+              # swap in TDriver custom mediator
+              return TDriverReport::TestUnit.new(suite)
+            end
+          end
+        end
+      end
+    end
+  end
+    "
     eval "
       require 'test/unit'
       require 'test/unit/ui/console/testrunner'
@@ -173,3 +219,5 @@ module MattiReport
 end
 
 
+
+