Merge branch 'piotr-tobolski-piotr-tobolski/ocmreject'

Author: erikdoe

Source/Changes.txt

@@ -5,6 +5,7 @@ OCMock 3.3 (unreleased)
 
 * Made the use of mock objects thread safe. You still have to setup the mocks
   and verify them from a main thread (Ian Anderson)
+* Added modern syntax for reject (Piotr Tobolski)
 
 
 OCMock 3.2.2 (2016-01-20)

Source/OCMock/OCMMacroState.h

@@ -33,6 +33,9 @@
 + (void)beginExpectMacro;
 + (OCMStubRecorder *)endExpectMacro;
 
++ (void)beginRejectMacro;
++ (OCMStubRecorder *)endRejectMacro;
+
 + (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation;
 + (void)endVerifyMacro;
 

Source/OCMock/OCMMacroState.m

@@ -60,6 +60,21 @@ + (OCMStubRecorder *)endExpectMacro
 }
 
 
++ (void)beginRejectMacro
+{
+    OCMExpectationRecorder *recorder = [[[OCMExpectationRecorder alloc] init] autorelease];
+    [recorder never];
+    OCMMacroState *macroState = [[OCMMacroState alloc] initWithRecorder:recorder];
+    [NSThread currentThread].threadDictionary[OCMGlobalStateKey] = macroState;
+    [macroState release];
+}
+
++ (OCMStubRecorder *)endRejectMacro
+{
+    return [self endStubMacro];
+}
+
+
 + (void)beginVerifyMacroAtLocation:(OCMLocation *)aLocation
 {
     OCMVerifier *recorder = [[[OCMVerifier alloc] init] autorelease];

Source/OCMock/OCMock.h

@@ -66,6 +66,20 @@
     ); \
 })
 
+#define OCMReject(invocation) \
+({ \
+    _OCMSilenceWarnings( \
+        [OCMMacroState beginRejectMacro]; \
+        OCMStubRecorder *recorder = nil; \
+        @try{ \
+            invocation; \
+        }@finally{ \
+            recorder = [OCMMacroState endRejectMacro]; \
+        } \
+        recorder; \
+    ); \
+})
+
 #define ClassMethod(invocation) \
     _OCMSilenceWarnings( \
         [[OCMMacroState globalState] switchToClassMethod]; \

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -268,6 +268,18 @@ - (void)testSetsUpExpectations
 }
 
 
+- (void)testSetsUpReject
+{
+    id mock = OCMClassMock([TestClassForMacroTesting class]);
+
+    OCMReject([mock stringValue]);
+
+    XCTAssertNoThrow([mock verify], @"Should have accepted invocation rejected method not being invoked");
+    XCTAssertThrows([mock stringValue], @"Should have complained during rejected method being invoked");
+    XCTAssertThrows([mock verify], @"Should have complained about rejected method being invoked");
+}
+
+
 - (void)testShouldNotReportErrorWhenMethodWasInvoked
 {
     id mock = OCMClassMock([NSString class]);