Variations on the syntax.

Author: erikdoe

Source/OCMock/OCMock.h

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

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -210,7 +210,7 @@ - (void)testCanExplicitlySelectClassMethod
 {
     id mock = OCMClassMock([TestClassWithClassMethods class]);
 
-    OCMStub(classMethod([mock bar])).andReturn(@"mocked-class");
+    OCMStub(ClassMethod([mock bar])).andReturn(@"mocked-class");
     OCMStub([mock bar]).andReturn(@"mocked-instance");
 
     XCTAssertEqualObjects(@"mocked-class", [TestClassWithClassMethods bar], @"Should have stubbed class method.");