Use a single custom error class: ExpectationNotMet

bowsersenior · bowsersenior · commit 184991bda73d · 2012-10-10T22:32:08.000-07:00
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ I will use TMF in my projects and discover if such a minimalistic tool can be pr
     # => true
 
     assert(1 + 1, :equals => 3)
-    # => TMF::AssertionFailed: Expected 2 to equal 3
+    # => TMF::ExpectationNotMet: Expected 2 to equal 3
 
     assert(Object.foo, :equals => :bar)
     # => NoMethodError: undefined method `foo' for Object:Class
@@ -108,7 +108,7 @@ And you also have a file `PROJECT_ROOT/test/foo_test.rb` with the following:
 
     # failing test
     assert(f.class, :equals => 'Bar')
-    # => TMF::AssertionFailed: Expected Foo to equal Bar
+    # => TMF::ExpectationNotMet: Expected Foo to equal Bar
 
     # stub with passing test
     stub(f, :method => :class, :return => 'Bar') do
@@ -120,7 +120,7 @@ And you also have a file `PROJECT_ROOT/test/foo_test.rb` with the following:
     stub(f, :method => :bar, :return => :baz) do
       assert(f.bar, :equals => :snafu)
     end
-    # TMF::AssertionFailed: Expected baz to equal snafu
+    # TMF::ExpectationNotMet: Expected baz to equal snafu
 
     # testing a raised error
     begin
diff --git a/tmf.rb b/tmf.rb
@@ -21,20 +21,14 @@
 # THE SOFTWARE.
 
 module TMF
-  class AssertionFailed < StandardError
-    def initialize(a, b)
-      super("Expected #{a} to equal #{b}")
-    end
-  end
-
   class ExpectationNotMet < StandardError
-    def initialize(o, method)
-      super("Expected #{o} to receive #{method}")
+    def initialize(o, method, verb)
+      super("Expected #{o} to #{verb} #{method}")
     end
   end
 
   def assert(a, opts)
-    a == opts[:equals] ? true : raise( AssertionFailed.new(a,opts[:equals]) )
+    a == opts[:equals] ? true : raise( ExpectationNotMet.new(a,opts[:equals], 'equal') )
   end
 
   def stub(o, opts)
@@ -44,7 +38,7 @@ def stub(o, opts)
     o.singleton_class.send(:define_method, opts[:method]) { called = 1; opts[:return] }
     result = yield if block_given?
 
-    raise ExpectationNotMet.new(o, opts[:method]) if opts[:spy] && !called
+    raise ExpectationNotMet.new(o, opts[:method], 'receive') if opts[:spy] && !called
 
     result
   ensure
