Fix for issue flutter#135.

Author: erikdoe

Source/OCMock/NSInvocation+OCMAdditions.m

@@ -39,16 +39,16 @@ - (id)getArgumentAtIndexAsObject:(NSInteger)argIndex
 
 	if((strlen(argType) > 1) && (strchr("{^", argType[0]) == NULL) && (strcmp("@?", argType) != 0))
 		[NSException raise:NSInvalidArgumentException format:@"Cannot handle argument type '%s'.", argType];
-	
-	switch (argType[0]) 
+
+    if(OCMIsObjectType(argType))
+    {
+        id value;
+     	[self getArgument:&value atIndex:argIndex];
+     	return value;
+    }
+
+	switch(argType[0])
 	{
-		case '#':
-		case '@': 
-		{
-			id value;
-			[self getArgument:&value atIndex:argIndex];
-			return value;
-		}
 		case ':':
  		{
  			SEL s = (SEL)0;

Source/OCMock/OCMFunctions.m

@@ -49,6 +49,11 @@ BOOL OCMIsObjectType(const char *objCType)
     if([regex numberOfMatchesInString:type options:0 range:NSMakeRange(0, type.length)] > 0)
         return YES;
 
+    // if the return type is a block we treat it like an object
+    // TODO: if the runtime were to encode the block's argument and/or return types, this test would not be sufficient
+    if(strcmp(objCType, @encode(void(^)())) == 0)
+        return YES;
+
     return NO;
 }
 

Source/OCMockTests/OCMockObjectRuntimeTests.m

@@ -35,6 +35,23 @@ - (void)aSpecialMethod:(byref in __unused void *)someArg
 @end
 
 
+typedef NSString TypedefString;
+
+@interface TestClassWithTypedefObjectArgument : NSObject
+
+- (NSString *)stringForTypedef:(TypedefString *)string;
+
+@end
+
+@implementation TestClassWithTypedefObjectArgument
+
+- (NSString *)stringForTypedef:(TypedefString *)string
+{
+    return @"Whatever. Doesn't matter.";
+}
+@end
+
+
 @interface TestDelegate : NSObject
 
 - (void)go;
@@ -116,6 +133,15 @@ - (void)testWorksWithTypeQualifiers
     XCTAssertNoThrow([myMock aSpecialMethod:"foo"], @"Should not complain about method with type qualifiers.");
 }
 
+- (void)testWorksWithTypedefsToObjects
+{
+    id myMock = [OCMockObject mockForClass:[TestClassWithTypedefObjectArgument class]];
+    [[[myMock stub] andReturn:@"stubbed"] stringForTypedef:[OCMArg any]];
+     id actualReturn = [myMock stringForTypedef:@"Some arg that shouldn't matter"];
+     XCTAssertEqualObjects(actualReturn, @"stubbed", @"Should have matched invocation.");
+}
+
+
 #if 0 // can't test this with ARC
 - (void)testAdjustsRetainCountWhenStubbingMethodsThatCreateObjects
 {

Source/OCMockTests/OCMockObjectTests.m

@@ -63,6 +63,24 @@ - (OpaquePtr)opaquePtrValue;
 
 @end
 
+@implementation TestClassWithOpaquePointerMethod
+
+typedef struct TestOpaque {
+    int i;
+    int j;
+} TestOpaque;
+
+TestOpaque myOpaque;
+
+- (OpaquePtr)opaquePtrValue
+{
+    myOpaque.i = 3;
+    myOpaque.i = 4;
+    return &myOpaque;
+}
+
+@end
+
 @interface TestClassWithProperty : NSObject
 
 @property (nonatomic, retain) NSString *title;
@@ -889,20 +907,4 @@ - (void)testCanCreateExpectationsAfterInvocations
 
 @end
 
-@implementation TestClassWithOpaquePointerMethod
-
-typedef struct TestOpaque {
-    int i;
-    int j;
-} TestOpaque;
-
-TestOpaque myOpaque;
 
-- (OpaquePtr)opaquePtrValue
-{
-    myOpaque.i = 3;
-    myOpaque.i = 4;
-    return &myOpaque;
-}
-
-@end