Added some enhancements to OCMock.

third_party/ocmock/ocmock_extensions.mm

Index: third_party/ocmock/ocmock_extensions.mm
diff --git a/third_party/ocmock/ocmock_extensions.mm b/third_party/ocmock/ocmock_extensions.mm
new file mode 100644
index 0000000000000000000000000000000000000000..69e15ea0ff904d34c9251b9512418ff72aea8f93
--- /dev/null
+++ b/third_party/ocmock/ocmock_extensions.mm
@@ -0,0 +1,70 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/ocmock/ocmock_extensions.h"
+
+#define CR_OCMOCK_RETURN_IMPL(type_name, type) \
+- (id)andReturn##type_name:(type)value { \

[TVL, 2011/05/20 16:07:05]

indent?

+  return [self andReturnValue:OCMOCK_VALUE(value)]; \
+}
+
+@implementation OCMockRecorder(CrExtensions)
+CR_OCMOCK_RETURN_IMPL(Pointer, const void*);

[TVL, 2011/05/20 16:07:05]

blank line?

+CR_OCMOCK_RETURN_IMPL(Char, char);
+CR_OCMOCK_RETURN_IMPL(UnsignedChar, unsigned char);
+CR_OCMOCK_RETURN_IMPL(Short, short);
+CR_OCMOCK_RETURN_IMPL(UnsignedShort, unsigned short);
+CR_OCMOCK_RETURN_IMPL(Int, int);
+CR_OCMOCK_RETURN_IMPL(UnsignedInt, unsigned int);
+CR_OCMOCK_RETURN_IMPL(Long, long);
+CR_OCMOCK_RETURN_IMPL(UnsignedLong, unsigned long);
+CR_OCMOCK_RETURN_IMPL(LongLong, long long);
+CR_OCMOCK_RETURN_IMPL(UnsignedLongLong, unsigned long long);
+CR_OCMOCK_RETURN_IMPL(Float, float);
+CR_OCMOCK_RETURN_IMPL(Double, double);
+CR_OCMOCK_RETURN_IMPL(Bool, BOOL);
+CR_OCMOCK_RETURN_IMPL(Integer, NSInteger);
+CR_OCMOCK_RETURN_IMPL(UnsignedInteger, NSUInteger);
+
+- (id)andReturnNSRect:(NSRect)rect {
+  return [self andReturnValue:[NSValue valueWithRect:rect]];
+}
+
+- (id)andReturnCGRect:(CGRect)rect {
+  return [self andReturnNSRect:NSRectFromCGRect(rect)];
+}
+
+- (id)andReturnNSPoint:(NSPoint)point {
+  return [self andReturnValue:[NSValue valueWithPoint:point]];
+}
+
+- (id)andReturnCGPoint:(CGPoint)point {
+  return [self andReturnNSPoint:NSPointFromCGPoint(point)];
+}
+
+@end
+
+@implementation cr_OCMConformToProtocolConstraint
+
+- (id)initWithProtocol:(Protocol*)protocol {
+  if (self == [super init]) {
+    protocol_ = protocol;
+  }
+  return self;
+}
+
+- (BOOL)evaluate:(id)value {
+	return [value conformsToProtocol:protocol_];

[TVL, 2011/05/20 16:07:05]

fix indent

+}
+
+@end
+
+@implementation OCMArg(CrExtensions)
+
++ (id)conformsToProtocol:(Protocol*)protocol {
+  return [[[cr_OCMConformToProtocolConstraint alloc] initWithProtocol:protocol]
+          autorelease];
+}
+
+@end