merged master

Author: Ben Asher

Source/OCMock/NSInvocation+OCMAdditions.m

@@ -131,7 +131,7 @@ - (id)getArgumentAtIndexAsObject:(NSInteger)argIndex
 		{
 			long double value;
 			[self getArgument:&value atIndex:argIndex];
-			return [NSValue valueWithBytes:&value objCType:@encode(typeof(value))];
+			return [NSValue valueWithBytes:&value objCType:@encode(__typeof__(value))];
 		}
 		case 'B':
 		{

Source/OCMock/OCMStubRecorder.h

@@ -32,7 +32,7 @@
 
 @interface OCMStubRecorder (Properties)
 
-#define andReturn(aValue) _andReturn(({ typeof(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(typeof(_v))]; }))
+#define andReturn(aValue) _andReturn(({ __typeof__(aValue) _v = (aValue); [NSValue value:&_v withObjCType:@encode(__typeof__(_v))]; }))
 @property (nonatomic, readonly) OCMStubRecorder *(^ _andReturn)(NSValue *);
 
 #define andThrow(anException) _andThrow(anException)

Source/OCMock/OCMockObject.m

@@ -266,18 +266,6 @@ - (void)forwardInvocation:(NSInvocation *)anInvocation
     }
 }
 
-- (OCMInvocationExpectation *)_firstNonNeverExpectation
-{
-    for (OCMInvocationExpectation *expectation in expectations)
-    {
-        if (![expectation isMatchAndReject])
-        {
-            return expectation;
-        }
-    }
-    return nil;
-}
-
 - (BOOL)handleInvocation:(NSInvocation *)anInvocation
 {
     [invocations addObject:anInvocation];
@@ -294,25 +282,35 @@ - (BOOL)handleInvocation:(NSInvocation *)anInvocation
     if(stub == nil)
         return NO;
 
-    if([expectations containsObject:stub])
-    {
-        OCMInvocationExpectation *expectation = [self _firstNonNeverExpectation];
-        if(expectationOrderMatters && expectation && (expectation != stub))
-        {
-            [NSException raise:NSInternalInconsistencyException format:@"%@: unexpected method invoked: %@\n\texpected:\t%@", [self description], [stub description], [[expectations objectAtIndex:0] description]];
-        }
-
-        // We can't check isSatisfied yet, since the stub won't be satisfied until we call handleInvocation:, and we don't want to call handleInvocation: yes for the reason in the comment above, since we'll still have the current expectation in the expectations array, which will cause an exception if expectationOrderMatters is YES and we're not ready for any future expected methods to be called yet
-        if(![(OCMInvocationExpectation *)stub isMatchAndReject])
-        {
-            [expectations removeObject:stub];
-            [stubs removeObject:stub];
-        }
-    }
-    [stub handleInvocation:anInvocation];
-    [stub release];
+     if([expectations containsObject:stub])
+     {
+          OCMInvocationExpectation *expectation = [self _nextExptectedInvocation];
+          if(expectationOrderMatters && (expectation != stub))
+          {
+               [NSException raise:NSInternalInconsistencyException format:@"%@: unexpected method invoked: %@\n\texpected:\t%@",
+                            [self description], [stub description], [[expectations objectAtIndex:0] description]];
+          }
+
+          // We can't check isSatisfied yet, since the stub won't be satisfied until we call handleInvocation:, and we don't want to call handleInvocation: yes for the reason in the comment above, since we'll still have the current expectation in the expectations array, which will cause an exception if expectationOrderMatters is YES and we're not ready for any future expected methods to be called yet
+          if(![(OCMInvocationExpectation *)stub isMatchAndReject])
+          {
+               [expectations removeObject:stub];
+               [stubs removeObject:stub];
+          }
+     }
+     [stub handleInvocation:anInvocation];
+     [stub release];
+
+     return YES;
+}
 
-    return YES;
+
+- (OCMInvocationExpectation *)_nextExptectedInvocation
+{
+    for(OCMInvocationExpectation *expectation in expectations)
+        if(![expectation isMatchAndReject])
+            return expectation;
+    return nil;
 }
 
 - (void)handleUnRecordedInvocation:(NSInvocation *)anInvocation

Source/OCMockTests/NSInvocationOCMAdditionsTests.m

@@ -22,7 +22,7 @@ @implementation NSValue(OCMTestAdditions)
 
 - (id)ocmtest_initWithLongDouble:(long double)ldbl
 {
-    return [self initWithBytes:&ldbl objCType:@encode(typeof(ldbl))];
+    return [self initWithBytes:&ldbl objCType:@encode(__typeof__(ldbl))];
 }
 
 @end

Source/OCMockTests/OCMockObjectPartialMocksTests.m

@@ -245,16 +245,6 @@ - (void)testRefusesToCreatePartialMockForTollFreeBridgedClasses
                                  @"should throw NSInvalidArgumentException exception");
 }
 
-- (void)testRejectThenExpectWithExpectationOrdering
-{
-    TestClassThatCallsSelf *object = [[TestClassThatCallsSelf alloc] init];
-    id mock = OCMPartialMock(object);
-    [mock setExpectationOrderMatters:YES];
-    [[mock reject] method1];
-    [[mock expect] method2];
-    XCTAssertNoThrow([object method2], @"Since method1 should be rejected, we shouldn't expect it to be called before method2.");
-}
-
 - (void)testExpectedMethodCallsExpectedMethodWithExpectationOrdering {
     TestClassThatCallsSelf *object = [[TestClassThatCallsSelf alloc] init];
     id mock = OCMPartialMock(object);

Source/OCMockTests/OCMockObjectTests.m

@@ -824,6 +824,15 @@ - (void)testRaisesExceptionWhenSequenceIsWrongAndOrderMatters
 	XCTAssertThrows([mock uppercaseString], @"Should have complained about wrong sequence.");
 }
 
+- (void)testRejectThenExpectWithExpectationOrdering
+{
+    [mock setExpectationOrderMatters:YES];
+    [[mock reject] lowercaseString];
+    [[mock expect] uppercaseString];
+    XCTAssertNoThrow([mock uppercaseString], @"Since lowercaseString should be rejected, we shouldn't expect it to be called before uppercaseString.");
+}
+
+
 
 // --------------------------------------------------------------------------------------
 //	nice mocks don't complain about unknown methods, unless told to