jeremymcanally-matchy 0.0.1 → 0.1.0

data/lib/matchy/built_in/error_expectations.rb

@@ -1,6 +1,11 @@
 module Matchy
   module Expectations
     class RaiseErrorExpectation < Base
+      def initialize(expected, test_case)
+        @error = nil
+        super
+      end
+
       def matches?(receiver)
         @receiver = receiver
         begin
@@ -31,6 +36,11 @@ module Matchy
     end
     
     class ThrowSymbolExpectation < Base
+      def initialize(expected, test_case)
+        @thrown_symbol = nil
+        super
+      end
+
       def matches?(receiver)
         @receiver = receiver
         begin

data/lib/matchy/built_in/operator_expectations.rb

@@ -82,7 +82,7 @@ module Matchy
       end
       
       def fail!(operator)
-        flunk failure_message(@match ? failure_message(operator) : negative_failure_message(operator))
+        flunk @match ? failure_message(operator) : negative_failure_message(operator)
       end
       
       def failure_message(operator)

data/lib/matchy/built_in/truth_expectations.rb

@@ -16,6 +16,21 @@ module Matchy
       end
     end
     
+    class BeKindOfExpectation < Base
+      def matches?(receiver)
+        @receiver = receiver
+        @receiver.kind_of?(@expected)
+      end
+      
+      def failure_message
+        "Expected #{@receiver.inspect} to be kind of #{@expected.inspect}."
+      end
+      
+      def negative_failure_message
+        "Expected #{@receiver.inspect} to not be kind of #{@expected.inspect}."
+      end
+    end
+    
     class BeCloseExpectation < Base
       def initialize(expected, delta, test_case)
         @expected = expected
@@ -102,6 +117,21 @@ module Matchy
       end
     end
 
+    class RespondToExpectation < Base
+      def matches?(receiver)
+        @receiver = receiver
+        @receiver.respond_to?(@expected)
+      end
+      
+      def failure_message
+        "Expected #{@receiver.inspect} to respond to #{@expected.inspect}."
+      end
+      
+      def negative_failure_message
+        "Expected #{@receiver.inspect} to not respond to #{@expected.inspect}."
+      end
+    end
+    
     module TestCaseExtensions
       # Simply checks if the receiver matches the expected object.
       # TODO: Fill this out to implement much of the RSpec functionality (and then some)
@@ -115,6 +145,16 @@ module Matchy
         Matchy::Expectations::BeExpectation.new(obj, self)
       end
       
+      # Checks if the given object is kind_of? the expected class
+      #
+      # ==== Examples
+      # 
+      #   "hello".should be_kind_of(String)
+      #   3.should be_kind_of(Fixnum)
+      def be_kind_of(klass)
+        Matchy::Expectations::BeKindOfExpectation.new(klass, self)
+      end
+      
       # Checks if the given object is within a given object and delta.
       #
       # ==== Examples
@@ -175,7 +215,17 @@ module Matchy
       #
       def satisfy(obj)
         Matchy::Expectations::SatisfyExpectation.new(obj, self)
-      end       
+      end
+      
+      # Checks if the given object responds to the given method
+      #
+      # ==== Examples
+      #
+      #   "foo".should respond_to(:length)
+      #   {}.should respond_to(:has_key?)
+      def respond_to(meth)
+        Matchy::Expectations::RespondToExpectation.new(meth, self)
+      end   
     end
   end
 end

data/lib/matchy/modals.rb

@@ -16,6 +16,8 @@ module Matchy
       end
     end
     
+    alias :will :should
+    
     # Tests that an expectation doesn't match the given object.
     #
     # ==== Examples
@@ -32,6 +34,9 @@ module Matchy
       end
     end
     
+    alias :will_not :should_not
+    alias :wont :should_not
+    
     protected
     def match_expectation(expectation, match)
       if expectation.matches?(self) != match

data/lib/matchy/version.rb

@@ -1,8 +1,8 @@
 module Matchy
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 1
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/matchy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "matchy"
-  s.version  = "0.0.1"
+  s.version  = "0.1.0"
   s.date     = "2008-10-05"
   s.summary  = "RSpec-esque matchers for use in Test::Unit"
   s.email    = "jeremy@entp.com"

data/test/test_enumerable_expectations.rb

@@ -65,27 +65,27 @@ class TestEnumerableExpectations < Test::Unit::TestCase
     obj = include(1)
     obj.matches?([4,5,6])
     
-    obj.failure_message.should be "Expected [4, 5, 6] to include [1]."
+    obj.failure_message.should be("Expected [4, 5, 6] to include [1].")
   end
   
   def test_include_negative_fail_message
     obj = include(1)
     obj.matches?([4,5,6])
     
-    obj.negative_failure_message.should be "Expected [4, 5, 6] to not include [1]."
+    obj.negative_failure_message.should be("Expected [4, 5, 6] to not include [1].")
   end
   
   def test_exclude_fail_message
     obj = exclude(4)
     obj.matches?([4,5,6])
     
-    obj.failure_message.should be "Expected [4, 5, 6] to exclude [4]."
+    obj.failure_message.should be("Expected [4, 5, 6] to exclude [4].")
   end
   
   def test_exclude_negative_fail_message
     obj = exclude(4)
     obj.matches?([4,5,6])
     
-    obj.negative_failure_message.should be "Expected [4, 5, 6] to not exclude [4]."
+    obj.negative_failure_message.should be("Expected [4, 5, 6] to not exclude [4].")
   end
 end

data/test/test_modals.rb

@@ -10,10 +10,22 @@ class TestModals < Test::Unit::TestCase
     3.should(@expectation)
   end
   
+  def test_will
+    3.will(@expectation)
+  end
+  
   def test_should_not
     3.should_not(@bad_expectation)
   end
   
+  def test_will_not
+    3.will_not(@bad_expectation)
+  end
+  
+  def test_wont
+    3.wont(@bad_expectation)
+  end
+  
   def test_should_operator_expectation_returned
     obj = 3.should
     assert_equal Matchy::Expectations::OperatorExpectation, obj.class

data/test/test_operator_expectations.rb

@@ -138,22 +138,20 @@ class TestOperatorExpectations < Test::Unit::TestCase
   def test_fail_message
     obj = Matchy::Expectations::OperatorExpectation.new(3, true)
     
-    def obj.fail!(fail)
+    def obj.flunk(msg)
+      msg
     end
     
-    obj == 4
-    
-    obj.send(:failure_message, "==").should =~ /Expected 3 to == 4./
+    (obj == 4).should == "Expected 3 to == 4."
   end
   
   def test_negative_fail_message
-    obj = Matchy::Expectations::OperatorExpectation.new(3, true)
+    obj = Matchy::Expectations::OperatorExpectation.new(3, false)
     
-    def obj.fail!(fail)
+    def obj.flunk(msg)
+      msg
     end
     
-    obj == 3
-    
-    obj.send(:negative_failure_message, "==").should =~ /Expected 3 to not == 3./
+    (obj == 3).should == "Expected 3 to not == 3."
   end
 end

data/test/test_truth_expectations.rb

@@ -135,28 +135,28 @@ class TestTruthExpectations < Test::Unit::TestCase
     obj = equal(4)
     obj.matches?(5)
     
-    obj.failure_message.should be "Expected 5 to equal 4."
+    obj.failure_message.should be("Expected 5 to equal 4.")
   end
   
   def test_equal_negative_fail_message
     obj = equal(5)
     obj.matches?(5)
     
-    obj.negative_failure_message.should be "Expected 5 to not equal 5."
+    obj.negative_failure_message.should be("Expected 5 to not equal 5.")
   end
   
   def test_eql_fail_message
     obj = eql(4)
     obj.matches?(5)
     
-    obj.failure_message.should be "Expected 5 to eql 4."
+    obj.failure_message.should be("Expected 5 to eql 4.")
   end
   
-  def test_eql_negative_fail_message
+  def test_eql_negative_fail_message_for_eql
     obj = eql(5)
     obj.matches?(5)
     
-    obj.negative_failure_message.should be "Expected 5 to not eql 5."
+    obj.negative_failure_message.should be("Expected 5 to not eql 5.")
   end
   
   def test_exist_fail_message
@@ -177,41 +177,82 @@ class TestTruthExpectations < Test::Unit::TestCase
     obj = be_close(3.0)
     obj.matches?(6.0)
     
-    obj.failure_message.should be "Expected 6.0 to be close to 3.0 (delta: 0.3)."
+    obj.failure_message.should be("Expected 6.0 to be close to 3.0 (delta: 0.3).")
   end
   
   def test_be_close_negative_fail_message
     obj = be_close(5.0)
     obj.matches?(5.0)
     
-    obj.negative_failure_message.should be "Expected 5.0 to not be close to 5.0 (delta: 0.3)."
+    obj.negative_failure_message.should be("Expected 5.0 to not be close to 5.0 (delta: 0.3).")
   end
   
   def test_be_fail_message
     obj = be(4)
     obj.matches?(5)
     
-    obj.failure_message.should be "Expected 5 to be 4."
+    obj.failure_message.should be("Expected 5 to be 4.")
   end
   
   def test_be_negative_fail_message
     obj = be(5)
     obj.matches?(5)
     
-    obj.negative_failure_message.should be "Expected 5 to not be 5."
+    obj.negative_failure_message.should be("Expected 5 to not be 5.")
   end
   
   def test_satisfy_fail_message
     obj = satisfy(lambda {|x| x == 4})
     obj.matches?(6)
     
-    obj.failure_message.should be "Expected 6 to satisfy given block."
+    obj.failure_message.should be("Expected 6 to satisfy given block.")
   end
   
-  def test_eql_negative_fail_message
+  def test_eql_negative_fail_message_for_matches
     obj = satisfy(lambda {|x| x == 4})
     obj.matches?(4)
     
-    obj.negative_failure_message.should be "Expected 4 to not satisfy given block."
+    obj.negative_failure_message.should be("Expected 4 to not satisfy given block.")
   end
+  
+  def test_kind_of
+    3.should be_kind_of(Fixnum)
+  end
+  
+  def test_kind_of_fail
+    lambda {
+      3.should be_kind_of(Hash)
+    }.should raise_error(Test::Unit::AssertionFailedError)
+  end
+  
+  def test_negative_kind_of
+    3.should_not be_kind_of(Hash)
+  end
+  
+  def test_negative_kind_of_fail
+    lambda {
+      3.should_not be_kind_of(Fixnum)
+    }.should raise_error(Test::Unit::AssertionFailedError)
+  end
+
+  def test_respond_to
+    "foo".should respond_to(:length)
+  end
+  
+  def test_respond_to_fail
+    lambda {
+      "foo".should respond_to(:nonexistant_method)
+    }.should raise_error(Test::Unit::AssertionFailedError)
+  end
+  
+  def test_negative_respond_to
+    "foo".should_not respond_to(:nonexistant_method)
+  end
+  
+  def test_negative_respond_to_fail
+    lambda {
+      "foo".should_not respond_to(:length)
+    }.should raise_error(Test::Unit::AssertionFailedError)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremymcanally-matchy
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeremy McAnally