Update OCMock to 3.1.5

third_party/ocmock/OCMock/OCMArg.m

-//---------------------------------------------------------------------------------------
-//  $Id$
-//  Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
+/*
+ *  Copyright (c) 2009-2015 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
 
 #import <objc/runtime.h>
 #import <OCMock/OCMArg.h>
 #import <OCMock/OCMConstraint.h>
 #import "OCMPassByRefSetter.h"
-#import "OCMConstraint.h"
 
 @implementation OCMArg
 
 + (id)any
 {
         return [OCMAnyConstraint constraint];
 }
 
 + (void *)anyPointer
 {
         return (void *)0x01234567;
 }
 
++ (id __autoreleasing *)anyObjectRef
+{
+    return (id *)0x01234567;
+}
+
++ (SEL)anySelector
+{
+    return NSSelectorFromString(@"aSelectorThatMatchesAnySelector");
+}
+
 + (id)isNil
 {
         return [OCMIsNilConstraint constraint];
 }
 
 + (id)isNotNil
 {
         return [OCMIsNotNilConstraint constraint];
 }
 
++ (id)isEqual:(id)value
+{
+    return value;
+}
+
 + (id)isNotEqual:(id)value
 {
         OCMIsNotEqualConstraint *constraint = [OCMIsNotEqualConstraint constraint];
         constraint->testValue = value;
         return constraint;
 }
 
++ (id)isKindOfClass:(Class)cls
+{
+        return [[[OCMBlockConstraint alloc] initWithConstraintBlock:^BOOL(id obj) {
+        return [obj isKindOfClass:cls];
+    }] autorelease];
+}
+
 + (id)checkWithSelector:(SEL)selector onObject:(id)anObject
 {
         return [OCMConstraint constraintWithSelector:selector onObject:anObject];
 }
 
-#if NS_BLOCKS_AVAILABLE
-
-+ (id)checkWithBlock:(BOOL (^)(id))block 
++ (id)checkWithBlock:(BOOL (^)(id))block
 {
         return [[[OCMBlockConstraint alloc] initWithConstraintBlock:block] autorelease];
 }
 
-#endif
++ (id *)setTo:(id)value
+{
+        return (id *)[[[OCMPassByRefSetter alloc] initWithValue:value] autorelease];
+}
 
-+ (id *)setTo:(id)value
++ (void *)setToValue:(NSValue *)value
 {
         return (id *)[[[OCMPassByRefSetter alloc] initWithValue:value] autorelease];
 }
 
 + (id)resolveSpecialValues:(NSValue *)value
 {
         const char *type = [value objCType];
         if(type[0] == '^')
         {
                 void *pointer = [value pointerValue];
                 if(pointer == (void *)0x01234567)
                         return [OCMArg any];
                 if((pointer != NULL) && (object_getClass((id)pointer) == [OCMPassByRefSetter class]))
                         return (id)pointer;
         }
+    else if(type[0] == ':')
+    {
+        SEL selector;
+        [value getValue:&selector];
+        if(selector == NSSelectorFromString(@"aSelectorThatMatchesAnySelector"))
+            return [OCMArg any];
+    }
         return value;
 }
 
+
 @end