Implemented multiple protocols mocking.

tarbayev · tarbayev · commit 8558a080daee · 2016-08-09T16:31:04.000+02:00
diff --git a/Source/OCMock.xcodeproj/project.pbxproj b/Source/OCMock.xcodeproj/project.pbxproj
@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		012412861D5A0B31003B75B8 /* OCProtocolProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012412851D5A0B28003B75B8 /* OCProtocolProxy.m */; };
+		012412871D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012412851D5A0B28003B75B8 /* OCProtocolProxy.m */; };
+		012412881D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012412851D5A0B28003B75B8 /* OCProtocolProxy.m */; };
+		012412891D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 012412851D5A0B28003B75B8 /* OCProtocolProxy.m */; };
 		030EF0B614632FD000B04273 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 030EF0B414632FD000B04273 /* InfoPlist.strings */; };
 		031E50581BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
 		031E50591BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
@@ -346,6 +350,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		012412841D5A0B28003B75B8 /* OCProtocolProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCProtocolProxy.h; sourceTree = "<group>"; };
+		012412851D5A0B28003B75B8 /* OCProtocolProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OCProtocolProxy.m; sourceTree = "<group>"; };
 		030EF0A814632FD000B04273 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		030EF0B314632FD000B04273 /* OCMock-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMock-Info.plist"; sourceTree = "<group>"; };
 		030EF0B514632FD000B04273 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -660,6 +666,8 @@
 				03B31619146334040052CD09 /* Invocation Actions */,
 				03B3161A146334320052CD09 /* Argument Constraints and Actions */,
 				037ECD5618FB0D2E00AF0E4C /* Helper */,
+				012412841D5A0B28003B75B8 /* OCProtocolProxy.h */,
+				012412851D5A0B28003B75B8 /* OCProtocolProxy.m */,
 			);
 			name = "Core Mocks";
 			sourceTree = "<group>";
@@ -1182,6 +1190,7 @@
 				03B315E3146333BF0052CD09 /* OCMNotificationPoster.m in Sources */,
 				03B315E8146333BF0052CD09 /* OCMObserverRecorder.m in Sources */,
 				03B315ED146333C00052CD09 /* OCMockObject.m in Sources */,
+				012412861D5A0B31003B75B8 /* OCProtocolProxy.m in Sources */,
 				03B315F2146333C00052CD09 /* OCMStubRecorder.m in Sources */,
 				03B315F7146333C00052CD09 /* OCMPassByRefSetter.m in Sources */,
 				03B315FC146333C00052CD09 /* OCMRealObjectForwarder.m in Sources */,
@@ -1222,6 +1231,7 @@
 				03B315E0146333BF0052CD09 /* OCMIndirectReturnValueProvider.m in Sources */,
 				03B315E5146333BF0052CD09 /* OCMNotificationPoster.m in Sources */,
 				03B315EA146333BF0052CD09 /* OCMObserverRecorder.m in Sources */,
+				012412871D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */,
 				03B315EF146333C00052CD09 /* OCMockObject.m in Sources */,
 				03B315F4146333C00052CD09 /* OCMStubRecorder.m in Sources */,
 				03B315F9146333C00052CD09 /* OCMPassByRefSetter.m in Sources */,
@@ -1288,6 +1298,7 @@
 				817EB1241BD765130047E85A /* OCMBoxedReturnValueProvider.m in Sources */,
 				817EB1251BD765130047E85A /* OCMExceptionReturnValueProvider.m in Sources */,
 				817EB1261BD765130047E85A /* OCMIndirectReturnValueProvider.m in Sources */,
+				012412891D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */,
 				817EB1271BD765130047E85A /* OCMNotificationPoster.m in Sources */,
 				817EB1281BD765130047E85A /* OCMReturnValueProvider.m in Sources */,
 				817EB1291BD765130047E85A /* OCMLocation.m in Sources */,
@@ -1353,6 +1364,7 @@
 				F0B951191B0080EC00942C38 /* OCMBoxedReturnValueProvider.m in Sources */,
 				F0B9511A1B0080EC00942C38 /* OCMExceptionReturnValueProvider.m in Sources */,
 				F0B9511B1B0080EC00942C38 /* OCMIndirectReturnValueProvider.m in Sources */,
+				012412881D5A0B32003B75B8 /* OCProtocolProxy.m in Sources */,
 				F0B9511C1B0080EC00942C38 /* OCMNotificationPoster.m in Sources */,
 				F0B9511D1B0080EC00942C38 /* OCMReturnValueProvider.m in Sources */,
 				F0B9511E1B0080EC00942C38 /* OCMLocation.m in Sources */,
diff --git a/Source/OCMock/OCMock.h b/Source/OCMock/OCMock.h
@@ -29,9 +29,9 @@
 
 #define OCMStrictClassMock(cls) [OCMockObject mockForClass:cls]
 
-#define OCMProtocolMock(protocol) [OCMockObject niceMockForProtocol:protocol]
+#define OCMProtocolMock(protocol...) [OCMockObject niceMockForProtocols:protocol]
 
-#define OCMStrictProtocolMock(protocol) [OCMockObject mockForProtocol:protocol]
+#define OCMStrictProtocolMock(protocol...) [OCMockObject mockForProtocols:protocol]
 
 #define OCMPartialMock(obj) [OCMockObject partialMockForObject:obj]
 
diff --git a/Source/OCMock/OCMockObject.h b/Source/OCMock/OCMockObject.h
@@ -34,11 +34,11 @@
 }
 
 + (id)mockForClass:(Class)aClass;
-+ (id)mockForProtocol:(Protocol *)aProtocol;
++ (id)mockForProtocols:(Protocol *)aProtocol, ...;
 + (id)partialMockForObject:(NSObject *)anObject;
 
 + (id)niceMockForClass:(Class)aClass;
-+ (id)niceMockForProtocol:(Protocol *)aProtocol;
++ (id)niceMockForProtocols:(Protocol *)aProtocol, ...;
 
 + (id)observerMock;
 
diff --git a/Source/OCMock/OCMockObject.m b/Source/OCMock/OCMockObject.m
@@ -49,9 +49,16 @@ + (id)mockForClass:(Class)aClass
 	return [[[OCClassMockObject alloc] initWithClass:aClass] autorelease];
 }
 
-+ (id)mockForProtocol:(Protocol *)aProtocol
++ (id)mockForProtocols:(Protocol *)aProtocol, ...
 {
-	return [[[OCProtocolMockObject alloc] initWithProtocol:aProtocol] autorelease];
+    va_list protocolsList;
+    va_start(protocolsList, aProtocol);
+
+    id mock = [self _mockForProtocol:aProtocol otherProtocols:protocolsList];
+
+    va_end(protocolsList);
+
+    return mock;
 }
 
 + (id)partialMockForObject:(NSObject *)anObject
@@ -65,11 +72,36 @@ + (id)niceMockForClass:(Class)aClass
 	return [self _makeNice:[self mockForClass:aClass]];
 }
 
-+ (id)niceMockForProtocol:(Protocol *)aProtocol
++ (id)niceMockForProtocols:(Protocol *)aProtocol, ...
 {
-	return [self _makeNice:[self mockForProtocol:aProtocol]];
+    va_list protocolsList;
+    va_start(protocolsList, aProtocol);
+
+    id mock = [self _mockForProtocol:aProtocol otherProtocols:protocolsList];
+
+    va_end(protocolsList);
+
+    return [self _makeNice:mock];
 }
 
++ (id)_mockForProtocol:(Protocol *)aProtocol otherProtocols:(va_list)protocolsList
+{
+    NSParameterAssert(aProtocol != nil);
+
+    NSMutableArray *protocols = [NSMutableArray new];
+
+    while(aProtocol)
+    {
+        [protocols addObject:aProtocol];
+        aProtocol = va_arg(protocolsList, typeof(aProtocol));
+    }
+
+    id result = [[[OCProtocolMockObject alloc] initWithProtocols:protocols] autorelease];
+
+    [protocols release];
+
+    return result;
+}
 
 + (id)_makeNice:(OCMockObject *)mock
 {
diff --git a/Source/OCMock/OCProtocolMockObject.h b/Source/OCMock/OCProtocolMockObject.h
@@ -17,11 +17,8 @@
 #import <OCMock/OCMockObject.h>
 
 @interface OCProtocolMockObject : OCMockObject 
-{
-	Protocol	*mockedProtocol;
-}
 
-- (id)initWithProtocol:(Protocol *)aProtocol;
+- (id)initWithProtocols:(NSArray *)protocols;
 
 @end
 
diff --git a/Source/OCMock/OCProtocolMockObject.m b/Source/OCMock/OCProtocolMockObject.m
@@ -17,42 +17,71 @@
 #import <objc/runtime.h>
 #import "NSMethodSignature+OCMAdditions.h"
 #import "OCProtocolMockObject.h"
+#import "OCProtocolProxy.h"
 
 @implementation OCProtocolMockObject
+{
+    NSArray *protocolProxies;
+}
 
 #pragma mark  Initialisers, description, accessors, etc.
 
-- (id)initWithProtocol:(Protocol *)aProtocol
+- (id)initWithProtocols:(NSArray *)protocols
 {
-    NSParameterAssert(aProtocol != nil);
 	[super init];
-	mockedProtocol = aProtocol;
+
+    NSMutableArray *proxies = [NSMutableArray new];
+
+    for(Protocol *aProtocol in protocols)
+    {
+        OCProtocolProxy *protocolProxy = [[OCProtocolProxy alloc] initWithProtocol:aProtocol];
+        [proxies addObject:protocolProxy];
+        [protocolProxy release];
+    }
+
+	protocolProxies = proxies;
+
 	return self;
 }
 
+- (void)dealloc
+{
+    [protocolProxies release];
+    [super dealloc];
+}
+
 - (NSString *)description
 {
-    const char* name = protocol_getName(mockedProtocol);
-    return [NSString stringWithFormat:@"OCMockObject(%s)", name];
+    NSArray *protocolNames = [protocolProxies valueForKey:NSStringFromSelector(@selector(protocolName))];
+    return [NSString stringWithFormat:@"OCMockObject(%@)", [protocolNames componentsJoinedByString:@", "]];
 }
 
 #pragma mark  Proxy API
 
 - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
 {
-    struct { BOOL isRequired; BOOL isInstance; } opts[4] = { {YES, YES}, {NO, YES}, {YES, NO}, {NO, NO} };
-    for(int i = 0; i < 4; i++)
+    for(OCProtocolProxy *protocolProxy in protocolProxies)
     {
-        struct objc_method_description methodDescription = protocol_getMethodDescription(mockedProtocol, aSelector, opts[i].isRequired, opts[i].isInstance);
-        if(methodDescription.name != NULL)
-            return [NSMethodSignature signatureWithObjCTypes:methodDescription.types];
+        NSMethodSignature *signature = [protocolProxy methodSignatureForSelector:aSelector];
+
+        if(signature)
+        {
+            return signature;
+        }
     }
     return nil;
 }
 
 - (BOOL)conformsToProtocol:(Protocol *)aProtocol
 {
-    return protocol_conformsToProtocol(mockedProtocol, aProtocol);
+    for(OCProtocolProxy *protocolProxy in protocolProxies)
+    {
+        if([protocolProxy conformsToProtocol:aProtocol])
+        {
+            return YES;
+        }
+    }
+    return NO;
 }
 
 - (BOOL)respondsToSelector:(SEL)selector
diff --git a/Source/OCMock/OCProtocolProxy.h b/Source/OCMock/OCProtocolProxy.h
@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2005-2016 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 <Foundation/Foundation.h>
+
+@interface OCProtocolProxy : NSObject
+
+- (id)initWithProtocol:(Protocol *)aProtocol;
+
+- (NSString *)protocolName;
+
+@end
diff --git a/Source/OCMock/OCProtocolProxy.m b/Source/OCMock/OCProtocolProxy.m
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2005-2016 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 "NSMethodSignature+OCMAdditions.h"
+#import "OCProtocolProxy.h"
+
+@implementation OCProtocolProxy
+{
+    Protocol *mockedProtocol;
+}
+
+#pragma mark  Initialisers, description, accessors, etc.
+
+- (id)initWithProtocol:(Protocol *)aProtocol
+{
+    NSParameterAssert(aProtocol != nil);
+    self = [super init];
+    if(self)
+    {
+        mockedProtocol = aProtocol;
+    }
+
+    return self;
+}
+
+- (NSString *)protocolName
+{
+    const char* name = protocol_getName(mockedProtocol);
+    return [NSString stringWithUTF8String:name];
+}
+
+#pragma mark  Proxy API
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
+{
+    struct { BOOL isRequired; BOOL isInstance; } opts[4] = { {YES, YES}, {NO, YES}, {YES, NO}, {NO, NO} };
+    for(int i = 0; i < 4; i++)
+    {
+        struct objc_method_description methodDescription = protocol_getMethodDescription(mockedProtocol, aSelector, opts[i].isRequired, opts[i].isInstance);
+        if(methodDescription.name != NULL)
+            return [NSMethodSignature signatureWithObjCTypes:methodDescription.types];
+    }
+    return nil;
+}
+
+- (BOOL)conformsToProtocol:(Protocol *)aProtocol
+{
+    return protocol_conformsToProtocol(mockedProtocol, aProtocol);
+}
+
+@end
diff --git a/Source/OCMockTests/OCMockObjectProtocolMocksTests.m b/Source/OCMockTests/OCMockObjectProtocolMocksTests.m
