Fixing an issue with stubs returning BOOL on 64bit iOS

jonreid · Dec 31, 2013 · 45eb99c · 45eb99c
1 parent 9fe6aee
commit 45eb99c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Source/OCMockito/NSInvocation+TKAdditions.m b/Source/OCMockito/NSInvocation+TKAdditions.m
@@ -185,6 +185,11 @@ void MKTSetReturnValueForInvocation(NSInvocation *invocation, id returnValue)
         long long value = [returnValue longLongValue];
         [invocation setReturnValue:&value];
     }
+    else if(strcmp(returnType, @encode(BOOL)) == 0)
+    {
+        BOOL value = [returnValue boolValue];
+        [invocation setReturnValue:&value];
+    }
     else if (strcmp(returnType, @encode(unsigned char)) == 0)
     {
         unsigned char value = [returnValue unsignedCharValue];

diff --git a/Source/Tests/StubProtocolTest.m b/Source/Tests/StubProtocolTest.m
@@ -25,6 +25,7 @@ @protocol ReturningProtocol <NSObject>
 - (id)methodReturningObject;
 - (id)methodReturningObjectWithArg:(id)arg;
 - (id)methodReturningObjectWithIntArg:(int)arg;
+- (BOOL)methodReturningBOOL;
 - (short)methodReturningShort;
 
 @end
@@ -89,6 +90,12 @@ - (void)testShouldSupportShortcutForSpecifyingMatcherForFirstArgument
     assertThat([mockProtocol methodReturningObjectWithIntArg:2], is(@"FOO"));
 }
 
+- (void)testStubbedMethod_ShouldReturnGivenBool
+{
+    [given([mockProtocol methodReturningBOOL]) willReturnBool:YES];
+    assertThatBool([mockProtocol methodReturningBOOL], equalToBool(YES));
+}
+
 - (void)testStubbedMethod_ShouldReturnGivenShort
 {
     [given([mockProtocol methodReturningShort]) willReturnShort:42];