dohtest 0.1.4 → 0.1.5

data/lib/doh/test/group_runner.rb

@@ -8,6 +8,10 @@ class GroupRunner
     @config = config || {}
     @group_name = @group_class.to_s
     @group_failed = false
+    @tests_ran = 0
+    @tests_skipped = 0
+    @assertions_passed = 0
+    @assertions_failed = 0
   end
 
   def run
@@ -16,7 +20,7 @@ class GroupRunner
     run_before_all unless @group_failed
     run_tests unless @group_failed
     run_after_all unless @group_failed
-    @output.group_end(@group_name)
+    @output.group_end(@group_name, @tests_ran, @tests_skipped, @assertions_passed, @assertions_failed)
   end
 
   def create_group
@@ -52,9 +56,11 @@ class GroupRunner
         @group.send(:before_each) if has_before_each
         @output.test_begin(@group_name, @test_name)
         @group.send(@test_name)
+        @tests_ran += 1
         @output.test_end(@group_name, @test_name)
         @group.send(:after_each) if has_after_each
       rescue DohTest::AssertionFailed => failure
+        @assertions_failed += 1
         @output.assertion_failed(@group_name, @test_name, failure)
       rescue => error
         @output.test_error(@group_name, @test_name, error)
@@ -64,14 +70,15 @@ class GroupRunner
 
   def determine_test_methods
     @test_methods = @group_class.public_instance_methods.grep(/^test/)
-    original_test_count = @test_methods.size
     return unless @config.key?(:grep)
+    original_test_count = @test_methods.size
     grep_filter = Regexp.new(@config[:grep])
-    @test_methods.select! { |method| name.to_s =~ grep_filter }
-    @output.tests_skipped(@group_name, original_test_count - @test_methods.size)
+    @test_methods.select! { |method| method.to_s =~ grep_filter }
+    @tests_skipped = original_test_count - @test_methods.size
   end
 
   def assertion_passed
+    @assertions_passed += 1
     @output.assertion_passed(@group_name, @test_name)
   end
 end

data/lib/doh/test/master_runner.rb

@@ -9,11 +9,12 @@ class MasterRunner
   end
 
   def run
+    start_time = Time.now
     DohTest::require_paths(@config[:glob], @paths)
     srand(@config[:seed])
     @output.run_begin(@config)
     TestGroup.descendants.each { |group_class| GroupRunner.new(group_class, @output, @config).run }
-    @output.run_end
+    @output.run_end(Time.now - start_time)
   end
 end
 

data/lib/doh/test/stream_output.rb

@@ -5,7 +5,7 @@ module DohTest
 
 class StreamOutput
   def initialize
-    @error_count = @group_cnt = @tests_ran = @tests_skipped = @assertions_failed = @assertions_passed = 0
+    @error_count = @groups_ran = @groups_skipped = @tests_ran = @tests_skipped = @assertions_failed = @assertions_passed = 0
     @badness = Set.new
   end
 
@@ -13,24 +13,56 @@ class StreamOutput
     puts "running tests with config: #{config}"
   end
 
-  def run_end
+  def run_end(duration)
     total_assertions = @assertions_passed + @assertions_failed
-    puts "\n\n#@error_count errors, #@group_cnt groups, #@tests_ran tests, #{@tests_skipped} skipped, #{total_assertions} assertions, #@assertions_passed passed, #@assertions_failed failed"
-    puts "completed in 0.043702s, 22.8822 tests/s, 45.7645 assertions/s <TODO: put real values here>"
+
+    if duration >= 1
+      tests_per_second = (@tests_ran / duration).round(2)
+      assertions_per_second = (total_assertions / duration).round(2)
+      puts "\n\ncompleted in #{duration.round(2)}s, #{tests_per_second} tests/s, #{assertions_per_second} assertions/s"
+    else
+      puts "\n\ncompleted in #{duration.round(2)}s"
+    end
+
+    if @groups_skipped == 0
+      groups_str = "#@groups_ran groups"
+    else
+      total_groups = @groups_ran + @groups_skipped
+      groups_str = "#{total_groups} groups: #@groups_ran ran, #@groups_skipped skipped"
+    end
+
+    if @tests_skipped == 0
+      tests_str = "#@tests_ran tests"
+    else
+      total_tests = @tests_ran + @tests_skipped
+      tests_str = "#{total_tests} tests: #@tests_ran ran, #@tests_skipped skipped"
+    end
+
+    if @assertions_failed == 0
+      assertions_str = "all #{total_assertions} assertions passed"
+    else
+      assertions_str = "#{total_assertions} assertions: #@assertions_passed passed, #@assertions_failed failed"
+    end
+    puts "#@error_count errors; #{groups_str}; #{tests_str}; #{assertions_str}"
+
     # this is to generate an exit code; true translates to 0, false to 1
     @error_count == 0 && @assertions_failed == 0
   end
 
   def group_begin(group_name)
-    @group_cnt += 1
   end
 
-  def group_end(group_name)
-    puts "success in #{group_name}" unless @badness.include?(group_name)
-  end
-
-  def tests_skipped(group_name, count)
-    @tests_skipped += count
+  def group_end(group_name, tests_ran, tests_skipped, assertions_passed, assertions_failed)
+    @tests_skipped += tests_skipped
+    if tests_ran == 0
+      @groups_skipped += 1
+      return
+    end
+    @groups_ran += 1
+    total_tests = tests_ran + tests_skipped
+    total_assertions = assertions_passed + assertions_failed
+    skipped_str = if tests_skipped > 0 then ": #{tests_ran} ran, #{tests_skipped} skipped" else '' end
+    puts "success in #{group_name}: #{total_tests} tests#{skipped_str}; #{total_assertions} assertions" unless @badness.include?(group_name)
   end
 
   def test_begin(group_name, test_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70165913339980 !ruby/object:Gem::Requirement
+  requirement: &70361929847060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70165913339980
+  version_requirements: *70361929847060
 description: Minimalist unit test framework, easy to understand and extend.
 email:
 - devinfo@atpsoft.com