Merge branch 'dmaclach-exception_passer'

Author: erikdoe

Source/OCMock/OCMMacroState.h

@@ -26,6 +26,7 @@
 @interface OCMMacroState : NSObject
 {
     id recorder;
+    BOOL invocationDidThrow;
 }
 
 + (void)beginStubMacro;
@@ -48,4 +49,7 @@
 
 - (void)switchToClassMethod;
 
+- (void)setInvocationDidThrow:(BOOL)flag;
+- (BOOL)invocationDidThrow;
+
 @end

Source/OCMock/OCMMacroState.m

@@ -38,8 +38,9 @@ + (OCMStubRecorder *)endStubMacro
     NSMutableDictionary *threadDictionary = [NSThread currentThread].threadDictionary;
     OCMMacroState *globalState = threadDictionary[OCMGlobalStateKey];
     OCMStubRecorder *recorder = [[(OCMStubRecorder *)[globalState recorder] retain] autorelease];
+    BOOL didThrow = [globalState invocationDidThrow];
     [threadDictionary removeObjectForKey:OCMGlobalStateKey];
-	if([recorder wasUsed] == NO)
+	if(didThrow == NO && [recorder wasUsed] == NO)
 	{
 		[NSException raise:NSInternalInconsistencyException
 					format:@"Did not record an invocation in OCMStub/OCMExpect/OCMReject.\n"
@@ -103,8 +104,9 @@ + (void)endVerifyMacro
 	NSMutableDictionary *threadDictionary = [NSThread currentThread].threadDictionary;
 	OCMMacroState *globalState = threadDictionary[OCMGlobalStateKey];
 	OCMVerifier *verifier = [[(OCMVerifier *)[globalState recorder] retain] autorelease];
+    BOOL didThrow = [globalState invocationDidThrow];
 	[threadDictionary removeObjectForKey:OCMGlobalStateKey];
-	if([verifier wasUsed] == NO)
+	if(didThrow == NO && [verifier wasUsed] == NO)
     {
         [NSException raise:NSInternalInconsistencyException
                     format:@"Did not record an invocation in OCMVerify.\n"
@@ -127,7 +129,7 @@ + (OCMMacroState *)globalState
 
 - (id)initWithRecorder:(OCMRecorder *)aRecorder
 {
-    if ((self = [super init]))
+    if((self = [super init]))
     {
         recorder = [aRecorder retain];
     }
@@ -153,6 +155,16 @@ - (OCMRecorder *)recorder
     return recorder;
 }
 
+- (void)setInvocationDidThrow:(BOOL)flag
+{
+    invocationDidThrow = flag;
+}
+
+- (BOOL)invocationDidThrow
+{
+    return invocationDidThrow;
+}
+
 
 #pragma mark  Changing the recorder
 

Source/OCMock/OCMVerifier.m

@@ -23,6 +23,8 @@ @implementation OCMVerifier
 
 - (id)init
 {
+    if(invocationMatcher != nil)
+        [NSException raise:NSInternalInconsistencyException format:@"** Method init invoked twice on verifier. Are you trying to verify the init method? This is currently not supported."];
     if ((self = [super init]))
     {
         invocationMatcher = [[OCMInvocationMatcher alloc] init];

Source/OCMock/OCMock.h

@@ -52,6 +52,9 @@
         OCMStubRecorder *recorder = nil; \
         @try{ \
             invocation; \
+        }@catch(...){ \
+            [[OCMMacroState globalState] setInvocationDidThrow:YES]; \
+            @throw; \
         }@finally{ \
             recorder = [OCMMacroState endStubMacro]; \
         } \
@@ -66,6 +69,9 @@
         OCMStubRecorder *recorder = nil; \
         @try{ \
             invocation; \
+        }@catch(...){ \
+            [[OCMMacroState globalState] setInvocationDidThrow:YES]; \
+            @throw; \
         }@finally{ \
             recorder = [OCMMacroState endExpectMacro]; \
         } \
@@ -80,6 +86,9 @@
         OCMStubRecorder *recorder = nil; \
         @try{ \
             invocation; \
+        }@catch(...){ \
+            [[OCMMacroState globalState] setInvocationDidThrow:YES]; \
+            @throw; \
         }@finally{ \
             recorder = [OCMMacroState endRejectMacro]; \
         } \
@@ -111,6 +120,9 @@
         [OCMMacroState beginVerifyMacroAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]; \
         @try{ \
             invocation; \
+        }@catch(...){ \
+            [[OCMMacroState globalState] setInvocationDidThrow:YES]; \
+            @throw; \
         }@finally{ \
             [OCMMacroState endVerifyMacro]; \
         } \
@@ -123,6 +135,9 @@
         [OCMMacroState beginVerifyMacroAtLocation:OCMMakeLocation(self, __FILE__, __LINE__) withQuantifier:quantifier]; \
         @try{ \
            invocation; \
+        }@catch(...){ \
+            [[OCMMacroState globalState] setInvocationDidThrow:YES]; \
+            @throw; \
         }@finally{ \
             [OCMMacroState endVerifyMacro]; \
         } \

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -503,4 +503,49 @@ - (void)testReturnsCorrectObjectFromInitMethodCalledOnRecorderInsideMacro
     OCMStub([[[[mock ignoringNonObjectArgs] andReturn:nil] andThrow:nil] initWithString:OCMOCK_ANY]);
 }
 
+- (void)testStubMacroPassesExceptionThrough
+{
+    id mock = OCMClassMock([TestClassForMacroTesting class]);
+    @try
+    {
+        OCMStub([mock init]).andReturn(mock);
+        XCTFail(@"An exception should have been thrown.");
+    }
+    @catch(NSException *exception)
+    {
+        XCTAssertEqualObjects(exception.name, NSInternalInconsistencyException);
+        XCTAssertTrue([exception.reason containsString:@"Method init invoked twice on stub recorder"]);
+    }
+}
+
+- (void)testExpectMacroPassesExceptionThrough
+{
+    id mock = OCMClassMock([TestClassForMacroTesting class]);
+    @try
+    {
+        OCMExpect([mock init]).andReturn(mock);
+        XCTFail(@"An exception should have been thrown.");
+    }
+    @catch(NSException *exception)
+    {
+        XCTAssertEqualObjects(exception.name, NSInternalInconsistencyException);
+        XCTAssertTrue([exception.reason containsString:@"Method init invoked twice on stub recorder"]);
+    }
+}
+
+- (void)testVerifyMacroPassExceptionsThrough
+{
+    id mock = OCMClassMock([TestClassForMacroTesting class]);
+    @try
+    {
+        OCMVerify([mock init]);
+        XCTFail(@"An exception should have been thrown.");
+    }
+    @catch(NSException *exception)
+    {
+        XCTAssertEqualObjects(exception.name, NSInternalInconsistencyException);
+        XCTAssertTrue([exception.reason containsString:@"Method init invoked twice on verifier"]);
+    }
+}
+
 @end