expectations 0.1.6 → 0.1.7

data/README

@@ -135,4 +135,4 @@ expectations can be used for state based and behavior based testing.
 
 == Contributors
 
-Matt Mower, Ola Bini, George Malamidis, Brian Guthrie
+Matt Mower, Ola Bini, George Malamidis, Brian Guthrie, Philippe Hanrigou, Steve McLarnon

data/lib/expectations/delegate_expectation.rb

@@ -0,0 +1,24 @@
+module Expectations::DelegateExpectation
+  def execute
+    begin
+      mocha_setup
+      actual = instance_exec expected.mock, &block
+      if expected.verify(actual)
+        self.extend(Expectations::Results::Fulfilled)
+      else
+        self.extend(Expectations::Results::StateBasedFailure)
+        self.message = "Delegation may have occurred; however, the return value could not be verified. Did you specify something after the delegation method?"
+      end
+    rescue Mocha::ExpectationError => ex
+      self.extend(Expectations::Results::BehaviorBasedFailure)
+      self.message = "Expected #{expected.klass} to delegate #{expected.meth} to #{expected.subject}; however, #{expected.subject}.#{expected.meth} was never called"
+    rescue Exception => ex
+      self.extend(Expectations::Results::Error)
+      self.exception = ex
+    ensure
+      mocha_teardown
+    end
+    self
+  end
+
+end

data/lib/expectations/delegate_recorder.rb

@@ -0,0 +1,22 @@
+class Expectations::DelegateRecorder
+  attr_reader :klass, :subject, :meth
+  def initialize(klass, meth)
+    @klass, @subject_mock, @meth = klass, Mocha::Mock.new, meth
+    @subject_mock.expects(meth).returns(:the_subjects_response)
+  end
+  
+  def to(subject)
+    @subject = subject
+    self
+  end
+  
+  def mock
+    @klass.stubs(@subject).returns(@subject_mock)
+    @klass
+  end
+  
+  def verify(actual)
+    @subject_mock.verify
+    actual == :the_subjects_response
+  end
+end

data/lib/expectations/expectation.rb

@@ -5,10 +5,10 @@ class Expectations::Expectation
   def initialize(expected, &block)
     self.expected, self.block = expected, block
     self.file, self.line = eval "[__FILE__, __LINE__]", block.binding
-    if expected.is_a?(Expectations::MockRecorder)
-      extend(Expectations::BehaviorBasedExpectation)
-    else
-      extend(Expectations::StateBasedExpectation)
+    case
+      when expected.is_a?(Expectations::DelegateRecorder) then extend(Expectations::DelegateExpectation)
+      when expected.is_a?(Expectations::MockRecorder) then extend(Expectations::BehaviorBasedExpectation)
+      else extend(Expectations::StateBasedExpectation)
     end
   end
   

data/lib/expectations/object.rb

@@ -3,6 +3,10 @@ class Object
     Expectations::MockRecorder.new(self, method)
   end
   
+  def to_delegate(method)
+    Expectations::DelegateRecorder.new(self, method)
+  end
+  
   def expectations_equal_to(other)
     self == other
   end

data/lib/expectations/results.rb

@@ -32,7 +32,9 @@ module Expectations::Results
   module StateBasedFailure
     include Expectations::Results
     char "F"
-    def message 
+    attr_writer :message
+    def message
+      return @message if @message
       result = "expected: <#{expected.inspect}> got: <#{actual.inspect}>"
       result += "\nstring details: #{expected.diff(actual)}" if expected.is_a?(String) && actual.is_a?(String)
       result

data/lib/expectations.rb

@@ -16,6 +16,8 @@ require 'benchmark'
 require 'erb'
 require 'fileutils'
 require File.expand_path(File.dirname(__FILE__) + '/expectations/object')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/delegate_expectation')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/delegate_recorder')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/xml_string')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/regexp')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/range')

data/rakefile.rb

@@ -46,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-	s.version = "0.1.6"
+	s.version = "0.1.7"
 	s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

data/test/expectations/expectation_test.rb

@@ -1,24 +1,24 @@
 require File.dirname(__FILE__) + "/../test_helper"
 
 Expectations do
-  expect true do
-    Expectations::Expectation.new(1) { 2 }.execute.is_a?(Expectations::Results::StateBasedFailure)
+  expect Expectations::Results::StateBasedFailure do
+    Expectations::Expectation.new(1) { 2 }.execute
   end
   
-  expect true do
-    Expectations::Expectation.new(1) { 1 }.execute.is_a?(Expectations::Results::Fulfilled)
+  expect Expectations::Results::Fulfilled do
+    Expectations::Expectation.new(1) { 1 }.execute
   end
   
-  expect true do
-    Expectations::Expectation.new(1) { raise }.execute.is_a?(Expectations::Results::Error)
+  expect Expectations::Results::Error do
+    Expectations::Expectation.new(1) { raise }.execute
   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)
+  expect Expectations::Results::Fulfilled do
+    Expectations::Expectation.new(NoMethodError) { Object.no_method }.execute
   end
   
   expect nil do

data/test/successes_test.rb

@@ -70,10 +70,12 @@ Expectations do
     String
   end
   
+  # State based test with XML strings, whitespace between tags is ignored
   expect xml("<a><foo>bar</foo></a>") do
     "<a>\n\t<foo>bar</foo>  \n</a>"
   end
   
+  # State based test with XML strings, whitespace between tags is ignored
   expect xml(<<-eos) do
     <one>
       <two>
@@ -84,7 +86,18 @@ Expectations do
     eos
     "<one><two><three>4</three>
       <five> 6 </five>
-    </two></one>"    
+    </two></one>"
+  end
+
+  # this is normally defined in the file specific to the class
+  klass = Class.new do
+    def save(arg)
+      record.save(arg)
+    end
+  end
+  # State based delegation test
+  expect klass.new.to_delegate(:save).to(:record) do |instance|
+    instance.save(1)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-23 00:00:00 -08:00
+date: 2008-02-15 00:00:00 -10:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,8 @@ extra_rdoc_files:
 - README
 files: 
 - lib/expectations/behavior_based_expectation.rb
+- lib/expectations/delegate_expectation.rb
+- lib/expectations/delegate_recorder.rb
 - lib/expectations/expectation.rb
 - lib/expectations/mock_recorder.rb
 - lib/expectations/module.rb