thumblemonks-protest 0.0.4 → 0.0.5

data/lib/protest.rb

@@ -1,8 +1,11 @@
+require 'protest/report'
 require 'protest/context'
 require 'protest/assertion'
 require 'protest/macros'
 
 module Protest
+  #
+  # Initializing logic
   def self.contexts
     @contexts ||= []
   end
@@ -17,40 +20,28 @@ module Protest
     contexts.delete(context)
   end
 
-  def self.run(writer=nil)
-    writer ||= STDOUT
-    start = Time.now
-    failures = @contexts.map { |context| context.run(writer) }.flatten.compact
-    running_time = Time.now - start
-
-    writer.puts "\n\n"
-    counter = 0
-    @contexts.each do |context|
-      context.failures.each do |failure|
-        counter += 1
-        message = ["##{counter} - #{context} asserted #{failure}"]
-        message += failure.backtrace
-        writer.puts message.join("\n") + "\n\n"
-      end
-    end
-    assertions = @contexts.inject(0) { |acc, context| acc + context.assertions.length }
-    writer.puts "#{@contexts.length} contexts, #{assertions} assertions: #{"%0.6f" % running_time} seconds"
+  def self.run(report=nil)
+    report ||= TextReport.new
+    report.start
+    @contexts.each { |context| context.run(report) }
+    report.stop
+    report.results
+    at_exit { exit false unless report.passed? }
   end
 
   #
-  # Failures
+  # Exception
 
   class Failure < Exception
-    def asserted(assertion)
+    attr_reader :assertion
+    def initialize(message, assertion)
+      super(message)
       @assertion = assertion
-      self
     end
-    
-    def to_s; "#{@assertion}: #{super}"; end
   end
   class Error < Failure
-    def initialize(message, e)
-      super(message)
+    def initialize(message, assertion, e)
+      super(message, assertion)
       set_backtrace(e.backtrace)
     end
   end

data/lib/protest/assertion.rb

@@ -1,4 +1,5 @@
 module Protest
+
   class Assertion
     def initialize(description, &block)
       @description = description
@@ -8,18 +9,14 @@ module Protest
       end
     end
 
-    def to_s; @description; end
-
     def assert_block(&block)
       @block = block if block_given?
       self
     end
 
-    def run(binding_scope)
-      @block.call(binding_scope)
-    end
-
-    def failure(message) raise(Protest::Failure, message); end
+    def run(binding_scope) @block.call(binding_scope); end
+    def failure(message) raise Protest::Failure.new(message, self); end
+    def to_s; @description; end
   end # Assertion
 
   class Denial < Assertion
@@ -30,5 +27,6 @@ module Protest
     else
       failure("expected to fail, but did not")
     end
-  end
+  end # Denial
+
 end # Protest

data/lib/protest/context.rb

@@ -1,47 +1,43 @@
 module Protest
   class Context
-    attr_reader :assertions, :failures
+    attr_reader :description, :assertions
     def initialize(description, parent=nil)
       @description = description
       @assertions = []
-      @failures = []
       @parent = parent
       @setup = nil
+      bootstrap(self)
     end
 
-    def to_s
-      @to_s ||= [@parent.to_s, @description].join(' ').strip
-    end
-
-    def context(description, &block)
-      Protest.context(description, self, &block)
+    def bootstrap(binder)
+      @parent.bootstrap(binder) if @parent
+      binder.instance_eval(&@setup) if @setup
     end
 
     def setup(&block)
       @setup = block
-      self.bootstrap(self)
+      self.instance_eval(&block)
     end
 
+    def to_s; @to_s ||= [@parent.to_s, @description].join(' ').strip; end
+    def context(description, &block) Protest.context(description, self, &block); end
+
     def asserts(description, &block) new_assertion(Assertion, description, &block); end
     def denies(description, &block) new_assertion(Denial, description, &block); end
 
-    def run(writer)
+    def run(report)
       assertions.each do |assertion|
         begin
-          assertion.run(self)
-          writer.print '.'
+          result = assertion.run(self)
         rescue Protest::Failure => e
-          writer.print 'F'; @failures << e.asserted(assertion)
+          result = e
         rescue Exception => e
-          writer.print 'E'; @failures << Protest::Error.new("errored with #{e}", e).asserted(e)
+          result = Protest::Error.new("errored with #{e}", assertion, e)
+        ensure
+          report.record self, result
         end
       end
     end
-
-    def bootstrap(binder)
-      @parent.bootstrap(binder) if @parent
-      binder.instance_eval(&@setup) if @setup
-    end
   private
     def new_assertion(klass, description, &block)
       (assertions << klass.new(description, &block)).last

data/lib/protest/macros.rb

@@ -27,7 +27,7 @@ module Protest
       expected = %r[#{Regexp.escape(expected)}] if expected.kind_of?(String)
       assert_block do |scope|
         actual = scope.instance_eval(&block)
-        actual =~ expected || failure("expected #{expected.inspect}, not #{actual.inspect}")
+        actual =~ expected || failure("expected #{expected.inspect} to match #{actual.inspect}")
       end
     end
   end # AssertionMacros

data/lib/protest/report.rb

@@ -0,0 +1,64 @@
+module Protest
+  class Report
+    attr_reader :bad_results, :passes, :failures, :errors
+    def initialize
+      @bad_results = []
+      @passes, @failures, @errors = 0, 0 ,0
+    end
+
+    def passed?; failures + errors == 0; end
+    def assertions; passes + failures + errors; end
+
+    def start; @start = Time.now; end
+    def stop; @stop = Time.now; end
+    def time_taken; @stop - @start; end
+    
+    def record(context, object)
+      case object
+      when Protest::Error then
+        @bad_results << [context, object]
+        @errors += 1
+        errored
+      when Protest::Failure then
+        @bad_results << [context, object]
+        @failures += 1
+        failed
+      else
+        @passes += 1
+        passed
+      end
+    end
+  end # Report
+
+  class TextReport < Report
+    def initialize(writer=nil)
+      super()
+      @writer ||= STDOUT
+    end
+
+    def passed; @writer.print('.'); end
+    def failed; @writer.print('F'); end
+    def errored; @writer.print('E'); end
+
+    def results
+      @writer.puts "\n\n"
+      bad_results.each_with_index do |recorded, idx|
+        ctx, failure = recorded
+        @writer.puts "#%d - %s asserted %s: %s" % [idx + 1, ctx.to_s, failure.assertion.to_s, failure.to_s]
+        @writer.puts "  " + failure.backtrace.join("\n  ") + "\n\n"
+      end
+      format = "%d assertions, %d failures, %d errors in %s seconds"
+      @writer.puts format % [assertions, failures, errors, ("%0.6f" % time_taken)]
+    end
+  private
+    def bad_results_stack
+    end
+  end
+
+  class NilReport < Report
+    def passed; end
+    def failed; end
+    def errored; end
+    def results; end
+  end
+end # Protest

data/protest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "protest"
-  s.version  = "0.0.4"
+  s.version  = "0.0.5"
   s.date     = "2009-06-29"
   s.summary  = "An extremely fast, expressive, and context-driven unit-testing framework"
   s.email    = %w[gus@gusg.us]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     lib/protest/assertion.rb
     lib/protest/context.rb
     lib/protest/macros.rb
+    lib/protest/report.rb
     protest.gemspec
   ]
   

data/test/context_test.rb

@@ -10,18 +10,16 @@ context "any context" do
 
   context "that doesn't have passing tests" do
     setup do
+      @report = Protest::NilReport.new
+      @context.asserts("a") { true }
       @context.asserts("b") { false }
       @context.asserts("c") { raise Exception, "blah" }
-      @context.run(StringIO.new)
+      @context.run(@report)
     end
 
-    asserts("that failures are captured").equals(1) do
-      @context.failures.select{|e| e.class == Protest::Failure}.length
-    end
-
-    asserts("that unexpected errors are captured").equals(1) do
-      @context.failures.select{|e| e.class == Protest::Error}.length
-    end
+    asserts("that passes are disctinct").equals(1) { @report.passes }
+    asserts("that failures are captured").equals(1) { @report.failures }
+    asserts("that unexpected errors are captured").equals(2) { @report.errors }
   end # that doesn't have passing tests
 end # any context
 
@@ -40,7 +38,7 @@ context "test context" do
   asserts("assertion count").equals(2) { test_context.assertions.length }
 
   asserts("setup runs only once").equals(2) do
-    test_context.run(StringIO.new)
+    test_context.run(Protest::NilReport.new)
     test_context.instance_variable_get(:@test_counter)
   end
 end
@@ -48,24 +46,27 @@ end
 # 
 # Nested Context
 
-inner_nested_context = nil
+inner_nested_context, other_nested_context = nil, nil
 nested_context = context "foo" do
   setup do
     @test_counter = 0
+    @foo = "bar"
   end
   asserts("a block returns true") { @test_counter += 1; true }
   
   inner_nested_context = context("baz") do
     setup { @test_counter += 10 }
   end # A CONTEXT THAT IS DEQUEUED
+
+  other_nested_context = context("bum") {} # A CONTEXT THAT IS DEQUEUED
 end # A CONTEXT THAT IS DEQUEUED
 
 context "nested context" do
   setup do
-    Protest.dequeue_context(nested_context)
-    Protest.dequeue_context(inner_nested_context)
-    nested_context.run(StringIO.new)
-    inner_nested_context.run(StringIO.new)
+    [nested_context, inner_nested_context, other_nested_context].each do |c|
+      Protest.dequeue_context(c)
+      c.run(Protest::NilReport.new)
+    end
   end
   
   asserts("inner context inherits parent context setup").equals(10) do
@@ -75,4 +76,8 @@ context "nested context" do
   asserts("nested context name").equals("foo baz") do
     inner_nested_context.to_s
   end
+
+  asserts("inner context without setup is still bootstrapped").equals("bar") do
+    other_nested_context.instance_variable_get(:@foo)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-protest
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -29,6 +29,7 @@ files:
 - lib/protest/assertion.rb
 - lib/protest/context.rb
 - lib/protest/macros.rb
+- lib/protest/report.rb
 - protest.gemspec
 has_rdoc: false
 homepage: http://github.com/thumblemonks/protest