As we always convert NSNulls in invocation parameters back to nil before

matching, we need to special case NSNull when creating parameter matchers, using an IsNil matcher (rather than an isEqual matcher).
lukeredpath · Jan 10, 2013 · 3fa1af0 · 3fa1af0
1 parent d67518c
commit 3fa1af0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Classes/LRMocky/LRAllParametersMatcher.m b/Classes/LRMocky/LRAllParametersMatcher.m
@@ -9,6 +9,7 @@
 #import "LRAllParametersMatcher.h"
 
 #import <OCHamcrest/HCIsEqual.h>
+#import <OCHamcrest/HCIsNil.h>
 #import <OCHamcrest/HCStringDescription.h>
 #import <OCHamcrest/HCDescription.h>
 
@@ -69,6 +70,9 @@ - (NSArray *)matchersFrom:(NSArray *)parameters
     if ([parameter conformsToProtocol:@protocol(HCMatcher)]) {
       [matchers addObject:parameter];
     }
+    else if (parameter == NSNull.null) {
+      [matchers addObject:HC_nilValue()];
+    }
     else {
       [matchers addObject:HC_equalTo(parameter)];
     }

diff --git a/Tests/Integration/SimpleExpectationTests.m b/Tests/Integration/SimpleExpectationTests.m
@@ -218,7 +218,7 @@ - (void)testCanExpectMethodCallsWithAnythingAndPassWithGivenNil
   assertThat(testCase, passed());
 }
 
-- (void)testCanExpectMethodCallsWithNilParameter
+- (void)testCanExpectMethodCallsWithNilParameterUsingMatcher
 {
   [context check:^{
     [[expectThat(testObject) receives] doSomethingWithObject:nilValue()];
@@ -230,6 +230,18 @@ - (void)testCanExpectMethodCallsWithNilParameter
   assertThat(testCase, passed());
 }
 
+- (void)testCanExpectMethodCallsWithNilParameterUsingNil
+{
+  [context check:^{
+    [[expectThat(testObject) receives] doSomethingWithObject:nil];
+  }];
+
+  [testObject doSomethingWithObject:nil];
+  [context assertSatisfied];
+
+  assertThat(testCase, passed());
+}
+
 //- (void)testCanExpectMethodCallsWithBlockArgumentsWithObjectAndPass;
 //{
 //  [context check:^{