Merge branch 'master' of github.com:erikdoe/ocmock

Author: erikdoe

Source/OCMock/OCClassMockObject.m

@@ -123,7 +123,7 @@ - (void)prepareClassForClassMethodMocking
 
     /* adding forwarder for most class methods (instance methods on meta class) to allow for verify after run */
     NSArray *methodBlackList = @[@"class", @"forwardingTargetForSelector:", @"methodSignatureForSelector:", @"forwardInvocation:", @"isBlock",
-            @"instanceMethodForwarderForSelector:", @"instanceMethodSignatureForSelector:"];
+            @"instanceMethodForwarderForSelector:", @"instanceMethodSignatureForSelector:", @"resolveClassMethod:"];
     [NSObject enumerateMethodsInClass:originalMetaClass usingBlock:^(Class cls, SEL sel) {
         if((cls == object_getClass([NSObject class])) || (cls == [NSObject class]) || (cls == object_getClass(cls)))
             return;

Source/OCMockTests/OCMockObjectRuntimeTests.m

@@ -109,6 +109,28 @@ - (id)initMethodWithNestedInit
 
 @end
 
+@interface TestClassWithResolveMethods : NSObject
+@end
+
+@implementation TestClassWithResolveMethods
+
+- (void)instanceMethod {
+}
+
++ (BOOL)resolveInstanceMethod:(SEL)sel
+{
+  return [super resolveInstanceMethod:sel];
+}
+
++ (void)classMethod {
+}
+
++ (BOOL)resolveClassMethod:(SEL)sel
+{
+  return [super resolveClassMethod:sel];
+}
+
+@end
 
 #pragma mark   Tests for interaction with runtime and foundation conventions
 
@@ -283,6 +305,11 @@ - (void)testDynamicSubclassesShouldBeDisposed
     XCTAssertEqual(numClassesBefore, numClassesAfter, @"Should have disposed dynamically generated classes.");
 }
 
+- (void)testClassesWithResolveMethodsCanBeMocked
+{
+    // If this test fails it will crash due to recursion.
+    __unused id mock = OCMClassMock([TestClassWithResolveMethods class]);
+}
 
 #pragma mark    verify mocks work properly when mocking init