testability-driver 1.0.3 → 1.0.4

data/lib/tdriver/report/report_writer.rb

@@ -18,7 +18,6 @@
 ############################################################################
 
 include TDriverReportJavascript
-
 module TDriverReportWriter
 
   def write_style_sheet(page)
@@ -327,11 +326,10 @@ a:hover { color:White; background-color:#005B9A;}
 }
 #statistics_table th
 {
-	font-size: 13px;
-	font-weight: normal;
 	padding: 8px;
-	background: #b9c9fe;
-	color: #039;
+	border-bottom: 1px solid Black;
+	color: #669;
+	border-top: 1px solid transparent;
 }
 #statistics_table td
 {
@@ -411,7 +409,7 @@ FORM { DISPLAY:inline; }
 
 html.isJS .togList dd
 {
-display: none;
+display: block;
 }
     input.btn {
 	  color:#050;
@@ -438,9 +436,9 @@ display: none;
     File.open(page, 'w') {|f| f.write(css) }
     css=nil
   end
+
   def format_duration(seconds)
-    if Gem.available?('chronic_duration')
-      require 'chronic_duration'
+    if Gem.available?('chronic_duration')      
       duration_str=ChronicDuration.output(seconds)
     else
       m, s = seconds.divmod(60)
@@ -448,6 +446,64 @@ display: none;
     end
     duration_str
   end
+
+  def write_stack_file_to_html(file,page,linen)
+    code=File.read(file)
+    html_code=[]
+    code_line=1
+    code.each do |line|
+      if linen.to_s==code_line.to_s
+        html_code << "<b><a style=\"color: #FF0000\" name=\"#{code_line}\">#{code_line}: #{line.gsub(' ','&nbsp;' )} </a></b><br />"
+      else
+        html_code << "<a name=\"#{code_line}\">#{code_line}: #{line.gsub(' ','&nbsp;' )} </a><br />"
+      end
+      code_line+=1
+    end
+    File.open(page, 'w') do |f2|
+      f2.puts html_code
+    end
+  end
+
+  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}")        
+        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
+        write_stack_file_to_html(file,"#{folder}/stack_files/#{File.basename(file)}.html",linen)
+        FileUtils.copy(file,"#{folder}/stack_files/#{File.basename(file)}")
+      end
+
+    rescue Exception => e
+      puts e.message
+      puts e.backtrace
+    end
+  end
+
+  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\/\.-]+)/]
+        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)
+          link_to_stack='<a style="color: #FF0000" href="stack_files/'<<
+            File.basename(file.to_s)+'.html#'+line.to_s<<
+            '">'+match+'</a>'
+          log_line=log_line.gsub(match,link_to_stack)
+        end
+      end
+    rescue Exception => e
+      puts e.message
+      puts e.backtrace
+    end
+    log_line
+  end
+
   def behaviour_log_summary(log,log_format='string')
     begin
       log_table = Array.new
@@ -566,11 +622,12 @@ display: none;
       '-'
     end
   end
-  def format_execution_log(log)
+  def format_execution_log(log,folder=nil)
     begin
       formatted_log=Array.new
       log.each do |line|
-        if line.include?('test_unit.rb')
+        line=reporter_link_to_code(line,folder)
+        if line.include?('testability-driver')==false
           formatted_log << line.gsub('PASSED','<b style="color: #00FF00">PASSED</b>').gsub('FAILED','<b style="color: #FF0000">FAILED</b>').gsub('SKIPPED','<b>SKIPPED</b>')
         else
           formatted_log << "<b style=\"color: #2554C7\">#{line}</b>".gsub('PASSED','<b style="color: #00FF00">PASSED</b>').gsub('FAILED','<b style="color: #FF0000">FAILED</b>').gsub('SKIPPED','<b>SKIPPED</b>')
@@ -700,7 +757,7 @@ display: none;
       '<td style="font-weight: 700">'<<
       'Details</td>'<<
       '<td style="font-size: small; font-weight: bold">'<<
-      format_execution_log(@test_case_execution_log)<<
+      format_execution_log(@test_case_execution_log,folder.to_s)<<
       '</td></tr>'
 
     if File::directory?(folder.to_s+'/crash_files')==true
@@ -786,7 +843,7 @@ display: none;
     if @test_case_behaviour_log.length > 0
       html_body=html_body<<
         '<dl class="togList">'<<
-        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b style="font-size: large"><span><input id="Button1" type="button" value="Open" class="btn" /></span> Behaviours</b></dt>'<<
+        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b style="font-size: large"><span><input id="Button1" type="button" value="Close" class="btn" /></span> Behaviours</b></dt>'<<
         '<dd style="font-size: small">'<<
         format_behaviour_log(@test_case_behaviour_log)<<
         '</dd>'<<
@@ -795,7 +852,7 @@ display: none;
     if @test_case_user_data!=nil && !@test_case_user_data.empty?
       html_body=html_body<<
         '<dl class="togList">'<<
-        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b style="font-size: large"><span><input id="Button1" type="button" value="Open" class="btn" /></span> User Data</b></dt>'<<
+        '<dt onclick="tog(this)" style="background-color: #CCCCCC;"><b style="font-size: large"><span><input id="Button1" type="button" value="Close" class="btn" /></span> User Data</b></dt>'<<
         '<dd style="font-size: small">'<<
         format_user_log_table( @test_case_user_data,@test_case_user_data_columns)<<
         '</dd>'<<

data/lib/tdriver/tdriver.rb

@@ -34,8 +34,16 @@ $KCODE = 'u'
 # prevent Object#id Warnings
 Object.send( :undef_method, :id ) if Object.respond_to?( :id )
 
+# TODO: document me
+def require_relative( file )
+
+  # require with full expanded path
+  require File.expand_path( File.join( File.dirname( caller.first.scan( /(.*?):/ ).to_s ), file ) )
+
+end
+
 # load all required components
-require File.expand_path( File.join( File.dirname( __FILE__ ), 'loader' ) )
+require File.expand_path( File.join( File.dirname( __FILE__ ), 'loader.rb' ) )
 
 module TDriver
 
@@ -102,30 +110,31 @@ module TDriver
 	# Wrapper for MobyUtil::Parameter.configured_suts to retrieve all configured sut names
 	def self.suts
 
-		MobyUtil::Parameter.configured_suts
+		$parameters.configured_suts
 
 	end
 
 	# Wrapper for MobyUtil::ParameterUserAPI class with methods e.g. [] and []=, files and load_xml etc.
 	def self.parameter
 
-		@matti_parameter_instance || ( @matti_parameter_instance = MobyUtil::ParameterUserAPI.instance )
-
+    $parameters_api
+    
 	end
 
+	# Wrapper for MobyUtil::Logger class
 	def self.logger
 
-		@tdriver_logger_instance || ( @tdriver_logger_instance = MobyUtil::Logger.instance )
-
+    $logger
+    
 	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 # TDriver
 
 # enable logging engine
-MobyUtil::Logger.instance.enable_logging()
+$logger.enable_logging
 
 # initialization done, everything is ready
 $TDRIVER_INITIALIZED = true

data/lib/tdriver/util/common/array.rb

@@ -32,7 +32,7 @@ module MobyUtil
     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 # ArrayHelper
 

data/lib/tdriver/util/common/crc16.rb

@@ -93,7 +93,7 @@ module CRC
     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 # Crc16
 

data/lib/tdriver/util/common/environment.rb

@@ -146,7 +146,7 @@ module MobyUtil
     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 # EnvironmentHelper
 

data/lib/tdriver/util/common/file.rb

@@ -17,7 +17,7 @@
 ## 
 ############################################################################
 
-require 'ftools'
+require "fileutils" unless defined?( ::FileUtils )
 
 module MobyUtil
 
@@ -49,7 +49,12 @@ module MobyUtil
 
       # deterimine caller methods working folder
       source_path = File.dirname( MobyUtil::KernelHelper.parse_caller( caller(3).first ).first )
-
+      
+      # Compatiblity for Ruby 1.9.2 caller format
+      if source_path == "." || source_path[0].to_s == "<" 
+        source_path = File.dirname( MobyUtil::KernelHelper.parse_caller( caller(2).first ).first )      
+      end
+      
       path.each{ | path |
 
         # expand path if given path is relative path
@@ -60,7 +65,7 @@ module MobyUtil
 
         require_files = Dir.glob( MobyUtil::FileHelper.fix_path( path ) )
 
-        Kernel::raise RuntimeError.new( "File not found %s" % [ path ] ) if !File.directory?( path ) && !File.file?( path ) && require_files.empty?
+        Kernel::raise RuntimeError, "File not found #{ path }" if !File.directory?( path ) && !File.file?( path ) && require_files.empty?
 
         # load each module found from given folder
         require_files.each { | module_name | 
@@ -94,7 +99,7 @@ module MobyUtil
     # == params
     # == returns
     # String:: String presentation of TDriver home directory
-    def self.tdriver_home()
+    def self.tdriver_home
 
       File.expand_path(
         MobyUtil::FileHelper.fix_path( 
@@ -150,7 +155,7 @@ module MobyUtil
 
       _file_path = MobyUtil::FileHelper.fix_path( _file_path )
 
-      MobyUtil::FileHelper.is_relative_path?( _file_path ) ? File.join( MobyUtil::FileHelper.tdriver_home, _file_path ) : _file_path
+      File.expand_path( MobyUtil::FileHelper.is_relative_path?( _file_path ) ? File.join( MobyUtil::FileHelper.tdriver_home, _file_path ) : _file_path )
 
     end
 
@@ -165,8 +170,12 @@ module MobyUtil
     # ParameterFileParseError:: If parsing failes
     def self.get_file( file_path )
 
+      #p __method__, file_path, caller
+
+      #file_path.check_type( String, "wrong argument type $1 for get_file method (expected $2)")
+
       # raise exception if file name is empty or nil
-      Kernel::raise EmptyFilenameError.new( "File name is empty or not defined" ) if file_path.nil? || file_path.to_s.empty?
+      Kernel::raise EmptyFilenameError, "File name is empty or not defined" if file_path.nil? || file_path.to_s.empty?
 
       # raise exception if file name is file_path variable format other than string
       Kernel::raise UnexpectedVariableTypeError.new( "Invalid filename format %s (Expected: %s)" % [ file_path.class, "String"] )  if !file_path.kind_of?( String )
@@ -281,11 +290,11 @@ module MobyUtil
 
         Kernel::raise RuntimeError.new( "Unable to copy %s to %s due to source file does not exist" % [ source, destination ] ) unless File.exist?( source )
 
-        File.copy( 
+        ::FileUtils.copy( 
 
           MobyUtil::FileHelper.fix_path( source ), 
           destination, 
-          verbose
+          :verbose => verbose
 
         ) unless ( !overwrite && File.exist?( destination ) )
       
@@ -314,7 +323,7 @@ module MobyUtil
     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 # FileHelper
 

data/lib/tdriver/util/common/gem.rb

@@ -102,7 +102,7 @@ module MobyUtil
     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 # GemHelper
 

data/lib/tdriver/util/common/hash.rb

@@ -97,6 +97,27 @@ class Hash
   
   end
 
+  # remove keys from hash, return hash of deleted keys as result
+  def delete_keys!( *keys )
+
+    deleted_keys = []
+
+    Hash[ keys.flatten.collect{ | key | [ key, delete( key ) ] if has_key?( key ) }.compact ]
+    
+  end
+  
+  # delete multiple keys from hash, does not modify original hash
+  def delete_keys( *keys )
+  
+    # create a duplicate of current hash
+    result = dup
+
+    keys.flatten.each{ | key | result.delete( key ) }
+    
+    result
+
+  end
+
   # store keys and values to hash if not already defined
   def default_values( hash )
 

data/lib/tdriver/util/common/kernel.rb

@@ -197,7 +197,7 @@ module MobyUtil
     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 # KernelHelper
 

data/lib/tdriver/util/common/loader.rb

@@ -36,8 +36,11 @@ require 'rbconfig'  # ??
   'file.rb', 
   'gem.rb', 
   'kernel.rb', 
-  'retryable.rb' ].each{ | filename |
+  'retryable.rb',
+  'stackable.rb' 
 
-  require File.expand_path( File.join( File.dirname( __FILE__ ), filename ) )  
+].each{ | filename |
+
+  require File.expand_path( File.join( File.dirname( __FILE__ ), filename ) )
 
 }

data/lib/tdriver/util/common/numeric.rb

@@ -20,20 +20,71 @@
 # extend Ruby Numeric class functionality
 class Numeric
 
+  # TODO: document me
   def positive?
+
     self > 0
+
   end
-  
+
+  # TODO: document me  
   def non_negative?
+
     self >= 0
+
   end
-  
+
+  # TODO: document me  
   def non_positive?
+
     self <= 0  
+
   end
-  
+
+  # TODO: document me  
   def negative?
+
     self < 0
+
+  end
+
+  # TODO: document me
+  def limit( minimum_value, maximum_value )
+
+    value = self    
+
+    value.min( minimum_value ).max( maximum_value )
+
+  end
+
+  # TODO: document me
+  def max( value )
+
+    if value.kind_of?( Numeric )
+
+      self > value ? value : self
+
+    else
+
+      raise TypeError, 'wrong type %2 for value (expected Numeric)'
+
+    end
+
+  end
+
+  # TODO: document me
+  def min( value )
+
+    if value.kind_of?( Numeric )
+
+      self < value ? value : self
+
+    else
+
+      raise TypeError, 'wrong type %2 for value (expected Numeric)'
+
+    end
+
   end
 
 end