expectations 0.2.6 → 0.2.7

data/lib/expectations/expectation.rb

@@ -11,4 +11,15 @@ class Expectations::Expectation
     end
   end
   
+  def mock(*args)
+    Expectations::StandardError.print "mock method called from #{caller.first.chomp(":in `__instance_exec0'")}\n"
+    super
+  end
+  
+  def warn_for_expects
+    Object.__which_expects__ = ExpectationsExpectsMethod
+    yield
+  ensure
+    Object.__which_expects__ = MochaExpectsMethod
+  end
 end

data/lib/expectations/object.rb

@@ -1,4 +1,25 @@
 class Object
+  module MochaExpectsMethod
+    expects_method = Object.instance_method(:expects)
+    define_method :expects do |*args|
+      expects_method.bind(self).call(*args)
+    end
+  end
+  
+  module ExpectationsExpectsMethod
+    def expects(*args)
+      Expectations::StandardError.print "expects method called from #{caller[2].chomp(":in `__instance_exec0'")}\n"
+      MochaExpectsMethod.instance_method(:expects).bind(self).call(*args)
+    end
+  end
+  
+  attr_accessor :__which_expects__
+  include MochaExpectsMethod
+  include ExpectationsExpectsMethod
+  def expects(*args)
+    (__which_expects__ || MochaExpectsMethod).instance_method(:expects).bind(self).call(*args)
+  end
+  
   def to
     Expectations::Recorder.new(self)
   end

data/lib/expectations/recorded_expectation.rb

@@ -2,8 +2,11 @@ module Expectations::RecordedExpectation
   def execute
     begin
       mocha_setup
-      instance_exec(expected.subject!, &block) if block
-      if expected.verify!
+      expected.subject!
+      warn_for_expects do
+        instance_exec(expected.subject, &block) if block
+      end
+      if expected.verify! && mocha_verify
         self.extend(Expectations::Results::Fulfilled)
       else
         self.extend(Expectations::Results::StateBasedFailure)

data/lib/expectations/standard_error.rb

@@ -0,0 +1,12 @@
+class Expectations::StandardError
+  def self.print(string)
+    print_suggestion
+    STDERR.print string
+  end
+  
+  def self.print_suggestion
+    return if @suggestion_printed
+    @suggestion_printed = true
+    STDERR.print "Expectations allows you to to create multiple mock expectations, but suggests that you write another test instead.\n"
+  end
+end

data/lib/expectations/state_based_expectation.rb

@@ -2,8 +2,15 @@ module Expectations::StateBasedExpectation
   def execute
     begin
       mocha_setup
-      self.actual = instance_eval(&block)
-      return self.extend(Expectations::Results::Fulfilled) if expected.expectations_equal_to(actual)
+      warn_for_expects do
+        self.actual = instance_eval(&block)
+      end
+      mocha_verify
+      if expected.expectations_equal_to(actual)
+        self.extend(Expectations::Results::Fulfilled)
+      else
+        self.extend(Expectations::Results::StateBasedFailure)
+      end
     rescue Exception => ex
       return self.extend(Expectations::Results::Fulfilled) if expected == ex.class
       self.extend(Expectations::Results::Error)
@@ -13,6 +20,5 @@ module Expectations::StateBasedExpectation
     ensure
       mocha_teardown
     end
-    self.extend(Expectations::Results::StateBasedFailure)
   end
 end

data/lib/expectations/suite_results.rb

@@ -1,29 +1,29 @@
 class Expectations::SuiteResults
   attr_accessor :out, :expectations
-  
+
   def initialize(out)
     self.out, self.expectations = out, []
     out.print "Expectations "
   end
-  
+
   def <<(expectation_result)
     out.print expectation_result.char
     self.expectations << expectation_result
     self
   end
-  
+
   def succeeded?
     expectations.all? { |expectation| expectation.fulfilled? }
   end
-  
+
   def fulfilled
     expectations.select { |expectation| expectation.fulfilled? }
   end
-  
+
   def errors
     expectations.select { |expectation| expectation.error? }
   end
-  
+
   def failures
     expectations.select { |expectation| expectation.failure? }
   end
@@ -33,29 +33,37 @@ class Expectations::SuiteResults
     run_time = 0.001 if run_time < 0.001
     out.puts "\nFinished in #{run_time.to_s.gsub(/(\d*)\.(\d{0,5}).*/,'\1.\2')} seconds"
     if succeeded?
-      out.puts "\nSuccess: #{fulfilled.size} fulfilled"
+      print_success 
     else
-      out.puts "\nFailure: #{failures.size} failed, #{errors.size} errors, #{fulfilled.size} fulfilled"
-      out.puts "\n--Errors--" if errors.any?
-      errors.each do |error|
-        out.puts " #{error.file}:#{error.line}:in `expect'" if ENV["TM_MODE"]
-        out.puts "file <#{error.file}>"
-        out.puts "line <#{error.line}>"
-        out.puts "error <#{error.exception.message}>"
-        out.puts "trace #{filter_backtrace(error.exception.backtrace)}"
-        out.puts "#{error.message}" if error.message && error.message.any?
-        out.puts "\n"
-      end
-      out.puts "\n--Failures--" if failures.any?
-      failures.each do |failure|
-        out.puts " #{failure.file}:#{failure.line}:in `expect'" if ENV["TM_MODE"]
-        out.puts "file <#{failure.file}>"
-        out.puts "line <#{failure.line}>"
-        out.puts "#{failure.message}\n\n"
-      end
+      print_fail
     end
   end
   
+  def print_success
+    out.puts "\nSuccess: #{fulfilled.size} fulfilled"
+  end
+
+  def print_fail
+    out.puts "\nFailure: #{failures.size} failed, #{errors.size} errors, #{fulfilled.size} fulfilled"
+    out.puts "\n--Errors--" if errors.any?
+    errors.each do |error|
+      out.puts " #{error.file}:#{error.line}:in `expect'" if ENV["TM_MODE"]
+      out.puts "file <#{error.file}>"
+      out.puts "line <#{error.line}>"
+      out.puts "error <#{error.exception.message}>"
+      out.puts "trace #{filter_backtrace(error.exception.backtrace)}"
+      out.puts "#{error.message}" if error.message && error.message.any?
+      out.puts "\n"
+    end
+    out.puts "\n--Failures--" if failures.any?
+    failures.each do |failure|
+      out.puts " #{failure.file}:#{failure.line}:in `expect'" if ENV["TM_MODE"]
+      out.puts "file <#{failure.file}>"
+      out.puts "line <#{failure.line}>"
+      out.puts "#{failure.message}\n\n"
+    end
+  end
+
   def write_junit_xml(path)
     FileUtils.rm_rf path if File.exist?(path)
     FileUtils.mkdir_p path
@@ -81,7 +89,7 @@ class Expectations::SuiteResults
       end
     end
   end
-  
+
   def filter_backtrace(trace)
     patterns_to_strip = [/\/expectations\/lib\/expectations\//, /\/lib\/ruby\/1\.8\//]
     result = patterns_to_strip.inject(trace) do |result, element|

data/lib/expectations/suite_runner.rb

@@ -16,5 +16,4 @@ class Expectations::SuiteRunner
   def self.suite_eval(&block)
     self.instance.suite.instance_eval(&block)
   end
-    
 end

data/lib/expectations.rb

@@ -32,4 +32,5 @@ require File.expand_path(File.dirname(__FILE__) + '/expectations/suite_results')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/expectation')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/state_based_expectation')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/mock_recorder')
-require File.expand_path(File.dirname(__FILE__) + '/expectations/results')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/results')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/standard_error')

data/rakefile.rb

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

data/test/failures_test.rb

@@ -24,6 +24,7 @@ Expectations do
   end
 
   expect Expectations::Results::BehaviorBasedFailure do
+    Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
     suite.expect Mocha::Mock.new.to.receive(:dial).with("2125551212").times(2) do |phone| 
       phone.dial("2125551212")
@@ -32,6 +33,7 @@ Expectations do
   end
 
   expect Expectations::Results::BehaviorBasedFailure do
+    Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
     suite.expect(Object.to.receive(:deal)) {  }
     suite.execute(Silent).expectations.first
@@ -44,6 +46,7 @@ Expectations do
   end
 
   expect Expectations::Results::Error do
+    Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
     suite.expect(2) do
       Object.expects(:bar).returns 2
@@ -53,6 +56,7 @@ Expectations do
   end
 
   expect Expectations::Results::Error do
+    Expectations::StandardError.stubs(:print)
     suite = Expectations::Suite.new
     suite.expect(1) do
       Object.expects(:give_me_three).with(3).returns 1
@@ -61,4 +65,42 @@ Expectations do
     suite.execute(Silent).expectations.first
   end
 
+  expect Expectations::Results::Error do
+    Expectations::StandardError.stubs(:print)
+    suite = Expectations::Suite.new
+    suite.expect(1) do
+      Object.expects(:foo)
+    end
+    suite.execute(Silent).expectations.first
+  end
+
+  expect Expectations::Results::Error do
+    Expectations::StandardError.stubs(:print)
+    suite = Expectations::Suite.new
+    suite.expect(1) do
+      mock(:foo => 1)
+    end
+    suite.execute(Silent).expectations.first
+  end
+  
+  expect Expectations::Results::BehaviorBasedFailure do
+    Expectations::StandardError.stubs(:print)
+    suite = Expectations::Suite.new
+    suite.expect(Object.to.receive(:foo)) do
+      Object.foo
+      mock(:foo => 1)
+    end
+    suite.execute(Silent).expectations.first
+  end
+  
+  expect Expectations::Results::BehaviorBasedFailure do
+    Expectations::StandardError.stubs(:print)
+    suite = Expectations::Suite.new
+    suite.expect(Object.to.receive(:foo)) do
+      Object.foo
+      Object.expects(:bar)
+    end
+    suite.execute(Silent).expectations.first
+  end
+  
 end

data/test/successes_test.rb

@@ -1,17 +1,17 @@
 require File.dirname(__FILE__) + "/test_helper"
 
 Expectations do
-  
+
   # State based expectation where a value equals another value
   expect 2 do
     1 + 1
   end
-  
+
   # State based expectation where an exception is expected. Simply expect the Class of the intended exception
   expect NoMethodError do
     Object.no_method
   end
-  
+
   # Behavior based test using a traditional mock
   expect mock.to.receive(:dial).with("2125551212").times(2) do |phone|
     phone.dial("2125551212")
@@ -34,34 +34,22 @@ Expectations do
   expect Object.to.receive(:deal) do
     Object.deal
   end
-  
+
   # State based test utilizing a stub
   expect 2 do
     stub(:two => 2).two
   end
-  
-  # State based test utilizing a concrete mock
-  expect 2 do
-    Object.expects(:bar).returns 2
-    Object.bar
-  end
-  
-  # Behavior based test utilizing a stub and a concrete mock
-  expect 1 do
-    Object.expects(:give_me_three).with(3).returns 1
-    Object.give_me_three(stub(:three=>3).three)
-  end
-  
+
   # State based test matching a Regexp
   expect /a string/ do
     "a string"
   end
-  
+
   # State based test checking if actual is in the expected Range
   expect 1..5 do
     3
   end
-  
+
   # State based test to determine if the object is an instance of the module
   expect Enumerable do
     []
@@ -71,33 +59,33 @@ Expectations do
   expect String do
     "a string"
   end
-  
+
   # State based test to determine if the modules are the same
   expect Enumerable do
     Enumerable
   end
-  
+
   # State based test to determine if the classes are the same
   expect String 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>
-        <three>4</three>
-        <five> 6 </five>
-      </two>
+    <two>
+    <three>4</three>
+    <five> 6 </five>
+    </two>
     </one>
     eos
     "<one><two><three>4</three>
-      <five> 6 </five>
+    <five> 6 </five>
     </two></one>"
   end
 
@@ -111,7 +99,7 @@ Expectations do
   expect klass.new.to.delegate(:save).to(:record) do |instance|
     instance.save(1)
   end
-  
+
   # this is normally defined in the file specific to the class
   klass = Class.new do
     attr_accessor :started
@@ -120,7 +108,7 @@ Expectations do
   expect klass.new.to.be.started do |process|
     process.started = true
   end
-  
+
   # this is normally defined in the file specific to the class
   klass = Class.new do
     attr_accessor :finished
@@ -129,8 +117,8 @@ Expectations do
   expect klass.new.to.have.finished do |process|
     process.finished = true
   end
-  
+
   expect nil.to.be.nil?
   expect Object.not.to.be.nil?
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-28 00:00:00 -04:00
+date: 2008-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - lib/expectations/regexp.rb
 - lib/expectations/results.rb
 - lib/expectations/reverse_result.rb
+- lib/expectations/standard_error.rb
 - lib/expectations/state_based_expectation.rb
 - lib/expectations/state_based_recorder.rb
 - lib/expectations/string.rb