tapout 0.3.2 → 0.4.0

data/lib/tapout/reporters/breakdown_reporter.rb

@@ -1,6 +1,6 @@
 require 'tapout/reporters/abstract'
 
-module TapOut
+module Tapout
 
   module Reporters
 
@@ -15,8 +15,9 @@ module TapOut
       end
 
       def start_suite(entry)
-        headers = [ 'TESTCASE', 'TESTS', 'PASS', 'FAIL', 'ERR', 'SKIP' ]
-        puts "\n%-20s       %8s %8s %8s %8s %8s\n" % headers
+        headers = [ 'TESTCASE', 'TESTS', 'PASS', 'FAIL', 'ERROR', 'TODO', 'OMIT' ]
+        puts "\n%-20s       %8s %8s %8s %8s %8s %8s\n" % headers
+        puts ("-" * 80)
       end
 
       def start_case(entry)
@@ -34,89 +35,80 @@ module TapOut
         groups = @case_entries.group_by{ |e| e['status'] }
 
         total = @case_entries.size
-        sums  = %w{pass fail error pending}.map{ |n| groups[n] ? groups[n].size : 0 }
+        sums  = %w{pass fail error todo omit}.map{ |n| groups[n] ? groups[n].size : 0 }
 
         result = sums[1] + sums[2] > 0 ? "FAIL".ansi(:red) : "PASS".ansi(:green)
 
-        puts "%-20s      %8s %8s %8s %8s %8s    [%s]" % ([label, total] + sums + [result])
+        puts "%-20s      %8s %8s %8s %8s %8s %8s    [%s]" % ([label, total] + sums + [result])
       end
 
       #
       def finish_suite(entry)
-        #@pbar.finish
         post_report(entry)
       end
 
       #
       def post_report(entry)
 
-        sums = %w{pass fail error todo}.map{ |n| entry['counts'][n] || 0 }
-
-        puts ("-" * 80)
+        sums = count_tally(entry) #%w{pass fail error todo}.map{ |n| entry['counts'][n] || 0 }
 
         tally_line = "%-20s      " % "TOTAL"
-        tally_line << "%8s %8s %8s %8s %8s" % [entry['count'], *sums]
+        tally_line << "%8s %8s %8s %8s %8s %8s" % sums
 
+        puts ("-" * 80)
         puts(tally_line + "\n")
 
-=begin
-        tally = test_tally(entry)
+        index = 1
 
-        width = suite.collect{ |tr| tr.name.size }.max
-
-        headers = [ 'TESTCASE  ', '  TESTS   ', 'ASSERTIONS', ' FAILURES ', '  ERRORS   ' ]
-        io.puts "\n%-#{width}s       %10s %10s %10s %10s\n" % headers
-
-        files = nil
-
-        suite.each do |testrun|
-          if testrun.files != [testrun.name] && testrun.files != files
-            label = testrun.files.join(' ')
-            label = Colorize.magenta(label)
-            io.puts(label + "\n")
-            files = testrun.files
+        unless @failed.empty?
+          puts
+          @failed.each do |test|
+            printout(test, index, *config.fail)
+            index += 1
           end
-          io.puts paint_line(testrun, width)
+          puts
         end
 
-        #puts("\n%i tests, %i assertions, %i failures, %i errors\n\n" % tally)
-
-        tally_line = "-----\n"
-        tally_line << "%-#{width}s  " % "TOTAL"
-        tally_line << "%10s %10s %10s %10s" % tally
-
-        io.puts(tally_line + "\n")
-=end
-
-        bad = @failed + @raised
-
-        #fails = suite.select do |testrun|
-        #  testrun.fail? || testrun.error?
-        #end
-
-        #if tally[2] != 0 or tally[3] != 0
-          unless bad.empty? # or verbose?
-            #puts "\n-- Failures and Errors --\n"
-            puts
-            bad.each do |e|
-              x = e['exception']
-              message = [x['class'],x['message']].compact.join(': ').strip
-              message = message.ansi(:red)
-              puts(message)
-              puts "#{x['file']}:#{x['line']}"
-              puts
-              puts code_snippet(x)
-            end
-            puts
+        unless @raised.empty?
+          puts
+          @raised.each do |test|
+            printout(test, index, *config.fail)
+            index += 1
           end
-        #end
+          puts
+        end
 
+        time, rate, avg = time_tally(entry)
+
+        puts "Finished in %.4fs at %.2f tests/s." % [time, rate, avg]
+        puts
         puts tally_message(entry)
       end
 
+    private
+
+      def printout(test, index, *ansi)
+        x = test['exception']
+
+        label   = test['label'].to_s
+        exclass = test['exception']['class']
+        message = test['exception']['message']
+
+        exclass = nil if exclass.to_s.strip.empty?
+        message = nil if message.to_s.strip.empty?
+
+        print "#{index}. "
+        print label.ansi(*config.highlight)
+        print " " + exclass.ansi(*ansi) if exclass
+        puts
+        puts message.tabto(4) if message
+        puts backtrace_snippets(test).tabto(4)
+        puts captured_output(test).tabto(4)
+        puts
+      end
+
     end
 
   end
 
 end
-

data/lib/tapout/reporters/dot_reporter.rb

@@ -1,34 +1,36 @@
 require 'tapout/reporters/abstract'
 
-module TapOut::Reporters
+module Tapout::Reporters
 
   # Traditional dot progress reporter.
   #
   class DotReporter < Abstract
 
     #
-    def start_suite(entry)
-      @start_time = Time.now
-      $stdout.puts "Started\n"
+    def start_suite(suite)
+      print "Started"
+      print " w/ Seed: #{suite['seed']}" if suite['seed']
+      puts
+      super(suite)
     end
 
     #
     def pass(entry)
-      $stdout.print '.'.ansi(:green)
+      $stdout.print '.'.ansi(*config.pass)
       $stdout.flush
       super(entry)
     end
 
     #
     def fail(entry)
-      $stdout.print 'F'.ansi(:red)
+      $stdout.print 'F'.ansi(*config.fail)
       $stdout.flush
       super(entry)
     end
 
     #
     def error(entry)
-      $stdout.print 'E'.ansi(:yellow)
+      $stdout.print 'E'.ansi(*config.error)
       $stdout.flush
       super(entry)
     end
@@ -39,38 +41,55 @@ module TapOut::Reporters
 
       i = 1
 
-      @failed.each do |e|
-        backtrace = clean_backtrace(e['exception']['backtrace'])
-        depth     = TapOut.trace || backtrace.size
-
-        $stdout.puts "#{i}. " + (e['label']).ansi(:red)
-        $stdout.puts
-        $stdout.puts "    #{e['exception']['class']}" if e['exception']['class']
-        $stdout.puts e['exception']['message'].to_s.tabto(4)
-        $stdout.puts "    #{e['exception']['file']}:#{e['exception']['line']}" #+ backtrace[0]
-        $stdout.puts code_snippet(e['exception'])
-        $stdout.puts backtrace[0,depth].join("\n").tabto(4)
-        $stdout.puts
+      @failed.each do |test|
+        label     = test['label'].to_s
+        snippets  = backtrace_snippets(test)
+        errclass  = test['exception']['class']
+        message   = test['exception']['message']
+        capture   = captured_output(test)
+ 
+        parts = [errclass, message, snippets, capture].compact.map{ |e| e.strip }.reject{ |e| e.empty? }
+
+        puts "#{i}. " + "FAIL".ansi(*config.error) + " " + label.ansi(*config.fail)
+        puts
+        puts parts.join("\n\n").tabto(4)
+        puts
+
         i += 1
       end
 
-      @raised.each do |e|
-        backtrace = clean_backtrace(e['exception']['backtrace'])
-        depth     = TapOut.trace || backtrace.size
-
-        $stdout.puts "#{i}. " + (e['label']).ansi(:yellow)
-        $stdout.puts
-        $stdout.puts "    #{e['exception']['class']}" if e['exception']['class']
-        $stdout.puts "    #{e['exception']['message']}"
-        $stdout.puts "    #{e['exception']['file']}:#{e['exception']['line']}" #+ backtrace[0..2].join("    \n")
-        $stdout.puts code_snippet(e['exception'])
-        $stdout.puts backtrace[0,depth].join("\n").tabto(4)
-        $stdout.puts
+      @raised.each do |test|
+        label     = test['label'].to_s
+        snippets  = backtrace_snippets(test)
+        errclass  = test['exception']['class']
+        message   = test['exception']['message']
+        capture   = captured_output(test)
+ 
+        parts = [errclass, message, snippets, capture].compact.map{ |e| e.strip }.reject{ |e| e.empty? }
+
+        puts "#{i}. " + "ERROR".ansi(*config.error) + " " + label.ansi(*config.highlight)
+        puts
+        puts parts.join("\n\n").tabto(4)
+        puts
+
         i += 1
       end
 
-      $stdout.puts "Finished in #{Time.now - @start_time}s"
-      $stdout.puts tally_message(entry)
+      time, rate, avg = time_tally(entry)
+
+      total, pass, fail, error, todo, omit = count_tally(entry)
+
+      #total = @passed.size + @failed.size + @raised.size + @skipped.size + @omitted.size
+      #total = entry['counts']['total'] || total
+
+      #time = (entry['time'] || (Time.now - @start_time)).to_f
+      #avg  = time / total
+      #rate = total / time
+
+      puts
+      puts "Finished in %.3fs (%.3f test/s, %.6fs avg.)" % [time, rate, avg]
+      puts
+      puts "%s tests: %s pass, %s fail, %s exit, %s todo, %s omit" % [total, pass, fail, error, todo, omit]
     end
 
   end

data/lib/tapout/reporters/html_reporter.rb

@@ -1,6 +1,6 @@
 require 'tapout/reporters/abstract'
 
-module TapOut::Reporters
+module Tapout::Reporters
 
   # HTML Test Reporter
   #
@@ -78,6 +78,7 @@ module TapOut::Reporters
       puts clean_backtrace(e['backtrace']).join("\n")
       puts "</pre>"
       puts %[</li>]
+      # TODO: Add captured_stdout and _stderr
     end
 
     #
@@ -91,6 +92,7 @@ module TapOut::Reporters
       puts clean_backtrace(e['backtrace']).join("\n")
       puts "</pre>"
       puts %[</li>]
+      # TODO: Add captured_stdout and _stderr
     end
 
     #

data/lib/tapout/reporters/markdown_reporter.rb

@@ -0,0 +1,101 @@
+require 'tapout/reporters/abstract'
+
+module Tapout::Reporters
+
+  # Markdown reporter.
+  #
+  class Markdown < Abstract
+
+    #
+    def start_suite(entry)
+      @start_time = Time.now
+    end
+
+    #
+    def mark
+      ('#' * (@_level + 1)) + ' '
+    end
+
+    #
+    def start_case(entry)
+      @_level = entry['level'].to_i + 1
+      $stdout.print('#' * @_level + ' ')
+      $stdout.puts(entry['label'])
+    end
+
+    #
+    def pass(entry)
+      super(entry)
+      $stdout.puts "#{mark}" + entry['label'] + "   #{entry['source']}"
+    end
+
+    #
+    def fail(entry)
+      super(entry)
+
+      $stdout.puts "#{mark}" + entry['label'] + "   #{entry['source']}"
+
+      $stdout.puts "\n**MESSAGE**\n\n"
+      $stdout.puts entry['exception']['message'].tabto(4)
+
+      $stdout.puts "\n**TYPE**\n\n"
+      $stdout.puts entry['exception']['class'].tabto(4)
+
+      #$stdout.puts "    " + ok.caller #clean_backtrace(exception.backtrace)[0]
+
+      $stdout.puts "\n**SNIPPET**\n\n"
+      $stdout.puts code_snippet(entry['exception'])
+
+      if captured_stdout?(entry)
+        $stdout.puts "\n**STDOUT**\n\n"
+        $stdout.puts captured_stdout(entry).tabto(4)
+      end
+
+      if captured_stderr?(entry)
+        $stdout.puts "\n**STDERR**\n\n"
+        $stdout.puts captured_stderr(entry).tabto(4)
+      end
+
+      $stdout.puts
+    end
+
+    #
+    def error(entry)
+      super(entry)
+
+      $stdout.puts "#{mark}" + entry['label'] + "   #{entry['source']}"
+
+      $stdout.puts "\n**MESSAGE**\n\n"
+      $stdout.puts entry['exception']['message'].tabto(4)
+
+      $stdout.puts "\n**TYPE**\n\n"
+      $stdout.puts entry['exception']['class'].tabto(4)
+
+      #$stdout.puts "    " + ok.caller #clean_backtrace(exception.backtrace)[0..2].join("    \n")
+
+      $stdout.puts "\n**SNIPPET**\n\n"
+      $stdout.puts code_snippet(entry['exception'])
+
+      if captured_stdout?(entry)
+        $stdout.puts "\n**STDOUT**\n\n"
+        $stdout.puts captured_stdout(entry).tabto(4)
+      end
+
+      if captured_stderr?(entry)
+        $stdout.puts "\n**STDERR**\n\n"
+        $stdout.puts captured_stderr(entry).tabto(4)
+      end
+
+      $stdout.puts
+    end
+
+    #
+    def finish_suite(entry)
+      #$stderr.puts
+      $stderr.print tally_message(entry)
+      $stderr.puts " [%0.4fs] " % [Time.now - @start_time]
+    end
+
+  end
+
+end

data/lib/tapout/reporters/outline_reporter.rb

@@ -1,61 +1,104 @@
 require 'tapout/reporters/abstract'
 
-module TapOut::Reporters
+module Tapout::Reporters
 
   # Outline reporter.
   #
-  # TODO: This is still a work in progress.
+  # TODO: Not sure there is really any good point to this reporter.
   #
   class Outline < Abstract
 
     #
     def start_suite(entry)
+      @_case_count = [0]
       @start_time = Time.now
     end
 
     #
     def start_case(entry)
-      $stdout.puts entry['label'].ansi(:bold)
+      @_test_count = 0
+      @_level = entry['level'].to_i
+
+      print(' ' * (level_tab - 2))
+      puts(case_count(entry) + '. ' + entry['label'].ansi(*config.highlight))
+      #puts
+    end
+
+    #
+    def level_tab
+      2 * (@_level + 1)
+    end
+
+    #
+    def case_count(entry)
+      level = entry['level'].to_i
+      @_case_count = @_case_count[0,level+1]
+      @_case_count[level] ||= 0
+      @_case_count[level] += 1
+      @_case_count.join('.') #+ '.'
+      @_case_count[level].to_s
+    end
+
+    #
+    def start_test(test)
+      @_test_count += 1
+    end
+
+    #
+    def test_count
+      @_test_count
     end
 
+    #
     def pass(entry)
       super(entry)
-      $stdout.puts "* " + entry['label'].ansi(:green) + "   #{entry['source']}"
+      print(' ' * level_tab)
+      puts "#{test_count}. " + entry['label'].ansi(:green) + "   #{entry['source']}"
     end
 
     def fail(entry)
       super(entry)
 
-      msg = entry['exception'].values_at('class', 'message').compact.join(' - ')
-
-      $stdout.puts "* " + entry['label'].ansi(:red) + "   #{entry['source']}"
-      $stdout.puts
-      $stdout.puts "    #{msg}"
-      #$stdout.puts "    " + ok.caller #clean_backtrace(exception.backtrace)[0]
-      $stdout.puts
-      $stdout.puts code_snippet(entry['exception'])
-      $stdout.puts
+      printout(entry, 'FAIL', config.fail)
     end
 
     def error(entry)
       super(entry)
 
-      msg = entry['exception'].values_at('class', 'message').compact.join(' - ')
-
-      $stdout.puts "* " + entry['label'].ansi(:yellow) + "   #{entry['source']}"
-      $stdout.puts
-      $stdout.puts "    #{msg}"
-      #$stdout.puts "    " + ok.caller #clean_backtrace(exception.backtrace)[0..2].join("    \n")
-      $stdout.puts
-      $stdout.puts code_snippet(entry['exception'])
-      $stdout.puts
+      printout(entry, 'ERROR', config.error)
     end
 
     #
     def finish_suite(entry)
-      #$stderr.puts
-      $stdout.print tally_message(entry)
-      $stdout.puts " [%0.4fs] " % [Time.now - @start_time]
+      time, rate, avg = time_tally(entry)
+      delta = duration(time)
+
+      puts
+      print tally_message(entry)
+      #puts " [%0.4fs %.4ft/s %.4fs/t] " % [time, rate, avg]
+      puts " [%s %.2ft/s %.4fs/t] " % [delta, rate, avg]
+    end
+
+  private
+
+    #
+    def printout(entry, type, ansi)
+      counter = "#{test_count}. "
+
+      label   = entry['label'].ansi(*ansi)
+      message = entry['exception']['message']
+      exclass = entry['exception']['class']
+
+      parts = [message, exclass].compact.reject{ |x| x.strip.empty? }
+
+      print(' ' * level_tab)
+      puts counter + label + "   #{entry['source']}"
+      puts
+      puts parts.join("\n\n").tabto(level_tab+counter.size)
+      puts
+      puts backtrace_snippets(entry).tabto(level_tab++counter.size+4)
+      print captured_output(entry).tabto(level_tab+counter.size)
+      puts
     end
 
   end