Added optional (on by default) short-hand syntax for quantifiers.
diff --git a/Source/OCMock/OCMQuantifier.h b/Source/OCMock/OCMQuantifier.h index 070eb09..e2b4080 100644 --- a/Source/OCMock/OCMQuantifier.h +++ b/Source/OCMock/OCMQuantifier.h
@@ -34,8 +34,16 @@ @end -#define OCMTimes(n) ([OCMQuantifier exactly:(n)]) -#define OCMAtLeastOnce ([OCMQuantifier atLeastOnce]) -#define OCMAtLeast(n) ([OCMQuantifier atLeast:(n)]) -#define OCMNever ([OCMQuantifier never]) -#define OCMAtMost(n) ([OCMQuantifier atMost:(n)]) +#define OCMTimes(n) ([OCMQuantifier exactly:(n)]) +#define OCMAtLeastOnce() ([OCMQuantifier atLeastOnce]) +#define OCMAtLeast(n) ([OCMQuantifier atLeast:(n)]) +#define OCMNever() ([OCMQuantifier never]) +#define OCMAtMost(n) ([OCMQuantifier atMost:(n)]) + +#ifndef OCM_DISABLE_SHORT_SYNTAX +#define times(n) OCMTimes(n) +#define atLeastOnce() OCMAtLeastOnce() +#define atLeast(n) OCMAtLeast(n) +#define never() OCMNever() +#define atMost(n) OCMAtMost(n) +#endif
diff --git a/Source/OCMockTests/OCMQuantifierTests.m b/Source/OCMockTests/OCMQuantifierTests.m index c9c7e8b..7159503 100644 --- a/Source/OCMockTests/OCMQuantifierTests.m +++ b/Source/OCMockTests/OCMQuantifierTests.m
@@ -170,14 +170,14 @@ id mock = OCMClassMock([TestClassForQuantifiers class]); [mock doStuff]; [mock doStuff]; - OCMVerify(OCMAtLeast(2), [mock doStuff]); + OCMVerify(atLeast(2), [mock doStuff]); } - (void)testQuantifierMacroFailure { id mock = OCMClassMock([TestClassForQuantifiers class]); expectFailure = YES; - OCMVerify(OCMAtLeastOnce, [mock doStuff]); + OCMVerify(atLeastOnce(), [mock doStuff]); expectFailure = NO; XCTAssertTrue(didRecordFailure); }