Merge pull request kiwi-bdd#397 from cristiankocza/id-as-default-retu…

…rn-type

Using the objective-c default return type id instead of void for stubbed methods

Classes/Core/KWExampleSuite.m

@@ -56,7 +56,7 @@ - (NSArray *)invocationsForTestCase {
     // Add a single dummy invocation for each example group
 
     for (KWExample *exampleGroup in self.examples) {
-        NSMethodSignature *methodSignature = [NSMethodSignature signatureWithObjCTypes:[KWEncodingForVoidMethod() UTF8String]];
+        NSMethodSignature *methodSignature = [NSMethodSignature signatureWithObjCTypes:[KWEncodingForDefaultMethod() UTF8String]];
         NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:methodSignature];
         [invocations addObject:invocation];
         [invocation kw_setExample:exampleGroup];

Classes/Core/KWStringUtilities.h

@@ -16,3 +16,4 @@ BOOL KWStringHasWord(NSString *string, NSString *word);
 
 NSString *KWEncodingWithObjCTypes(const char *firstType, ...) NS_REQUIRES_NIL_TERMINATION;
 NSString *KWEncodingForVoidMethod(void);
+NSString *KWEncodingForDefaultMethod(void);

Classes/Core/KWStringUtilities.m

@@ -86,3 +86,7 @@ BOOL KWStringHasWord(NSString *string, NSString *word) {
 NSString *KWEncodingForVoidMethod(void) {
     return KWEncodingWithObjCTypes(@encode(void), @encode(id), @encode(SEL), nil);
 }
+
+NSString *KWEncodingForDefaultMethod(void) {
+    return KWEncodingWithObjCTypes(@encode(id), @encode(id), @encode(SEL), nil);
+}

Classes/Matchers/KWHaveMatcher.m

@@ -199,7 +199,7 @@ + (NSMethodSignature *)invocationCapturer:(KWInvocationCapturer *)anInvocationCa
 
     // Arbitrary selectors are allowed as expectation expression terminals when
     // the subject itself is a collection, so return a dummy method signature.
-    NSString *encoding = KWEncodingForVoidMethod();
+    NSString *encoding = KWEncodingForDefaultMethod();
     return [NSMethodSignature signatureWithObjCTypes:[encoding UTF8String]];
 }
 

Classes/Matchers/KWReceiveMatcher.m

@@ -165,7 +165,7 @@ + (NSMethodSignature *)invocationCapturer:(KWInvocationCapturer *)anInvocationCa
     if ([verifier.subject respondsToSelector:aSelector])
         return [verifier.subject methodSignatureForSelector:aSelector];
 
-    NSString *encoding = KWEncodingForVoidMethod();
+    NSString *encoding = KWEncodingForDefaultMethod();
     return [NSMethodSignature signatureWithObjCTypes:[encoding UTF8String]];
 }
 

Classes/Mocking/KWMock.m

@@ -411,7 +411,7 @@ - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector {
     if (methodSignature != nil)
         return methodSignature;
 
-    NSString *encoding = KWEncodingForVoidMethod();
+    NSString *encoding = KWEncodingForDefaultMethod();
     return [NSMethodSignature signatureWithObjCTypes:[encoding UTF8String]];
 }
 

Classes/Stubbing/NSObject+KiwiStubAdditions.m

@@ -27,7 +27,7 @@ - (NSMethodSignature *)invocationCapturer:(KWInvocationCapturer *)anInvocationCa
     if (signature != nil)
         return signature;
 
-    NSString *encoding = KWEncodingForVoidMethod();
+    NSString *encoding = KWEncodingForDefaultMethod();
     return [NSMethodSignature signatureWithObjCTypes:[encoding UTF8String]];
 }
 

Classes/Verifiers/KWMatchVerifier.m

@@ -126,7 +126,7 @@ - (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector {
 
     // Return a dummy method signature so that problems can be handled in
     // -forwardInvocation:.
-    NSString *encoding = KWEncodingForVoidMethod();
+    NSString *encoding = KWEncodingForDefaultMethod();
     return [NSMethodSignature signatureWithObjCTypes:[encoding UTF8String]];
 }
 

Tests/KWStubTest.m

@@ -153,6 +153,13 @@ - (void)testItShouldRetainValueWhenProcessingInvocationsThatContainsCopy {
     STAssertEquals(retainCountAfter, retainCountBefore + 1, @"expected stub to retain value");
 }
 
+- (void)testItShouldUseIdAsDefaultReturnType{
+    id mock = [Cruiser mock];
+    SEL selector = NSSelectorFromString(@"unknownMethod");
+    [mock stub:selector];
+    STAssertEqualObjects(@([mock methodSignatureForSelector:selector].methodReturnType), @"@", @"expected id as default return type");
+}
+
 @end
 
 #endif // #if KW_TESTS_ENABLED