First attempt to select class method in new syntax.

Author: erikdoe

Source/OCMock.xcodeproj/project.pbxproj

@@ -392,8 +392,8 @@
 				03B316291463350E0052CD09 /* OCObserverMockObjectTests.m */,
 				03B3161F1463350E0052CD09 /* NSInvocationOCMAdditionsTests.m */,
 				2FA28DEDB9163597B7C49F3D /* NSMethodSignatureOCMAdditionsTests.m */,
-				03565A3418F0566F003AE91E /* Supporting Files */,
 				037ECD5318FAD84100AF0E4C /* OCMInvocationMatcherTests.m */,
+				03565A3418F0566F003AE91E /* Supporting Files */,
 			);
 			path = OCMockTests;
 			sourceTree = "<group>";

Source/OCMock/OCMMacroState.h

@@ -10,6 +10,7 @@
 @interface OCMMacroState : NSObject
 {
     BOOL           shouldRecordExpectation;
+    BOOL           shouldRecordAsClassMethod;
     OCMockRecorder *recorder;
 }
 
@@ -24,6 +25,9 @@
 - (void)setShouldRecordExpectation:(BOOL)flag;
 - (BOOL)shouldRecordExpectation;
 
+- (void)setShouldRecordAsClassMethod:(BOOL)flag;
+- (BOOL)shouldRecordAsClassMethod;
+
 - (void)setRecorder:(OCMockRecorder *)aRecorder;
 - (OCMockRecorder *)recorder;
 

Source/OCMock/OCMMacroState.m

@@ -52,6 +52,17 @@ - (BOOL)shouldRecordExpectation
 }
 
 
+- (void)setShouldRecordAsClassMethod:(BOOL)flag
+{
+    shouldRecordAsClassMethod = YES;
+}
+
+- (BOOL)shouldRecordAsClassMethod
+{
+    return shouldRecordAsClassMethod;
+}
+
+
 - (void)setRecorder:(OCMockRecorder *)aRecorder
 {
     if(recorder != nil)

Source/OCMock/OCMock.h

@@ -38,4 +38,8 @@
     [OCMMacroState endExpectMacro]; \
 })
 
+#define classMethod(invocation) \
+    [[OCMMacroState globalState] setShouldRecordAsClassMethod:YES]; \
+    invocation;
+
 #define OCMVerifyAll(mock) [mock verifyAtLocation:OCMMakeLocation(self, __FILE__, __LINE__)]

Source/OCMock/OCMockObject.m

@@ -219,6 +219,8 @@ - (void)forwardInvocation:(NSInvocation *)anInvocation
             recorder = [self expect];
         else
             recorder = [self stub];
+        if([macroState shouldRecordAsClassMethod])
+            [recorder classMethod];
         [recorder forwardInvocation:anInvocation];
         [macroState setRecorder:recorder];
     }

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -24,6 +24,15 @@ - (NSString *)stringValue
 @end
 
 
+// implemented in OCMockObjectClassMethodMockingTests
+
+@interface TestClassWithClassMethods : NSObject
++ (NSString *)foo;
++ (NSString *)bar;
+- (NSString *)bar;
+@end
+
+
 
 @interface OCMockObjectMacroTests : XCTestCase
 {
@@ -197,6 +206,18 @@ - (void)testCanChainPropertyBasedActions
 }
 
 
+- (void)testCanExplicitlySelectClassMethod
+{
+    id mock = OCMClassMock([TestClassWithClassMethods class]);
+
+    OCMStub(classMethod([mock bar])).andReturn(@"mocked-class");
+    OCMStub([mock bar]).andReturn(@"mocked-instance");
+
+    XCTAssertEqualObjects(@"mocked-class", [TestClassWithClassMethods bar], @"Should have stubbed class method.");
+    XCTAssertEqualObjects(@"mocked-instance", [mock bar], @"Should have stubbed instance method.");
+}
+
+
 - (void)testSetsUpExpectations
 {
     id mock = OCMClassMock([TestClassForMacroTesting class]);