dohtest 0.1.7 → 0.1.8

data/lib/doh/test/assertions.rb

@@ -29,7 +29,7 @@ class TestGroup
       if expected.any? { |elem| elem.instance_of?(Module) ? actual_excpt.kind_of?(elem) : elem == actual_class }
         @runner.assertion_passed
       else
-        raise DohTest::Failure.new(msg, :raises, expected, actual_class)
+        raise DohTest::Failure.new(msg, :raises, expected, actual_excpt)
       end
     end
     raise DohTest::Failure.new(msg, :raises, expected, nil) if no_exception

data/lib/doh/test/configure.rb

@@ -8,6 +8,7 @@ end
 
 def self.load_configuration_files(start_path)
   start_directory = File.dirname(start_path)
+  root_directory = Doh::find_root(start_directory)
 
   local_filename = Doh::findup(start_directory, 'configure_dohtest.rb')
   if local_filename && File.exist?(local_filename)
@@ -15,7 +16,6 @@ def self.load_configuration_files(start_path)
     return
   end
 
-  root_directory = Doh::find_root(start_directory)
   if root_directory
     root_filename = File.join(root_directory, 'config', 'dohtest.rb')
     require(root_filename) if File.exist?(root_filename)

data/lib/doh/test/stream_output.rb

@@ -1,15 +1,19 @@
 require 'doh/test/backtrace_parser'
 require 'set'
+require 'term/ansicolor'
 
 module DohTest
 
 class StreamOutput
+  DEFAULT_COLORS = {:failure => :red, :error => :magenta, :info => :blue, :success => :green}.freeze
+
   def initialize
     @error_count = @groups_ran = @groups_skipped = @tests_ran = @tests_skipped = @assertions_failed = @assertions_passed = 0
     @badness = Set.new
   end
 
   def run_begin(config)
+    @config = config
     puts "running tests with config: #{config}"
   end
 
@@ -24,29 +28,43 @@ class StreamOutput
       puts "\n\ncompleted in #{duration.round(2)}s"
     end
 
+    if @error_count == 0
+      error_str = "0 errors"
+    else
+      error_str = colorize(:error, "#@error_count errors")
+    end
+
     if @groups_skipped == 0
-      groups_str = "#@groups_ran groups"
+      group_str = "#@groups_ran groups"
     else
       total_groups = @groups_ran + @groups_skipped
-      groups_str = "#{total_groups} groups: #@groups_ran ran, #@groups_skipped skipped"
+      group_str = "#{total_groups} groups: #@groups_ran ran, #@groups_skipped skipped"
     end
 
     if @tests_skipped == 0
-      tests_str = "#@tests_ran tests"
+      test_str = "#@tests_ran tests"
     else
       total_tests = @tests_ran + @tests_skipped
-      tests_str = "#{total_tests} tests: #@tests_ran ran, #@tests_skipped skipped"
+      test_str = "#{total_tests} tests: #@tests_ran ran, #@tests_skipped skipped"
     end
 
-    if @assertions_failed == 0
-      assertions_str = "all #{total_assertions} assertions passed"
+    if total_assertions == 0
+      assertion_str = colorize(:info, "no assertions run")
+    elsif @assertions_failed == 0
+      assertion_str = "all #{total_assertions} assertions passed"
     else
-      assertions_str = "#{total_assertions} assertions: #@assertions_passed passed, #@assertions_failed failed"
+      failed_str = colorize(:failure, "#@assertions_failed failed")
+      assertion_str = "#{total_assertions} assertions: #@assertions_passed passed, #{failed_str}"
     end
-    puts "#@error_count errors; #{groups_str}; #{tests_str}; #{assertions_str}"
+
+    success = (total_assertions > 0) && (@error_count == 0) && (@assertions_failed == 0)
+
+    msg = "#{error_str}; #{group_str}; #{test_str}; #{assertion_str}"
+    msg = colorize(:success, msg) if success
+    puts msg
 
     # this is to generate an exit code; true translates to 0, false to 1
-    @error_count == 0 && @assertions_failed == 0
+    success
   end
 
   def group_begin(group_name)
@@ -55,7 +73,11 @@ class StreamOutput
   def group_end(group_name, tests_ran, tests_skipped, assertions_passed, assertions_failed)
     @tests_skipped += tests_skipped
     if tests_ran == 0
-      @groups_skipped += 1
+      if tests_skipped > 0
+        @groups_skipped += 1
+      else
+        puts colorize(:info, "no tests defined in #{group_name}")
+      end
       return
     end
     @groups_ran += 1
@@ -89,59 +111,63 @@ class StreamOutput
   end
 
 private
+  def colorize(type, msg)
+    color = @config["#{type}_color".to_sym] || DEFAULT_COLORS[type]
+    "#{Term::ANSIColor.send(color)}#{Term::ANSIColor.bold}#{msg}#{Term::ANSIColor.clear}"
+  end
+
   def display_badness(group_name, test_name, excpt)
     badness_type = if excpt.is_a?(DohTest::Failure) then :failure else :error end
     parser = DohTest::BacktraceParser.new(excpt.backtrace)
-    warn "#{badness_type} in #{group_name}.#{test_name}"
+    warn colorize(badness_type, "#{badness_type} in #{group_name}.#{test_name} at:")
+    parser.relevant_stack.each do |path, line|
+      warn "#{path}:#{line}"
+    end
     if badness_type == :error
-      warn "#{excpt.class}: #{excpt}"
+      warn colorize(:info, "#{excpt.class}: #{excpt.message}")
     else
       display_failure_message(excpt)
     end
-    parser.relevant_stack.each do |path, line|
-      warn "#{path}:#{line}"
-    end
   end
 
   def display_failure_message(failure)
     if failure.message.empty?
-      warn send("display_#{failure.assert}_failure", failure)
+      send("display_#{failure.assert}_failure", failure)
     else
-      warn failure.message
+      warn colorize(:info, failure.message)
     end
   end
 
   def display_boolean_failure(failure)
-    "assertion failed"
+    warn colorize(:info, "assertion failed")
   end
 
   def display_equal_failure(failure)
-    if (failure.expected.to_s.size + failure.actual.to_s.size) < 50
-      "expected: #{failure.expected}; actual: #{failure.actual}"
-    else
-      "\nexpected: #{failure.expected}\n  actual: #{failure.actual}"
-    end
+    warn colorize(:info, "expected: #{failure.expected}\n  actual: #{failure.actual}")
   end
 
   def display_raises_failure(failure)
     if failure.actual
       expected_str = if (failure.expected.size == 1) then failure.expected.first else "one of #{failure.expected.join(',')}" end
-      "expected: #{expected_str}; actual: #{failure.actual.class}: #{failure.actual.message}"
+      warn colorize(:info, "expected: #{expected_str}; actual: #{failure.actual.class}: #{failure.actual.message}")
+      DohTest::BacktraceParser.new(failure.actual.backtrace).relevant_stack.each do |path, line|
+        warn "#{path}:#{line}"
+      end
     else
-      "expected: #{failure.expected}, but no exception was raised"
+      warn colorize(:info, "expected: #{failure.expected}, but no exception was raised")
     end
   end
 
   def display_instance_of_failure(failure)
-    "expected class: #{failure.expected}; actual: #{failure.actual}"
+    warn colorize(:info, "expected class: #{failure.expected}; actual: #{failure.actual}")
   end
 
   def display_match_failure(failure)
-    "expected regex #{failure.expected} to match str: #{failure.actual}"
+    warn colorize(:info, "expected regex #{failure.expected} to match str: #{failure.actual}")
   end
 
   def display_not_equal_failure(failure)
-    "expected unequal values; both are: #{failure.expected}"
+    warn colorize(:info, "expected unequal values; both are: #{failure.expected}")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot
-  requirement: &70349766447240 !ruby/object:Gem::Requirement
+  requirement: &70097974424660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,18 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70349766447240
+  version_requirements: *70097974424660
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &70097974424000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *70097974424000
 description: Minimalist unit test framework, easy to understand and extend.
 email:
 - devinfo@atpsoft.com