expectations 0.0.1 → 0.0.2

data/lib/expectations/expectation.rb

@@ -1,4 +1,6 @@
 class Expectations::Expectation
+  include Mocha::Standalone
+
   attr_accessor :expected, :block, :file, :line, :actual
   def initialize(expected, &block)
     self.expected, self.block = expected, block
@@ -6,15 +8,39 @@ class Expectations::Expectation
   end
   
   def execute
+    expected.is_a?(Mocha::Expectation) ? behavior_based_execute : state_based_execute
+  end
+  
+  def behavior_based_execute
+    begin
+      mock = expected.instance_variable_get(:@mock)
+      mocha_setup
+      instance_exec mock, &block
+      mock.verify
+      self.extend(Expectations::Results::Fulfilled)
+    rescue Mocha::ExpectationError => ex
+      self.extend(Expectations::Results::BehaviorFailure)
+      self.message = ex.message.gsub(/:/,";")
+    rescue Exception => ex
+      self.extend(Expectations::Results::Error)
+      self.exception = ex 
+    ensure
+      mocha_teardown
+    end
+    self
+  end
+    
+  def state_based_execute
     begin
       self.actual = block.call
       return self.extend(Expectations::Results::Fulfilled) if expected == actual
     rescue Exception => ex
       return self.extend(Expectations::Results::Fulfilled) if expected == ex.class
       self.extend(Expectations::Results::Error)
-      self.exception, self.actual = ex, ex.class
+      self.exception = ex 
+      self.actual = ex.class if expected.is_a?(Class) && expected < StandardError
       return self
     end
-    self.extend(Expectations::Results::Failure)
+    self.extend(Expectations::Results::StateBasedFailure)
   end
 end

data/lib/expectations/mocha.rb

@@ -0,0 +1,5 @@
+module Mocha
+  class Mock
+    alias to_receive expects
+  end
+end

data/lib/expectations/object.rb

@@ -0,0 +1,30 @@
+class Object
+  alias to_receive expects
+
+  unless defined? instance_exec # 1.9
+    module InstanceExecMethods #:nodoc:
+    end
+    include InstanceExecMethods
+
+    # Evaluate the block with the given arguments within the context of
+    # this object, so self is set to the method receiver.
+    #
+    # From Mauricio's http://eigenclass.org/hiki/bounded+space+instance_exec
+    def instance_exec(*args, &block)
+      begin
+        old_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(method_name = "__instance_exec#{n}")
+        InstanceExecMethods.module_eval { define_method(method_name, &block) }
+      ensure
+        Thread.critical = old_critical
+      end
+
+      begin
+        send(method_name, *args)
+      ensure
+        InstanceExecMethods.module_eval { remove_method(method_name) } rescue nil
+      end
+    end
+  end
+end

data/lib/expectations/results.rb

@@ -21,7 +21,18 @@ module Expectations::Results
 end
 
 module Expectations::Results
-  module Failure
+  module StateBasedFailure
+    include Expectations::Results
+    char "F"
+    def message 
+      "expected: <#{expected.inspect}> got: <#{actual.inspect}>"
+    end
+  end
+end
+
+module Expectations::Results
+  module BehaviorFailure
+    attr_accessor :message
     include Expectations::Results
     char "F"
   end

data/lib/expectations/suite.rb

@@ -1,4 +1,9 @@
 class Expectations::Suite
+  include Mocha::Standalone
+
+  def initialize
+    mocha_setup
+  end
   
   def execute(out=STDOUT)
     suite_result = Expectations::SuiteResults.new(out)
@@ -10,7 +15,7 @@ class Expectations::Suite
     suite_result.print_results(benchmark)
     suite_result.result
   end
-  
+
   def expectations
     @expectations ||= []
   end

data/lib/expectations/suite_results.rb

@@ -22,7 +22,9 @@ class Expectations::SuiteResults
   end
   
   def failures
-    expectations.select { |expectation| expectation.is_a?(Expectations::Results::Failure) }
+    expectations.select do |expectation|
+      expectation.is_a?(Expectations::Results::StateBasedFailure) || expectation.is_a?(Expectations::Results::BehaviorFailure)
+    end
   end
   
   def print_results(benchmark)
@@ -37,14 +39,14 @@ class Expectations::SuiteResults
       errors.each do |error|
         out.puts " #{error.file}:#{error.line}:in `expect'"
         out.puts " line <#{error.line}>"
-        out.puts " error <#{error.exception.message}>"
+        out.puts " error <#{error.exception.message.gsub(/:/,";")}>"
         out.puts " expected <#{error.expected.inspect}> got <#{error.actual.inspect}>"
       end
       out.puts "\nFailures:" if failures.any?
       failures.each do |failure|
         out.puts " #{failure.file}:#{failure.line}:in `expect'"
         out.puts " line <#{failure.line}>"
-        out.puts " expected: <#{failure.expected.inspect}> got: <#{failure.actual.inspect}>"
+        out.puts " #{failure.message}"
       end
     end
   end

data/lib/expectations.rb

@@ -5,8 +5,13 @@ def Expectations(&block)
   Expectations::SuiteRunner.instance.suite_eval &block
 end
 
+require 'rubygems'
+require 'mocha'
+require 'mocha/standalone'
 require 'singleton'
 require 'benchmark'
+require File.expand_path(File.dirname(__FILE__) + '/expectations/object')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/mocha')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite_runner')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/suite_results')

data/rakefile.rb

@@ -33,7 +33,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-	s.version = "0.0.1"
+	s.version = "0.0.2"
 	s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 
@@ -50,7 +50,7 @@ specification = Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README']
   s.rdoc_options << '--title' << 'expectations' << '--main' << 'README' << '--line-numbers'
                          
-  s.autorequire = 'arbs'
+  s.autorequire = 'expectations'
   s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*$', 'rakefile.rb'].to_a
 	s.test_file = "test/all_tests.rb"
 end

data/test/expectations/expectation_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../test_helper"
 
 Expectations do
   expect true do
-    Expectations::Expectation.new(1) { 2 }.execute.is_a?(Expectations::Results::Failure)
+    Expectations::Expectation.new(1) { 2 }.execute.is_a?(Expectations::Results::StateBasedFailure)
   end
   
   expect true do
@@ -13,6 +13,22 @@ Expectations do
     Expectations::Expectation.new(1) { raise }.execute.is_a?(Expectations::Results::Error)
   end
   
+  expect NoMethodError do
+    Expectations::Expectation.new(ArgumentError) { Object.no_method }.execute.actual
+  end
+  
+  expect "undefined method `no_method' for Object:Class" do
+    Expectations::Expectation.new(ArgumentError) { Object.no_method }.execute.exception.to_s
+  end
+  
+  expect true do
+    Expectations::Expectation.new(NoMethodError) { Object.no_method }.execute.is_a?(Expectations::Results::Fulfilled)
+  end
+  
+  expect nil do
+    Expectations::Expectation.new(String) { Object.no_method }.execute.actual
+  end
+  
   expect __LINE__ + 1 do
     Expectations::Expectation.new(1) { 2 }.execute.line
   end

data/test/expectations/results_test.rb

@@ -7,7 +7,11 @@ Expectations do
   end
 
   expect "F" do
-    Object.new.extend(Expectations::Results::Failure).char
+    Object.new.extend(Expectations::Results::StateBasedFailure).char
+  end
+
+  expect "F" do
+    Object.new.extend(Expectations::Results::BehaviorFailure).char
   end
 
   expect "E" do
@@ -19,7 +23,11 @@ Expectations do
   end
 
   expect false do
-    Object.new.extend(Expectations::Results::Failure).fulfilled?
+    Object.new.extend(Expectations::Results::StateBasedFailure).fulfilled?
+  end
+
+  expect false do
+    Object.new.extend(Expectations::Results::BehaviorFailure).fulfilled?
   end
 
   expect false do

data/test/expectations/suite_results_test.rb

@@ -21,7 +21,13 @@ Expectations do
 
   expect false do
     results = Expectations::SuiteResults.new(Silent)
-    results << Object.new.extend(Expectations::Results::Failure)
+    results << Object.new.extend(Expectations::Results::StateBasedFailure)
+    results.result
+  end
+
+  expect false do
+    results = Expectations::SuiteResults.new(Silent)
+    results << Object.new.extend(Expectations::Results::BehaviorFailure)
     results.result
   end
 end

data/test/sample_expecations_test.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + "/test_helper"
 
+class Phone
+end
+
 Expectations do
+  
   expect 2 do
     1 + 1
   end
@@ -9,4 +13,22 @@ Expectations do
     Object.no_method
   end
   
+  expect mock.to_receive(:redial) do |phone|
+    phone.redial(10)
+  end
+  
+  expect mock.to_receive(:dial).with("2125551212") do |phone|
+    phone.dial("2125551212")
+  end
+  
+  expect mock.to_receive(:dial).times(2) do |phone|
+    phone.dial
+    phone.dial
+  end
+  
+  expect Object.to_receive(:foo).with(1).times(2) do
+    Object.foo(1)
+    Object.foo(1)
+  end
+  
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jay Fields
-autorequire: arbs
+autorequire: expectations
 bindir: bin
 cert_chain: []
 
@@ -23,6 +23,8 @@ extra_rdoc_files:
 - README
 files: 
 - lib/expectations/expectation.rb
+- lib/expectations/mocha.rb
+- lib/expectations/object.rb
 - lib/expectations/results.rb
 - lib/expectations/suite.rb
 - lib/expectations/suite_results.rb