Roll OCMock r77:7f521db0628086185123666b0979e48d6ecaeac1.

BUG=none TEST=unit_tests Review URL: https://chromiumcodereview.appspot.com/9240023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118098 0039d316-1c4b-4281-b951-d872f2087c98
author: rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-01-18 15:59:13 +0000
committer: rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-01-18 15:59:13 +0000
commit: 4e4e75553acc95f32c1e6e65fca6957d11a9a146 (patch)
tree: 17ed8a379174b5a7fa0bf9587f9190edde018a46 /third_party
parent: 6cad92abb5227e9a581edf6b241e074e0b484f6c (diff)
download: chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.zip
chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.tar.gz
chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.tar.bz2
67 files changed, 94 insertions, 2978 deletions
diff --git a/third_party/ocmock/OCMock/Changes.txt b/third_party/ocmock/Changes.txt
index c260412..8ff09c3 100644
--- a/third_party/ocmock/OCMock/Changes.txt
+++ b/third_party/ocmock/Changes.txt
@@ -1,5 +1,15 @@
 Chronological listing of changes. If a particular SVN revision has no entry, that
 check-in did not involve any code or feature changes.
+
+2011-11-03
+
+* Recreated project from scratch with new conventions in Xcode 4.2 (thanks to Matt Di Pasquale)
+
+
+2011-09-26 
+
+* Arguments only need to be equal, don't have to have same class
+
             
 2011-02-15 (r74)
 
diff --git a/third_party/ocmock/OCMock/License.txt b/third_party/ocmock/License.txt
index 2caf9d0..2caf9d0 100644
--- a/third_party/ocmock/OCMock/License.txt
+++ b/third_party/ocmock/License.txt
diff --git a/third_party/ocmock/OCMock/Frameworks/OCHamcrest.tar.bz2 b/third_party/ocmock/OCMock/Frameworks/OCHamcrest.tar.bz2
deleted file mode 100644
index 1a9578a..0000000
--- a/third_party/ocmock/OCMock/Frameworks/OCHamcrest.tar.bz2
+++ /dev/null
diff --git a/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.h b/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.h
index cff38a1..04f22cd 100644
--- a/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.h
+++ b/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSInvocation+OCMAdditions.h 55 2009-10-16 06:42:18Z erik $
+//  $Id$
 //  Copyright (c) 2006-2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.m b/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.m
index df99912..2595523 100644
--- a/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.m
+++ b/third_party/ocmock/OCMock/NSInvocation+OCMAdditions.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSInvocation+OCMAdditions.m 67 2010-08-02 03:25:16Z erik $
+//  $Id$
 //  Copyright (c) 2006-2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -121,7 +121,7 @@
         }
 		case '{': // structure
 		{
-			unsigned maxArgSize = [[self methodSignature] frameLength];
+			NSUInteger maxArgSize = [[self methodSignature] frameLength];
 			NSMutableData *argumentData = [[[NSMutableData alloc] initWithLength:maxArgSize] autorelease];
 			[self getArgument:[argumentData mutableBytes] atIndex:argIndex];
 			return [NSValue valueWithBytes:[argumentData bytes] objCType:argType];
@@ -135,14 +135,14 @@
 - (NSString *)invocationDescription
 {
 	NSMethodSignature *methodSignature = [self methodSignature];
-	unsigned int numberOfArgs = [methodSignature numberOfArguments];
+	NSUInteger numberOfArgs = [methodSignature numberOfArguments];
 	
 	if (numberOfArgs == 2)
 		return NSStringFromSelector([self selector]);
 	
 	NSArray *selectorParts = [NSStringFromSelector([self selector]) componentsSeparatedByString:@":"];
 	NSMutableString *description = [[NSMutableString alloc] init];
-	int i;
+	unsigned int i;
 	for(i = 2; i < numberOfArgs; i++)
 	{
 		[description appendFormat:@"%@%@:", (i > 2 ? @" " : @""), [selectorParts objectAtIndex:(i - 2)]];
diff --git a/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.h b/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.h
deleted file mode 100644
index 3cc5d99..0000000
--- a/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: NSInvocationOCMAdditionsTests.h 21 2008-01-24 18:59:39Z erik $
-//  Copyright (c) 2006-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface NSInvocationOCMAdditionsTests : SenTestCase 
-{
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.m b/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.m
deleted file mode 100644
index fcfbbcd..0000000
--- a/third_party/ocmock/OCMock/NSInvocationOCMAdditionsTests.m
+++ /dev/null
@@ -1,346 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: NSInvocationOCMAdditionsTests.m 55 2009-10-16 06:42:18Z erik $
-//  Copyright (c) 2006-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import "NSInvocationOCMAdditionsTests.h"
-#import "NSInvocation+OCMAdditions.h"
-
-#define TestString @"foo"
-#define TestInt 1
-
-@implementation NSInvocationOCMAdditionsTests
-
-- (void)testInvocationDescriptionWithNoArguments
-{
-	SEL selector = @selector(lowercaseString);
-	NSMethodSignature *signature = [[NSString string] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	
-	STAssertEqualObjects(@"lowercaseString", [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithObjectArgument
-{
-	SEL selector = @selector(isEqualToNumber:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it one argument (starts at index 2)
-	NSNumber *argument = [NSNumber numberWithInt:TestInt];
-	[invocation setArgument:&argument atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"isEqualToNumber:%d", TestInt];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithNSStringArgument
-{
-	SEL selector = @selector(isEqualToString:);
-	NSMethodSignature *signature = [[NSString string] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it one argument (starts at index 2)
-	NSString *argument = [NSString stringWithString:TestString];
-	[invocation setArgument:&argument atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"isEqualToString:@\"%@\"", TestString];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithObjectArguments
-{
-	SEL selector = @selector(setValue:forKey:);
-	NSMethodSignature *signature = [[NSArray array] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it two arguments
-	NSNumber *argumentOne = [NSNumber numberWithInt:TestInt];
-	NSString *argumentTwo = [NSString stringWithString:TestString];
-	[invocation setArgument:&argumentOne atIndex:2];
-	[invocation setArgument:&argumentTwo atIndex:3];
-	
-	NSString *expected = [NSString stringWithFormat:@"setValue:%d forKey:@\"%@\"", TestInt, TestString];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithArrayArgument
-{
-	SEL selector = @selector(addObjectsFromArray:);
-	NSMethodSignature *signature = [[NSMutableArray array] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it one argument (starts at index 2)
-	NSArray *argument = [NSArray arrayWithObject:TestString];
-	[invocation setArgument:&argument atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"addObjectsFromArray:%@", [argument description]];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithIntArgument
-{
-	SEL selector = @selector(initWithInt:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	int argumentOne = TestInt;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithInt:%d", TestInt];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithUnsignedIntArgument
-{
-	SEL selector = @selector(initWithUnsignedInt:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	unsigned int argumentOne = TestInt;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithUnsignedInt:%d", TestInt];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithBoolArgument
-{
-	SEL selector = @selector(initWithBool:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	BOOL argumentOne = TRUE;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithBool:YES"];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithCharArgument
-{
-	SEL selector = @selector(initWithChar:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	char argumentOne = 'd';
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithChar:'%c'", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithUnsignedCharArgument
-{
-	NSNumber *dummyNumber = [NSNumber alloc];
-	
-	SEL selector = @selector(initWithUnsignedChar:);
-	NSMethodSignature *signature = [dummyNumber methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	unsigned char argumentOne = 'd';
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithUnsignedChar:'%c'", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithDoubleArgument
-{
-	SEL selector = @selector(initWithDouble:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	double argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithDouble:%f", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithFloatArgument
-{
-	SEL selector = @selector(initWithFloat:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	float argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithFloat:%f", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithLongArgument
-{
-	SEL selector = @selector(initWithLong:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	long argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithLong:%d", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithUnsignedLongArgument
-{
-	SEL selector = @selector(initWithUnsignedLong:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	unsigned long argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithUnsignedLong:%u", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithLongLongArgument
-{
-	SEL selector = @selector(initWithLongLong:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	long long argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithLongLong:%qi", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithUnsignedLongLongArgument
-{
-	SEL selector = @selector(initWithUnsignedLongLong:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	unsigned long long argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithUnsignedLongLong:%qu", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithShortArgument
-{
-	SEL selector = @selector(initWithShort:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	short argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithShort:%hi", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithUnsignedShortArgument
-{
-	SEL selector = @selector(initWithUnsignedShort:);
-	NSMethodSignature *signature = [[NSNumber alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	unsigned short argumentOne = 1;
-	[invocation setArgument:&argumentOne atIndex:2];
-
-	NSString *expected = [NSString stringWithFormat:@"initWithUnsignedShort:%hu", argumentOne];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-/*
-- (void)testInvocationDescriptionWithStructArgument
-{
-	SEL selector = @selector(setFrameSize:);
-	NSMethodSignature *signature = [[[NSView alloc] init] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	NSSize size;
-	size.width = 1;
-	size.height = 1;
-	[invocation setArgument:&size atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"setFrameSize:(struct)"];
-	STAssertTrue(expected, [[invocation invocationDescription] rangeOfString:description].length > 0, @"");
-}
-*/
-/*
-- (void)testInvocationDescriptionWithCStringArgument
-{
-	SEL selector = @selector(initWithUTF8String:);
-	NSMethodSignature *signature = [[NSString alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	NSString *string = [NSString stringWithString:@"foo"];
-	const char *cString = [string UTF8String]; 
-	[invocation setArgument:&cString atIndex:2];
-
-	NSString *expected = @"initWithUTF8String:\"foo\"";
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-*/
-- (void)testInvocationDescriptionWithSelectorArgument
-{
-	SEL selector = @selector(respondsToSelector:);
-	NSMethodSignature *signature = [[NSString alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	SEL selectorValue = @selector(foo);
-	[invocation setArgument:&selectorValue atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"respondsToSelector:@selector(%@)", NSStringFromSelector(selectorValue)];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-- (void)testInvocationDescriptionWithPointerArgument
-{
-	SEL selector = @selector(initWithBytes:length:);
-	NSMethodSignature *signature = [[NSData alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	NSData *data = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-	const void *bytes = [[@"foo" dataUsingEncoding:NSUTF8StringEncoding] bytes];
-	NSUInteger length = [data length];
-	[invocation setArgument:&bytes atIndex:2];
-	[invocation setArgument:&length atIndex:3];
-	
-	NSString *expected1 = [NSString stringWithFormat:@"initWithBytes:"];
-	NSString *expected2 = [NSString stringWithFormat:@"length:%d", length];
-	NSString *invocationDescription = [invocation invocationDescription];
-	STAssertTrue([invocationDescription rangeOfString:expected1].length > 0, @"");
-	STAssertTrue([invocationDescription rangeOfString:expected2].length > 0, @"");
-}
-
-- (void)testInvocationDescriptionWithNilArgument
-{
-	SEL selector = @selector(initWithString:);
-	NSMethodSignature *signature = [[NSString alloc] methodSignatureForSelector:selector];
-	NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
-	[invocation setSelector:selector];
-	// Give it an argument
-	NSString *argString = nil;
-	[invocation setArgument:&argString atIndex:2];
-	
-	NSString *expected = [NSString stringWithFormat:@"initWithString:nil"];
-	STAssertEqualObjects(expected, [invocation invocationDescription], @"");
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.h b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.h
index 0357f6f..23741e3 100644
--- a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.h
+++ b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSMethodSignature+OCMAdditions.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
index fc40301..a69bb14 100644
--- a/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
+++ b/third_party/ocmock/OCMock/NSMethodSignature+OCMAdditions.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSMethodSignature+OCMAdditions.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.h b/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.h
index 7d5d6d1..ab4832b 100644
--- a/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.h
+++ b/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSNotificationCenter+OCMAdditions.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.m b/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.m
index 117deb0..286cb68 100644
--- a/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.m
+++ b/third_party/ocmock/OCMock/NSNotificationCenter+OCMAdditions.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: NSNotificationCenter+OCMAdditions.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCClassMockObject.h b/third_party/ocmock/OCMock/OCClassMockObject.h
index 439d7dd..69945b2 100644
--- a/third_party/ocmock/OCMock/OCClassMockObject.h
+++ b/third_party/ocmock/OCMock/OCClassMockObject.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCClassMockObject.h 44 2009-05-08 23:20:16Z erik $
+//  $Id$
 //  Copyright (c) 2005-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCClassMockObject.m b/third_party/ocmock/OCMock/OCClassMockObject.m
index 69a122a..65b8fdf 100644
--- a/third_party/ocmock/OCMock/OCClassMockObject.m
+++ b/third_party/ocmock/OCMock/OCClassMockObject.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCClassMockObject.m 45 2009-05-26 18:32:21Z erik $
+//  $Id$
 //  Copyright (c) 2005-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMArg.h b/third_party/ocmock/OCMock/OCMArg.h
index 94ede8f..669c094 100644
--- a/third_party/ocmock/OCMock/OCMArg.h
+++ b/third_party/ocmock/OCMock/OCMArg.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMArg.h 65 2010-07-28 01:49:42Z erik $
+//  $Id$
 //  Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMArg.m b/third_party/ocmock/OCMock/OCMArg.m
index 66b526b..6cf198f 100644
--- a/third_party/ocmock/OCMock/OCMArg.m
+++ b/third_party/ocmock/OCMock/OCMArg.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMArg.m 77 2011-03-17 21:33:59Z erik $
+//  $Id$
 //  Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMBlockCaller.h b/third_party/ocmock/OCMock/OCMBlockCaller.h
index 44feb15..652acc3 100644
--- a/third_party/ocmock/OCMock/OCMBlockCaller.h
+++ b/third_party/ocmock/OCMock/OCMBlockCaller.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMBlockCaller.h 68 2010-08-20 13:20:52Z erik $
+//  $Id$
 //  Copyright (c) 2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMBlockCaller.m b/third_party/ocmock/OCMock/OCMBlockCaller.m
index 97fd866..439d885 100644
--- a/third_party/ocmock/OCMock/OCMBlockCaller.m
+++ b/third_party/ocmock/OCMock/OCMBlockCaller.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//	$Id: OCMBlockCaller.m 57 2010-07-19 06:14:27Z erik $
+//	$Id$
 //  Copyright (c) 2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@
 
 -(id)initWithCallBlock:(void (^)(NSInvocation *))theBlock 
 {
-	[super init];
+	self = [super init];
 	block = [theBlock copy];
 	return self;
 }
diff --git a/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.h b/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.h
index 3f13530..f2d9c91 100644
--- a/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.h
+++ b/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMBoxedReturnValueProvider.h 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.m b/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.m
index 04831af..04fda55 100644
--- a/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.m
+++ b/third_party/ocmock/OCMock/OCMBoxedReturnValueProvider.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMBoxedReturnValueProvider.m 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMConstraint.h b/third_party/ocmock/OCMock/OCMConstraint.h
index 72b23e8..3ae1264 100644
--- a/third_party/ocmock/OCMock/OCMConstraint.h
+++ b/third_party/ocmock/OCMock/OCMConstraint.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMConstraint.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2007-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMConstraint.m b/third_party/ocmock/OCMock/OCMConstraint.m
index 6202747..e70e259 100644
--- a/third_party/ocmock/OCMock/OCMConstraint.m
+++ b/third_party/ocmock/OCMock/OCMConstraint.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMConstraint.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2007-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -121,7 +121,7 @@
 
 - (id)initWithConstraintBlock:(BOOL (^)(id))aBlock;
 {
-	[super init];
+	self = [super init];
 	block = aBlock;
 	return self;
 }
diff --git a/third_party/ocmock/OCMock/OCMConstraintTests.h b/third_party/ocmock/OCMock/OCMConstraintTests.h
deleted file mode 100644
index 309ab85..0000000
--- a/third_party/ocmock/OCMock/OCMConstraintTests.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMConstraintTests.h 57 2010-07-19 06:14:27Z erik $
-//  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-
-@interface OCMConstraintTests : SenTestCase 
-{
-	BOOL didCallCustomConstraint;
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMConstraintTests.m b/third_party/ocmock/OCMock/OCMConstraintTests.m
deleted file mode 100644
index 0d5042a..0000000
--- a/third_party/ocmock/OCMock/OCMConstraintTests.m
+++ /dev/null
@@ -1,131 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMConstraintTests.m 57 2010-07-19 06:14:27Z erik $
-//  Copyright (c) 2004-2010 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import "OCMConstraintTests.h"
-#import <OCMock/OCMConstraint.h>
-
-
-@implementation OCMConstraintTests
-
-- (void)setUp
-{
-	didCallCustomConstraint = NO;
-}
-
-- (void)testAnyAcceptsAnything
-{
-	OCMConstraint *constraint = [OCMAnyConstraint constraint];
-	
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted a value.");
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted another value.");
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted nil.");	
-}
-
-- (void)testIsNilAcceptsOnlyNil
-{
-	OCMConstraint *constraint = [OCMIsNilConstraint constraint];
-	
-	STAssertFalse([constraint evaluate:@"foo"], @"Should not have accepted a value.");
-	STAssertTrue([constraint evaluate:nil], @"Should have accepted nil.");	
-}
-
-- (void)testIsNotNilAcceptsAnythingButNil
-{
-	OCMConstraint *constraint = [OCMIsNotNilConstraint constraint];
-	
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted a value.");
-	STAssertFalse([constraint evaluate:nil], @"Should not have accepted nil.");	
-}
-
-- (void)testNotEqualAcceptsAnythingButValue
-{
-	OCMIsNotEqualConstraint *constraint = [OCMIsNotEqualConstraint constraint];
-	constraint->testValue = @"foo";
-	
-	STAssertFalse([constraint evaluate:@"foo"], @"Should not have accepted value.");
-	STAssertTrue([constraint evaluate:@"bar"], @"Should have accepted other value.");	
-	STAssertTrue([constraint evaluate:nil], @"Should have accepted nil.");	
-}
-
-
-- (BOOL)checkArg:(id)theArg
-{
-	didCallCustomConstraint = YES;
-	return [theArg isEqualToString:@"foo"];
-}
-
-- (void)testUsesPlainMethod
-{
-	OCMConstraint *constraint = CONSTRAINT(@selector(checkArg:));
-
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted foo.");
-	STAssertTrue(didCallCustomConstraint, @"Should have used custom method.");
-	STAssertFalse([constraint evaluate:@"bar"], @"Should not have accepted bar.");
-}
-
-
-- (BOOL)checkArg:(id)theArg withValue:(id)value
-{
-	didCallCustomConstraint = YES;
-	return [theArg isEqual:value];
-}
-
-- (void)testUsesMethodWithValue
-{
-	OCMConstraint *constraint = CONSTRAINTV(@selector(checkArg:withValue:), @"foo");
-
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted foo.");
-	STAssertTrue(didCallCustomConstraint, @"Should have used custom method.");
-	STAssertFalse([constraint evaluate:@"bar"], @"Should not have accepted bar.");
-}
-
-
-- (void)testRaisesExceptionWhenConstraintMethodDoesNotTakeArgument
-{
-	STAssertThrows(CONSTRAINTV(@selector(checkArg:), @"bar"), @"Should have thrown for invalid constraint method.");
-}
-
-
-- (void)testRaisesExceptionOnUnknownSelector
-{
-	STAssertThrows(CONSTRAINTV(@selector(checkArgXXX:), @"bar"), @"Should have thrown for unknown constraint method.");	
-}
-
-
-#if NS_BLOCKS_AVAILABLE
-
--(void)testUsesBlock
-{
-	BOOL (^checkForFooBlock)(id) = ^(id value)
-		{
-			return [value isEqualToString:@"foo"];
-		};
-	
-	OCMBlockConstraint *constraint = [[[OCMBlockConstraint alloc] initWithConstraintBlock:checkForFooBlock] autorelease];
-
-	STAssertTrue([constraint evaluate:@"foo"], @"Should have accepted foo.");
-	STAssertFalse([constraint evaluate:@"bar"], @"Should not have accepted bar.");
-}
-
--(void)testBlockConstraintCanCaptureArgument 
-{
-	__block NSString *captured;
-	BOOL (^captureArgBlock)(id) = ^(id value)
-		{
-			captured = value;
-			return YES;
-		};
-	
-	OCMBlockConstraint *constraint = [[[OCMBlockConstraint alloc] initWithConstraintBlock:captureArgBlock] autorelease];
-
-	[constraint evaluate:@"foo"];
-	STAssertEqualObjects(@"foo", captured, @"Should have captured value from last invocation.");
-	[constraint evaluate:@"bar"];
-	STAssertEqualObjects(@"bar", captured, @"Should have captured value from last invocation.");
-}
-
-#endif
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.h b/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.h
index b50ca07..8e97469 100644
--- a/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.h
+++ b/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMExceptionReturnValueProvider.h 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.m b/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.m
index 60d901c..784d1a79 100644
--- a/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.m
+++ b/third_party/ocmock/OCMock/OCMExceptionReturnValueProvider.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMExceptionReturnValueProvider.m 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.h b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.h
index 490eb47f..4efeacb 100644
--- a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.h
+++ b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMIndirectReturnValueProvider.h 68 2010-08-20 13:20:52Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
index f936950d..c8b734d 100644
--- a/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
+++ b/third_party/ocmock/OCMock/OCMIndirectReturnValueProvider.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMIndirectReturnValueProvider.m 54 2009-08-18 06:27:36Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@
 
 - (id)initWithProvider:(id)aProvider andSelector:(SEL)aSelector
 {
-	[super init];
+	self = [super init];
 	provider = [aProvider retain];
 	selector = aSelector;
 	return self;
diff --git a/third_party/ocmock/OCMock/OCMNotificationPoster.h b/third_party/ocmock/OCMock/OCMNotificationPoster.h
index fd7f05d..817da78 100644
--- a/third_party/ocmock/OCMock/OCMNotificationPoster.h
+++ b/third_party/ocmock/OCMock/OCMNotificationPoster.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMNotificationPoster.h 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMNotificationPoster.m b/third_party/ocmock/OCMock/OCMNotificationPoster.m
index f4a18b8..64973a2 100644
--- a/third_party/ocmock/OCMock/OCMNotificationPoster.m
+++ b/third_party/ocmock/OCMock/OCMNotificationPoster.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMNotificationPoster.m 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -10,7 +10,7 @@
 
 - (id)initWithNotification:(id)aNotification
 {
-	[super init];
+	self = [super init];
 	notification = [aNotification retain];
 	return self;
 }
diff --git a/third_party/ocmock/OCMock/OCMObserverRecorder.h b/third_party/ocmock/OCMock/OCMObserverRecorder.h
index 0e1cd02..556da3c 100644
--- a/third_party/ocmock/OCMock/OCMObserverRecorder.h
+++ b/third_party/ocmock/OCMock/OCMObserverRecorder.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMObserverRecorder.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMObserverRecorder.m b/third_party/ocmock/OCMock/OCMObserverRecorder.m
index 57b9a79..e50be50 100644
--- a/third_party/ocmock/OCMock/OCMObserverRecorder.m
+++ b/third_party/ocmock/OCMock/OCMObserverRecorder.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMObserverRecorder.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMPassByRefSetter.h b/third_party/ocmock/OCMock/OCMPassByRefSetter.h
index 476bfe3..12b99e3 100644
--- a/third_party/ocmock/OCMock/OCMPassByRefSetter.h
+++ b/third_party/ocmock/OCMock/OCMPassByRefSetter.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMPassByRefSetter.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMPassByRefSetter.m b/third_party/ocmock/OCMock/OCMPassByRefSetter.m
index 17071f3..919b81a 100644
--- a/third_party/ocmock/OCMock/OCMPassByRefSetter.m
+++ b/third_party/ocmock/OCMock/OCMPassByRefSetter.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMPassByRefSetter.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -10,7 +10,7 @@
 
 - (id)initWithValue:(id)aValue
 {
-	[super init];
+	self = [super init];
 	value = [aValue retain];
 	return self;
 }
diff --git a/third_party/ocmock/OCMock/OCMRealObjectForwarder.h b/third_party/ocmock/OCMock/OCMRealObjectForwarder.h
index 114c91d..9357a42 100644
--- a/third_party/ocmock/OCMock/OCMRealObjectForwarder.h
+++ b/third_party/ocmock/OCMock/OCMRealObjectForwarder.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMRealObjectForwarder.h 68 2010-08-20 13:20:52Z erik $
+//  $Id$
 //  Copyright (c) 2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMRealObjectForwarder.m b/third_party/ocmock/OCMock/OCMRealObjectForwarder.m
index 1db22d7..7c0a7db 100644
--- a/third_party/ocmock/OCMock/OCMRealObjectForwarder.m
+++ b/third_party/ocmock/OCMock/OCMRealObjectForwarder.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMRealObjectForwarder.m 70 2010-08-20 16:06:51Z erik $
+//  $Id$
 //  Copyright (c) 2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMReturnValueProvider.h b/third_party/ocmock/OCMock/OCMReturnValueProvider.h
index 5554ebd..3566c6d 100644
--- a/third_party/ocmock/OCMock/OCMReturnValueProvider.h
+++ b/third_party/ocmock/OCMock/OCMReturnValueProvider.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMReturnValueProvider.h 50 2009-07-16 06:48:19Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMReturnValueProvider.m b/third_party/ocmock/OCMock/OCMReturnValueProvider.m
index 601b773..d98b59c 100644
--- a/third_party/ocmock/OCMock/OCMReturnValueProvider.m
+++ b/third_party/ocmock/OCMock/OCMReturnValueProvider.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMReturnValueProvider.m 52 2009-08-14 07:21:10Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@
 
 - (id)initWithValue:(id)aValue
 {
-	[super init];
+	self = [super init];
 	returnValue = [aValue retain];
 	return self;
 }
@@ -26,7 +26,7 @@
 {
 	const char *returnType = [[anInvocation methodSignature] methodReturnTypeWithoutQualifiers];
 	if(strcmp(returnType, @encode(id)) != 0)
-		@throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Expected invocation with object return type." userInfo:nil];
+		@throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Expected invocation with object return type. Did you mean to use andReturnValue: instead?" userInfo:nil];
 	[anInvocation setReturnValue:&returnValue];	
 }
 
diff --git a/third_party/ocmock/OCMock/Info.plist b/third_party/ocmock/OCMock/OCMock-Info.plist
index 2105497..4bd402c 100644
--- a/third_party/ocmock/OCMock/Info.plist
+++ b/third_party/ocmock/OCMock/OCMock-Info.plist
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>OCMock</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>OCMock</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mulle-kybernetik.OCMock</string>
+	<string>com.mulle-kybernetik.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.29</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2004-2009 Mulle Kybernetik.</string>
+	<string>Copyright © 2004-2011 Mulle Kybernetik.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/third_party/ocmock/OCMock/OCMock-Prefix.pch b/third_party/ocmock/OCMock/OCMock-Prefix.pch
new file mode 100644
index 0000000..9f3ef37
--- /dev/null
+++ b/third_party/ocmock/OCMock/OCMock-Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'OCMock' target in the 'OCMock' project
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif
diff --git a/third_party/ocmock/OCMock/OCMock.h b/third_party/ocmock/OCMock/OCMock.h
index 892b3cc..e18de58 100644
--- a/third_party/ocmock/OCMock/OCMock.h
+++ b/third_party/ocmock/OCMock/OCMock.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMock.h 39 2009-04-09 05:31:28Z erik $
+//  $Id$
 //  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMock.xcodeproj/project.pbxproj b/third_party/ocmock/OCMock/OCMock.xcodeproj/project.pbxproj
deleted file mode 100644
index 1d6806b..0000000
--- a/third_party/ocmock/OCMock/OCMock.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1238 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 44;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		03DAC03611FEB870007AF17B /* OCMockLib */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 03DAC03E11FEB87D007AF17B /* Build configuration list for PBXAggregateTarget "OCMockLib" */;
-			buildPhases = (
-				03DAC04011FEB897007AF17B /* ShellScript */,
-			);
-			dependencies = (
-				03DAC03A11FEB87B007AF17B /* PBXTargetDependency */,
-				03DAC03C11FEB87B007AF17B /* PBXTargetDependency */,
-			);
-			name = OCMockLib;
-			productName = OCMockLib;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		030106730A3B9B240049FED7 /* NSInvocationOCMAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 030106470A3B99F20049FED7 /* NSInvocationOCMAdditionsTests.m */; };
-		032797870E09F40E006CA665 /* OCHamcrest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 032797860E09F40E006CA665 /* OCHamcrest.framework */; };
-		032798030E09F8B7006CA665 /* OCMockObjectHamcrestTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 032798020E09F8B7006CA665 /* OCMockObjectHamcrestTests.mm */; };
-		0338A99807BE7C100066DE8A /* OCClassMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A99607BE7C100066DE8A /* OCClassMockObject.h */; };
-		0338A99907BE7C100066DE8A /* OCClassMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A99707BE7C100066DE8A /* OCClassMockObject.m */; };
-		0338A9F007BE83B50066DE8A /* OCProtocolMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A9EE07BE83B50066DE8A /* OCProtocolMockObject.h */; settings = {ATTRIBUTES = (); }; };
-		0338A9F107BE83B50066DE8A /* OCProtocolMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A9EF07BE83B50066DE8A /* OCProtocolMockObject.m */; };
-		033C857411F58C110009B9CD /* NSNotificationCenter+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D880D40F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m */; };
-		033C857511F58C130009B9CD /* NSNotificationCenter+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D880D30F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0340A5BB121E973000158484 /* OCMRealObjectForwarder.h in Headers */ = {isa = PBXBuildFile; fileRef = 0340A5B9121E973000158484 /* OCMRealObjectForwarder.h */; };
-		0340A5BC121E973000158484 /* OCMRealObjectForwarder.m in Sources */ = {isa = PBXBuildFile; fileRef = 0340A5BA121E973000158484 /* OCMRealObjectForwarder.m */; };
-		0340A5BD121E973000158484 /* OCMRealObjectForwarder.h in Headers */ = {isa = PBXBuildFile; fileRef = 0340A5B9121E973000158484 /* OCMRealObjectForwarder.h */; };
-		0340A5BE121E973000158484 /* OCMRealObjectForwarder.m in Sources */ = {isa = PBXBuildFile; fileRef = 0340A5BA121E973000158484 /* OCMRealObjectForwarder.m */; };
-		0340A5BF121E973000158484 /* OCMRealObjectForwarder.h in Headers */ = {isa = PBXBuildFile; fileRef = 0340A5B9121E973000158484 /* OCMRealObjectForwarder.h */; };
-		0340A5C0121E973000158484 /* OCMRealObjectForwarder.m in Sources */ = {isa = PBXBuildFile; fileRef = 0340A5BA121E973000158484 /* OCMRealObjectForwarder.m */; };
-		0343133E0CCA771800A2E080 /* OCMConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0343133B0CCA771800A2E080 /* OCMConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0343133F0CCA771800A2E080 /* OCMConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 0343133C0CCA771800A2E080 /* OCMConstraint.m */; };
-		034313EA0CCA7BC700A2E080 /* OCMConstraintTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 034313E90CCA7BC700A2E080 /* OCMConstraintTests.m */; };
-		0378606E0F6A32F800A4D9A0 /* OCMArg.h in Headers */ = {isa = PBXBuildFile; fileRef = 0378606B0F6A32F800A4D9A0 /* OCMArg.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0378606F0F6A32F800A4D9A0 /* OCMArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 0378606C0F6A32F800A4D9A0 /* OCMArg.m */; };
-		037860E30F6A3D4600A4D9A0 /* OCMPassByRefSetter.h in Headers */ = {isa = PBXBuildFile; fileRef = 037860E00F6A3D4600A4D9A0 /* OCMPassByRefSetter.h */; };
-		037860E40F6A3D4600A4D9A0 /* OCMPassByRefSetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 037860E10F6A3D4600A4D9A0 /* OCMPassByRefSetter.m */; };
-		037C13450FCC474D00257C8C /* OCPartialMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 037C13420FCC474D00257C8C /* OCPartialMockRecorder.h */; };
-		037C13460FCC474D00257C8C /* OCPartialMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 037C13430FCC474D00257C8C /* OCPartialMockRecorder.m */; };
-		03A2D0CB09F01D13008A1AFD /* NSInvocation+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03A2D0C909F01D13008A1AFD /* NSInvocation+OCMAdditions.h */; settings = {ATTRIBUTES = (); }; };
-		03A2D0CC09F01D13008A1AFD /* NSInvocation+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A2D0CA09F01D13008A1AFD /* NSInvocation+OCMAdditions.m */; };
-		03BF2D4008F1C6BA00978C59 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03BF2D1B08F1C26700978C59 /* SenTestingKit.framework */; };
-		03BF2D4108F1C6BC00978C59 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DE218F06DB91CF00E5A2A8 /* Foundation.framework */; };
-		03BF2D5E08F1C82C00978C59 /* OCMockRecorderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F6106DB914100E5A2A8 /* OCMockRecorderTests.m */; };
-		03BF2D5F08F1C82D00978C59 /* OCMockObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5F06DB914100E5A2A8 /* OCMockObjectTests.m */; };
-		03C36703100D69EB00BE9731 /* OCMReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36701100D69EB00BE9731 /* OCMReturnValueProvider.h */; };
-		03C36704100D69EB00BE9731 /* OCMReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36702100D69EB00BE9731 /* OCMReturnValueProvider.m */; };
-		03C36724100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36722100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h */; };
-		03C36725100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36723100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m */; };
-		03C36729100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36727100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h */; };
-		03C3672A100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36728100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m */; };
-		03C3672E100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C3672C100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h */; };
-		03C3672F100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C3672D100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m */; };
-		03C36775100D744700BE9731 /* OCMNotificationPoster.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36773100D744700BE9731 /* OCMNotificationPoster.h */; };
-		03C36776100D744700BE9731 /* OCMNotificationPoster.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36774100D744700BE9731 /* OCMNotificationPoster.m */; };
-		03CFB08C117B308C00935C1E /* OCMBlockCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CFB089117B308C00935C1E /* OCMBlockCaller.h */; };
-		03CFB08D117B308C00935C1E /* OCMBlockCaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 03CFB08A117B308C00935C1E /* OCMBlockCaller.m */; };
-		03D880550F8C75980087D071 /* OCObserverMockObjectTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D880540F8C75980087D071 /* OCObserverMockObjectTest.m */; };
-		03D880610F8C81DE0087D071 /* OCObserverMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8805E0F8C81DE0087D071 /* OCObserverMockObject.h */; };
-		03D880620F8C81DE0087D071 /* OCObserverMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8805F0F8C81DE0087D071 /* OCObserverMockObject.m */; };
-		03D880D50F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D880D30F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03D880D60F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D880D40F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m */; };
-		03D881090F8DB0BB0087D071 /* OCMObserverRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D881070F8DB0BB0087D071 /* OCMObserverRecorder.h */; };
-		03D8815B0F8DB37B0087D071 /* OCMObserverRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8815A0F8DB37B0087D071 /* OCMObserverRecorder.m */; };
-		03D8822F0FA151E20087D071 /* OCPartialMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8822D0FA151E10087D071 /* OCPartialMockObject.h */; };
-		03D882300FA151E20087D071 /* OCPartialMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8822E0FA151E20087D071 /* OCPartialMockObject.m */; };
-		03DABFF111FEB771007AF17B /* NSNotificationCenter+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D880D30F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DABFF211FEB771007AF17B /* NSMethodSignature+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03F1FE8710353A5F00E4962C /* NSMethodSignature+OCMAdditions.h */; };
-		03DABFF311FEB771007AF17B /* NSInvocation+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03A2D0C909F01D13008A1AFD /* NSInvocation+OCMAdditions.h */; };
-		03DABFF411FEB771007AF17B /* OCMPassByRefSetter.h in Headers */ = {isa = PBXBuildFile; fileRef = 037860E00F6A3D4600A4D9A0 /* OCMPassByRefSetter.h */; };
-		03DABFF511FEB771007AF17B /* OCMConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0343133B0CCA771800A2E080 /* OCMConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DABFF611FEB771007AF17B /* OCMArg.h in Headers */ = {isa = PBXBuildFile; fileRef = 0378606B0F6A32F800A4D9A0 /* OCMArg.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DABFF711FEB771007AF17B /* OCMObserverRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D881070F8DB0BB0087D071 /* OCMObserverRecorder.h */; };
-		03DABFF811FEB771007AF17B /* OCObserverMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8805E0F8C81DE0087D071 /* OCObserverMockObject.h */; };
-		03DABFF911FEB771007AF17B /* OCPartialMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 037C13420FCC474D00257C8C /* OCPartialMockRecorder.h */; };
-		03DABFFA11FEB771007AF17B /* OCPartialMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8822D0FA151E10087D071 /* OCPartialMockObject.h */; };
-		03DABFFB11FEB771007AF17B /* OCMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5606DB911300E5A2A8 /* OCMockRecorder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DABFFC11FEB771007AF17B /* OCProtocolMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A9EE07BE83B50066DE8A /* OCProtocolMockObject.h */; };
-		03DABFFD11FEB771007AF17B /* OCClassMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A99607BE7C100066DE8A /* OCClassMockObject.h */; };
-		03DABFFE11FEB771007AF17B /* OCMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5406DB911300E5A2A8 /* OCMockObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DABFFF11FEB771007AF17B /* OCMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE21B206DB95C500E5A2A8 /* OCMock.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DAC00011FEB771007AF17B /* OCMBlockCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CFB089117B308C00935C1E /* OCMBlockCaller.h */; };
-		03DAC00111FEB771007AF17B /* OCMNotificationPoster.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36773100D744700BE9731 /* OCMNotificationPoster.h */; };
-		03DAC00211FEB771007AF17B /* OCMIndirectReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C3672C100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h */; };
-		03DAC00311FEB771007AF17B /* OCMExceptionReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36727100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h */; };
-		03DAC00411FEB771007AF17B /* OCMBoxedReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36722100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h */; };
-		03DAC00511FEB771007AF17B /* OCMReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36701100D69EB00BE9731 /* OCMReturnValueProvider.h */; };
-		03DAC00711FEB771007AF17B /* NSNotificationCenter+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D880D40F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m */; };
-		03DAC00811FEB771007AF17B /* NSMethodSignature+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03F1FE8810353A5F00E4962C /* NSMethodSignature+OCMAdditions.m */; };
-		03DAC00911FEB771007AF17B /* NSInvocation+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A2D0CA09F01D13008A1AFD /* NSInvocation+OCMAdditions.m */; };
-		03DAC00A11FEB771007AF17B /* OCMPassByRefSetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 037860E10F6A3D4600A4D9A0 /* OCMPassByRefSetter.m */; };
-		03DAC00B11FEB771007AF17B /* OCMConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 0343133C0CCA771800A2E080 /* OCMConstraint.m */; };
-		03DAC00C11FEB771007AF17B /* OCMArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 0378606C0F6A32F800A4D9A0 /* OCMArg.m */; };
-		03DAC00D11FEB771007AF17B /* OCMObserverRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8815A0F8DB37B0087D071 /* OCMObserverRecorder.m */; };
-		03DAC00E11FEB771007AF17B /* OCObserverMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8805F0F8C81DE0087D071 /* OCObserverMockObject.m */; };
-		03DAC00F11FEB771007AF17B /* OCPartialMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 037C13430FCC474D00257C8C /* OCPartialMockRecorder.m */; };
-		03DAC01011FEB771007AF17B /* OCPartialMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8822E0FA151E20087D071 /* OCPartialMockObject.m */; };
-		03DAC01111FEB771007AF17B /* OCMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5706DB911300E5A2A8 /* OCMockRecorder.m */; };
-		03DAC01211FEB771007AF17B /* OCProtocolMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A9EF07BE83B50066DE8A /* OCProtocolMockObject.m */; };
-		03DAC01311FEB771007AF17B /* OCClassMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A99707BE7C100066DE8A /* OCClassMockObject.m */; };
-		03DAC01411FEB771007AF17B /* OCMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5506DB911300E5A2A8 /* OCMockObject.m */; };
-		03DAC01511FEB771007AF17B /* OCMBlockCaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 03CFB08A117B308C00935C1E /* OCMBlockCaller.m */; };
-		03DAC01611FEB771007AF17B /* OCMNotificationPoster.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36774100D744700BE9731 /* OCMNotificationPoster.m */; };
-		03DAC01711FEB771007AF17B /* OCMIndirectReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C3672D100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m */; };
-		03DAC01811FEB771007AF17B /* OCMExceptionReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36728100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m */; };
-		03DAC01911FEB771007AF17B /* OCMBoxedReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36723100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m */; };
-		03DAC01A11FEB771007AF17B /* OCMReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36702100D69EB00BE9731 /* OCMReturnValueProvider.m */; };
-		03DE1F5806DB911300E5A2A8 /* OCMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5406DB911300E5A2A8 /* OCMockObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DE1F5906DB911300E5A2A8 /* OCMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5506DB911300E5A2A8 /* OCMockObject.m */; };
-		03DE1F5A06DB911300E5A2A8 /* OCMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5606DB911300E5A2A8 /* OCMockRecorder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DE1F5B06DB911300E5A2A8 /* OCMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5706DB911300E5A2A8 /* OCMockRecorder.m */; };
-		03DE219006DB91CF00E5A2A8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03DE218F06DB91CF00E5A2A8 /* Foundation.framework */; };
-		03DE21B306DB95C500E5A2A8 /* OCMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE21B206DB95C500E5A2A8 /* OCMock.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03DE221706DB97DA00E5A2A8 /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 03DE221606DB97DA00E5A2A8 /* License.txt */; };
-		03E41D9611F5A83D00147791 /* NSMethodSignature+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03F1FE8810353A5F00E4962C /* NSMethodSignature+OCMAdditions.m */; };
-		03E41D9711F5A83E00147791 /* NSMethodSignature+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03F1FE8710353A5F00E4962C /* NSMethodSignature+OCMAdditions.h */; };
-		03E41D9811F5A83E00147791 /* NSInvocation+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A2D0CA09F01D13008A1AFD /* NSInvocation+OCMAdditions.m */; };
-		03E41D9911F5A83F00147791 /* NSInvocation+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03A2D0C909F01D13008A1AFD /* NSInvocation+OCMAdditions.h */; };
-		03E41D9A11F5A84000147791 /* OCMPassByRefSetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 037860E10F6A3D4600A4D9A0 /* OCMPassByRefSetter.m */; };
-		03E41D9B11F5A84100147791 /* OCMPassByRefSetter.h in Headers */ = {isa = PBXBuildFile; fileRef = 037860E00F6A3D4600A4D9A0 /* OCMPassByRefSetter.h */; };
-		03E41D9C11F5A84200147791 /* OCMConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 0343133C0CCA771800A2E080 /* OCMConstraint.m */; };
-		03E41D9D11F5A84200147791 /* OCMConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0343133B0CCA771800A2E080 /* OCMConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03E41D9E11F5A84300147791 /* OCMArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 0378606C0F6A32F800A4D9A0 /* OCMArg.m */; };
-		03E41D9F11F5A84400147791 /* OCMArg.h in Headers */ = {isa = PBXBuildFile; fileRef = 0378606B0F6A32F800A4D9A0 /* OCMArg.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03E41DA011F5A84500147791 /* OCMObserverRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8815A0F8DB37B0087D071 /* OCMObserverRecorder.m */; };
-		03E41DA111F5A84600147791 /* OCMObserverRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D881070F8DB0BB0087D071 /* OCMObserverRecorder.h */; };
-		03E41DA211F5A84700147791 /* OCObserverMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8805F0F8C81DE0087D071 /* OCObserverMockObject.m */; };
-		03E41DA311F5A84800147791 /* OCObserverMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8805E0F8C81DE0087D071 /* OCObserverMockObject.h */; };
-		03E41DA411F5A84F00147791 /* OCPartialMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 037C13430FCC474D00257C8C /* OCPartialMockRecorder.m */; };
-		03E41DA511F5A85000147791 /* OCPartialMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 037C13420FCC474D00257C8C /* OCPartialMockRecorder.h */; };
-		03E41DA611F5A85100147791 /* OCPartialMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03D8822E0FA151E20087D071 /* OCPartialMockObject.m */; };
-		03E41DA711F5A85200147791 /* OCPartialMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03D8822D0FA151E10087D071 /* OCPartialMockObject.h */; };
-		03E41DA811F5A85600147791 /* OCMockRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5706DB911300E5A2A8 /* OCMockRecorder.m */; };
-		03E41DA911F5A85600147791 /* OCMockRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5606DB911300E5A2A8 /* OCMockRecorder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03E41DAA11F5A85800147791 /* OCProtocolMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A9EF07BE83B50066DE8A /* OCProtocolMockObject.m */; };
-		03E41DAB11F5A85800147791 /* OCProtocolMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A9EE07BE83B50066DE8A /* OCProtocolMockObject.h */; };
-		03E41DAC11F5A85900147791 /* OCClassMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 0338A99707BE7C100066DE8A /* OCClassMockObject.m */; };
-		03E41DAD11F5A85900147791 /* OCClassMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0338A99607BE7C100066DE8A /* OCClassMockObject.h */; };
-		03E41DAE11F5A85A00147791 /* OCMockObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 03DE1F5506DB911300E5A2A8 /* OCMockObject.m */; };
-		03E41DAF11F5A85B00147791 /* OCMockObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE1F5406DB911300E5A2A8 /* OCMockObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03E41DB011F5A85E00147791 /* OCMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 03DE21B206DB95C500E5A2A8 /* OCMock.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03E41DB111F5A86300147791 /* OCMBlockCaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 03CFB08A117B308C00935C1E /* OCMBlockCaller.m */; };
-		03E41DB211F5A86300147791 /* OCMBlockCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CFB089117B308C00935C1E /* OCMBlockCaller.h */; };
-		03E41DB311F5A86400147791 /* OCMNotificationPoster.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36774100D744700BE9731 /* OCMNotificationPoster.m */; };
-		03E41DB411F5A86400147791 /* OCMNotificationPoster.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36773100D744700BE9731 /* OCMNotificationPoster.h */; };
-		03E41DB511F5A86500147791 /* OCMIndirectReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C3672D100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m */; };
-		03E41DB611F5A86600147791 /* OCMIndirectReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C3672C100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h */; };
-		03E41DB711F5A86800147791 /* OCMExceptionReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36728100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m */; };
-		03E41DB811F5A86800147791 /* OCMExceptionReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36727100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h */; };
-		03E41DB911F5A86900147791 /* OCMBoxedReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36723100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m */; };
-		03E41DBA11F5A86A00147791 /* OCMBoxedReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36722100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h */; };
-		03E41DBB11F5A86B00147791 /* OCMReturnValueProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 03C36702100D69EB00BE9731 /* OCMReturnValueProvider.m */; };
-		03E41DBC11F5A86C00147791 /* OCMReturnValueProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 03C36701100D69EB00BE9731 /* OCMReturnValueProvider.h */; };
-		03F1FE8A10353A5F00E4962C /* NSMethodSignature+OCMAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 03F1FE8710353A5F00E4962C /* NSMethodSignature+OCMAdditions.h */; };
-		03F1FE8B10353A5F00E4962C /* NSMethodSignature+OCMAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 03F1FE8810353A5F00E4962C /* NSMethodSignature+OCMAdditions.m */; };
-		8DC2EF510486A6940098B216 /* OCMock_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCF5E0370ADEE00C91783 /* OCMock_Prefix.pch */; };
-		9F35D3DC0D349E7E00C05E52 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* OCMock.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		03DAC03911FEB87B007AF17B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 033C84AE11F585CB0009B9CD;
-			remoteInfo = OCMockPhoneSim;
-		};
-		03DAC03B11FEB87B007AF17B /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 03DABFEF11FEB771007AF17B;
-			remoteInfo = OCMockPhoneDevice;
-		};
-		9F35D3D40D349B5300C05E52 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-			remoteInfo = OCMock;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		030106470A3B99F20049FED7 /* NSInvocationOCMAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSInvocationOCMAdditionsTests.m; sourceTree = "<group>"; };
-		032797860E09F40E006CA665 /* OCHamcrest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCHamcrest.framework; path = build/Frameworks/OCHamcrest.framework; sourceTree = "<group>"; };
-		032798010E09F8B7006CA665 /* OCMockObjectHamcrestTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObjectHamcrestTests.h; sourceTree = "<group>"; };
-		032798020E09F8B7006CA665 /* OCMockObjectHamcrestTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OCMockObjectHamcrestTests.mm; sourceTree = "<group>"; };
-		0338A99607BE7C100066DE8A /* OCClassMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCClassMockObject.h; sourceTree = "<group>"; };
-		0338A99707BE7C100066DE8A /* OCClassMockObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCClassMockObject.m; sourceTree = "<group>"; };
-		0338A9EE07BE83B50066DE8A /* OCProtocolMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCProtocolMockObject.h; sourceTree = "<group>"; };
-		0338A9EF07BE83B50066DE8A /* OCProtocolMockObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCProtocolMockObject.m; sourceTree = "<group>"; };
-		033C84AF11F585CB0009B9CD /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		0340A5B9121E973000158484 /* OCMRealObjectForwarder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRealObjectForwarder.h; sourceTree = "<group>"; };
-		0340A5BA121E973000158484 /* OCMRealObjectForwarder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMRealObjectForwarder.m; sourceTree = "<group>"; };
-		0343133B0CCA771800A2E080 /* OCMConstraint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OCMConstraint.h; sourceTree = "<group>"; };
-		0343133C0CCA771800A2E080 /* OCMConstraint.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OCMConstraint.m; sourceTree = "<group>"; };
-		034313E80CCA7BC700A2E080 /* OCMConstraintTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMConstraintTests.h; sourceTree = "<group>"; };
-		034313E90CCA7BC700A2E080 /* OCMConstraintTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMConstraintTests.m; sourceTree = "<group>"; };
-		0378606B0F6A32F800A4D9A0 /* OCMArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMArg.h; sourceTree = "<group>"; };
-		0378606C0F6A32F800A4D9A0 /* OCMArg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMArg.m; sourceTree = "<group>"; };
-		037860E00F6A3D4600A4D9A0 /* OCMPassByRefSetter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMPassByRefSetter.h; sourceTree = "<group>"; };
-		037860E10F6A3D4600A4D9A0 /* OCMPassByRefSetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMPassByRefSetter.m; sourceTree = "<group>"; };
-		037C13420FCC474D00257C8C /* OCPartialMockRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCPartialMockRecorder.h; sourceTree = "<group>"; };
-		037C13430FCC474D00257C8C /* OCPartialMockRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCPartialMockRecorder.m; sourceTree = "<group>"; };
-		03A2D0C909F01D13008A1AFD /* NSInvocation+OCMAdditions.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = "NSInvocation+OCMAdditions.h"; sourceTree = "<group>"; };
-		03A2D0CA09F01D13008A1AFD /* NSInvocation+OCMAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+OCMAdditions.m"; sourceTree = "<group>"; };
-		03A2D1F809F1533C008A1AFD /* NSInvocationOCMAdditionsTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NSInvocationOCMAdditionsTests.h; sourceTree = "<group>"; };
-		03BF2D1B08F1C26700978C59 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
-		03BF2D3708F1C69500978C59 /* OCMockTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
-		03BF2D3808F1C69500978C59 /* Test-Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.xml; path = "Test-Info.plist"; sourceTree = "<group>"; };
-		03C36701100D69EB00BE9731 /* OCMReturnValueProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMReturnValueProvider.h; sourceTree = "<group>"; };
-		03C36702100D69EB00BE9731 /* OCMReturnValueProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMReturnValueProvider.m; sourceTree = "<group>"; };
-		03C36722100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMBoxedReturnValueProvider.h; sourceTree = "<group>"; };
-		03C36723100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMBoxedReturnValueProvider.m; sourceTree = "<group>"; };
-		03C36727100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMExceptionReturnValueProvider.h; sourceTree = "<group>"; };
-		03C36728100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMExceptionReturnValueProvider.m; sourceTree = "<group>"; };
-		03C3672C100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMIndirectReturnValueProvider.h; sourceTree = "<group>"; };
-		03C3672D100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMIndirectReturnValueProvider.m; sourceTree = "<group>"; };
-		03C36773100D744700BE9731 /* OCMNotificationPoster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMNotificationPoster.h; sourceTree = "<group>"; };
-		03C36774100D744700BE9731 /* OCMNotificationPoster.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMNotificationPoster.m; sourceTree = "<group>"; };
-		03CFB089117B308C00935C1E /* OCMBlockCaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMBlockCaller.h; sourceTree = "<group>"; };
-		03CFB08A117B308C00935C1E /* OCMBlockCaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMBlockCaller.m; sourceTree = "<group>"; };
-		03D65B47094CA23B00DF6687 /* Changes.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Changes.txt; sourceTree = "<group>"; };
-		03D880530F8C75980087D071 /* OCObserverMockObjectTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCObserverMockObjectTest.h; sourceTree = "<group>"; };
-		03D880540F8C75980087D071 /* OCObserverMockObjectTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCObserverMockObjectTest.m; sourceTree = "<group>"; };
-		03D8805E0F8C81DE0087D071 /* OCObserverMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCObserverMockObject.h; sourceTree = "<group>"; };
-		03D8805F0F8C81DE0087D071 /* OCObserverMockObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCObserverMockObject.m; sourceTree = "<group>"; };
-		03D880D30F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = "<group>"; };
-		03D880D40F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNotificationCenter+OCMAdditions.m"; sourceTree = "<group>"; };
-		03D881070F8DB0BB0087D071 /* OCMObserverRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMObserverRecorder.h; sourceTree = "<group>"; };
-		03D8815A0F8DB37B0087D071 /* OCMObserverRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMObserverRecorder.m; sourceTree = "<group>"; };
-		03D8822D0FA151E10087D071 /* OCPartialMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCPartialMockObject.h; sourceTree = "<group>"; };
-		03D8822E0FA151E20087D071 /* OCPartialMockObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCPartialMockObject.m; sourceTree = "<group>"; };
-		03DAC01F11FEB771007AF17B /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		03DE1F5406DB911300E5A2A8 /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = "<group>"; };
-		03DE1F5506DB911300E5A2A8 /* OCMockObject.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OCMockObject.m; sourceTree = "<group>"; };
-		03DE1F5606DB911300E5A2A8 /* OCMockRecorder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OCMockRecorder.h; sourceTree = "<group>"; };
-		03DE1F5706DB911300E5A2A8 /* OCMockRecorder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OCMockRecorder.m; sourceTree = "<group>"; };
-		03DE1F5E06DB914100E5A2A8 /* OCMockObjectTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OCMockObjectTests.h; sourceTree = "<group>"; };
-		03DE1F5F06DB914100E5A2A8 /* OCMockObjectTests.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OCMockObjectTests.m; sourceTree = "<group>"; };
-		03DE1F6006DB914100E5A2A8 /* OCMockRecorderTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OCMockRecorderTests.h; sourceTree = "<group>"; };
-		03DE1F6106DB914100E5A2A8 /* OCMockRecorderTests.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OCMockRecorderTests.m; sourceTree = "<group>"; };
-		03DE218F06DB91CF00E5A2A8 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		03DE21B206DB95C500E5A2A8 /* OCMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
-		03DE221606DB97DA00E5A2A8 /* License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = License.txt; sourceTree = "<group>"; };
-		03F1FE8710353A5F00E4962C /* NSMethodSignature+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMethodSignature+OCMAdditions.h"; sourceTree = "<group>"; };
-		03F1FE8810353A5F00E4962C /* NSMethodSignature+OCMAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMethodSignature+OCMAdditions.m"; sourceTree = "<group>"; };
-		32DBCF5E0370ADEE00C91783 /* OCMock_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMock_Prefix.pch; sourceTree = "<group>"; };
-		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.xml; fileEncoding = 4; path = Info.plist; sourceTree = "<group>"; };
-		8DC2EF5B0486A6940098B216 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		033C84AD11F585CB0009B9CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		03BF2D3408F1C69500978C59 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03BF2D4008F1C6BA00978C59 /* SenTestingKit.framework in Frameworks */,
-				03BF2D4108F1C6BC00978C59 /* Foundation.framework in Frameworks */,
-				9F35D3DC0D349E7E00C05E52 /* OCMock.framework in Frameworks */,
-				032797870E09F40E006CA665 /* OCHamcrest.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		03DAC01B11FEB771007AF17B /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF560486A6940098B216 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03DE219006DB91CF00E5A2A8 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		0340A5CD121E9BF500158484 /* Invocation Handler */ = {
-			isa = PBXGroup;
-			children = (
-				0340A5B9121E973000158484 /* OCMRealObjectForwarder.h */,
-				0340A5BA121E973000158484 /* OCMRealObjectForwarder.m */,
-			);
-			name = "Invocation Handler";
-			sourceTree = "<group>";
-		};
-		034768DFFF38A50411DB9C8B /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8DC2EF5B0486A6940098B216 /* OCMock.framework */,
-				03BF2D3708F1C69500978C59 /* OCMockTests.octest */,
-				033C84AF11F585CB0009B9CD /* libOCMock.a */,
-				03DAC01F11FEB771007AF17B /* libOCMock.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		037C13470FCC475500257C8C /* Core Mocks */ = {
-			isa = PBXGroup;
-			children = (
-				03DE1F5406DB911300E5A2A8 /* OCMockObject.h */,
-				03DE1F5506DB911300E5A2A8 /* OCMockObject.m */,
-				0338A99607BE7C100066DE8A /* OCClassMockObject.h */,
-				0338A99707BE7C100066DE8A /* OCClassMockObject.m */,
-				0338A9EE07BE83B50066DE8A /* OCProtocolMockObject.h */,
-				0338A9EF07BE83B50066DE8A /* OCProtocolMockObject.m */,
-				03DE1F5606DB911300E5A2A8 /* OCMockRecorder.h */,
-				03DE1F5706DB911300E5A2A8 /* OCMockRecorder.m */,
-				03C366FB100D68F100BE9731 /* Invocation Handler */,
-			);
-			name = "Core Mocks";
-			sourceTree = "<group>";
-		};
-		037C13480FCC478500257C8C /* Partial Mocks */ = {
-			isa = PBXGroup;
-			children = (
-				03D8822D0FA151E10087D071 /* OCPartialMockObject.h */,
-				03D8822E0FA151E20087D071 /* OCPartialMockObject.m */,
-				037C13420FCC474D00257C8C /* OCPartialMockRecorder.h */,
-				037C13430FCC474D00257C8C /* OCPartialMockRecorder.m */,
-				0340A5CD121E9BF500158484 /* Invocation Handler */,
-			);
-			name = "Partial Mocks";
-			sourceTree = "<group>";
-		};
-		037C13490FCC479D00257C8C /* Observer Mocks */ = {
-			isa = PBXGroup;
-			children = (
-				03D8805E0F8C81DE0087D071 /* OCObserverMockObject.h */,
-				03D8805F0F8C81DE0087D071 /* OCObserverMockObject.m */,
-				03D881070F8DB0BB0087D071 /* OCMObserverRecorder.h */,
-				03D8815A0F8DB37B0087D071 /* OCMObserverRecorder.m */,
-			);
-			name = "Observer Mocks";
-			sourceTree = "<group>";
-		};
-		037C134A0FCC47B500257C8C /* Argument Handling */ = {
-			isa = PBXGroup;
-			children = (
-				0378606B0F6A32F800A4D9A0 /* OCMArg.h */,
-				0378606C0F6A32F800A4D9A0 /* OCMArg.m */,
-				0343133B0CCA771800A2E080 /* OCMConstraint.h */,
-				0343133C0CCA771800A2E080 /* OCMConstraint.m */,
-				037860E00F6A3D4600A4D9A0 /* OCMPassByRefSetter.h */,
-				037860E10F6A3D4600A4D9A0 /* OCMPassByRefSetter.m */,
-			);
-			name = "Argument Handling";
-			sourceTree = "<group>";
-		};
-		037C134B0FCC47CA00257C8C /* Foundation Additions */ = {
-			isa = PBXGroup;
-			children = (
-				03A2D0C909F01D13008A1AFD /* NSInvocation+OCMAdditions.h */,
-				03A2D0CA09F01D13008A1AFD /* NSInvocation+OCMAdditions.m */,
-				03D880D30F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h */,
-				03D880D40F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m */,
-				03F1FE8710353A5F00E4962C /* NSMethodSignature+OCMAdditions.h */,
-				03F1FE8810353A5F00E4962C /* NSMethodSignature+OCMAdditions.m */,
-			);
-			name = "Foundation Additions";
-			sourceTree = "<group>";
-		};
-		03C366FB100D68F100BE9731 /* Invocation Handler */ = {
-			isa = PBXGroup;
-			children = (
-				03C36701100D69EB00BE9731 /* OCMReturnValueProvider.h */,
-				03C36702100D69EB00BE9731 /* OCMReturnValueProvider.m */,
-				03C36722100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h */,
-				03C36723100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m */,
-				03C36727100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h */,
-				03C36728100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m */,
-				03C3672C100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h */,
-				03C3672D100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m */,
-				03C36773100D744700BE9731 /* OCMNotificationPoster.h */,
-				03C36774100D744700BE9731 /* OCMNotificationPoster.m */,
-				03CFB089117B308C00935C1E /* OCMBlockCaller.h */,
-				03CFB08A117B308C00935C1E /* OCMBlockCaller.m */,
-			);
-			name = "Invocation Handler";
-			sourceTree = "<group>";
-		};
-		03DE1F5D06DB911C00E5A2A8 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				03DE1F5E06DB914100E5A2A8 /* OCMockObjectTests.h */,
-				03DE1F5F06DB914100E5A2A8 /* OCMockObjectTests.m */,
-				032798010E09F8B7006CA665 /* OCMockObjectHamcrestTests.h */,
-				032798020E09F8B7006CA665 /* OCMockObjectHamcrestTests.mm */,
-				03D880530F8C75980087D071 /* OCObserverMockObjectTest.h */,
-				03D880540F8C75980087D071 /* OCObserverMockObjectTest.m */,
-				03DE1F6006DB914100E5A2A8 /* OCMockRecorderTests.h */,
-				03DE1F6106DB914100E5A2A8 /* OCMockRecorderTests.m */,
-				034313E80CCA7BC700A2E080 /* OCMConstraintTests.h */,
-				034313E90CCA7BC700A2E080 /* OCMConstraintTests.m */,
-				03A2D1F809F1533C008A1AFD /* NSInvocationOCMAdditionsTests.h */,
-				030106470A3B99F20049FED7 /* NSInvocationOCMAdditionsTests.m */,
-			);
-			name = Tests;
-			sourceTree = "<group>";
-		};
-		03DE21B506DB95CB00E5A2A8 /* Public Headers */ = {
-			isa = PBXGroup;
-			children = (
-				03DE21B206DB95C500E5A2A8 /* OCMock.h */,
-			);
-			name = "Public Headers";
-			sourceTree = "<group>";
-		};
-		0867D691FE84028FC02AAC07 /* OCMock */ = {
-			isa = PBXGroup;
-			children = (
-				03DE21B506DB95CB00E5A2A8 /* Public Headers */,
-				08FB77AEFE84172EC02AAC07 /* Implementation */,
-				03DE1F5D06DB911C00E5A2A8 /* Tests */,
-				32C88DFF0371C24200C91783 /* Other Sources */,
-				089C1665FE841158C02AAC07 /* Resources */,
-				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
-				034768DFFF38A50411DB9C8B /* Products */,
-			);
-			name = OCMock;
-			sourceTree = "<group>";
-		};
-		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */,
-				1058C7B2FEA5585E11CA2CBB /* Other Frameworks */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		089C1665FE841158C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				03DE221606DB97DA00E5A2A8 /* License.txt */,
-				03D65B47094CA23B00DF6687 /* Changes.txt */,
-				03BF2D3808F1C69500978C59 /* Test-Info.plist */,
-				8DC2EF5A0486A6940098B216 /* Info.plist */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		08FB77AEFE84172EC02AAC07 /* Implementation */ = {
-			isa = PBXGroup;
-			children = (
-				037C13470FCC475500257C8C /* Core Mocks */,
-				037C13480FCC478500257C8C /* Partial Mocks */,
-				037C13490FCC479D00257C8C /* Observer Mocks */,
-				037C134A0FCC47B500257C8C /* Argument Handling */,
-				037C134B0FCC47CA00257C8C /* Foundation Additions */,
-			);
-			name = Implementation;
-			sourceTree = "<group>";
-		};
-		1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				032797860E09F40E006CA665 /* OCHamcrest.framework */,
-				03DE218F06DB91CF00E5A2A8 /* Foundation.framework */,
-				03BF2D1B08F1C26700978C59 /* SenTestingKit.framework */,
-			);
-			name = "Linked Frameworks";
-			sourceTree = "<group>";
-		};
-		1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "Other Frameworks";
-			sourceTree = "<group>";
-		};
-		32C88DFF0371C24200C91783 /* Other Sources */ = {
-			isa = PBXGroup;
-			children = (
-				32DBCF5E0370ADEE00C91783 /* OCMock_Prefix.pch */,
-			);
-			name = "Other Sources";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		033C84AB11F585CB0009B9CD /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				033C857511F58C130009B9CD /* NSNotificationCenter+OCMAdditions.h in Headers */,
-				03E41D9711F5A83E00147791 /* NSMethodSignature+OCMAdditions.h in Headers */,
-				03E41D9911F5A83F00147791 /* NSInvocation+OCMAdditions.h in Headers */,
-				03E41D9B11F5A84100147791 /* OCMPassByRefSetter.h in Headers */,
-				03E41D9D11F5A84200147791 /* OCMConstraint.h in Headers */,
-				03E41D9F11F5A84400147791 /* OCMArg.h in Headers */,
-				03E41DA111F5A84600147791 /* OCMObserverRecorder.h in Headers */,
-				03E41DA311F5A84800147791 /* OCObserverMockObject.h in Headers */,
-				03E41DA511F5A85000147791 /* OCPartialMockRecorder.h in Headers */,
-				03E41DA711F5A85200147791 /* OCPartialMockObject.h in Headers */,
-				03E41DA911F5A85600147791 /* OCMockRecorder.h in Headers */,
-				03E41DAB11F5A85800147791 /* OCProtocolMockObject.h in Headers */,
-				03E41DAD11F5A85900147791 /* OCClassMockObject.h in Headers */,
-				03E41DAF11F5A85B00147791 /* OCMockObject.h in Headers */,
-				03E41DB011F5A85E00147791 /* OCMock.h in Headers */,
-				03E41DB211F5A86300147791 /* OCMBlockCaller.h in Headers */,
-				03E41DB411F5A86400147791 /* OCMNotificationPoster.h in Headers */,
-				03E41DB611F5A86600147791 /* OCMIndirectReturnValueProvider.h in Headers */,
-				03E41DB811F5A86800147791 /* OCMExceptionReturnValueProvider.h in Headers */,
-				03E41DBA11F5A86A00147791 /* OCMBoxedReturnValueProvider.h in Headers */,
-				03E41DBC11F5A86C00147791 /* OCMReturnValueProvider.h in Headers */,
-				0340A5BB121E973000158484 /* OCMRealObjectForwarder.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		03DABFF011FEB771007AF17B /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03DABFF111FEB771007AF17B /* NSNotificationCenter+OCMAdditions.h in Headers */,
-				03DABFF211FEB771007AF17B /* NSMethodSignature+OCMAdditions.h in Headers */,
-				03DABFF311FEB771007AF17B /* NSInvocation+OCMAdditions.h in Headers */,
-				03DABFF411FEB771007AF17B /* OCMPassByRefSetter.h in Headers */,
-				03DABFF511FEB771007AF17B /* OCMConstraint.h in Headers */,
-				03DABFF611FEB771007AF17B /* OCMArg.h in Headers */,
-				03DABFF711FEB771007AF17B /* OCMObserverRecorder.h in Headers */,
-				03DABFF811FEB771007AF17B /* OCObserverMockObject.h in Headers */,
-				03DABFF911FEB771007AF17B /* OCPartialMockRecorder.h in Headers */,
-				03DABFFA11FEB771007AF17B /* OCPartialMockObject.h in Headers */,
-				03DABFFB11FEB771007AF17B /* OCMockRecorder.h in Headers */,
-				03DABFFC11FEB771007AF17B /* OCProtocolMockObject.h in Headers */,
-				03DABFFD11FEB771007AF17B /* OCClassMockObject.h in Headers */,
-				03DABFFE11FEB771007AF17B /* OCMockObject.h in Headers */,
-				03DABFFF11FEB771007AF17B /* OCMock.h in Headers */,
-				03DAC00011FEB771007AF17B /* OCMBlockCaller.h in Headers */,
-				03DAC00111FEB771007AF17B /* OCMNotificationPoster.h in Headers */,
-				03DAC00211FEB771007AF17B /* OCMIndirectReturnValueProvider.h in Headers */,
-				03DAC00311FEB771007AF17B /* OCMExceptionReturnValueProvider.h in Headers */,
-				03DAC00411FEB771007AF17B /* OCMBoxedReturnValueProvider.h in Headers */,
-				03DAC00511FEB771007AF17B /* OCMReturnValueProvider.h in Headers */,
-				0340A5BD121E973000158484 /* OCMRealObjectForwarder.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF500486A6940098B216 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8DC2EF510486A6940098B216 /* OCMock_Prefix.pch in Headers */,
-				03DE1F5806DB911300E5A2A8 /* OCMockObject.h in Headers */,
-				03DE1F5A06DB911300E5A2A8 /* OCMockRecorder.h in Headers */,
-				03DE21B306DB95C500E5A2A8 /* OCMock.h in Headers */,
-				0338A99807BE7C100066DE8A /* OCClassMockObject.h in Headers */,
-				0338A9F007BE83B50066DE8A /* OCProtocolMockObject.h in Headers */,
-				03A2D0CB09F01D13008A1AFD /* NSInvocation+OCMAdditions.h in Headers */,
-				0343133E0CCA771800A2E080 /* OCMConstraint.h in Headers */,
-				0378606E0F6A32F800A4D9A0 /* OCMArg.h in Headers */,
-				037860E30F6A3D4600A4D9A0 /* OCMPassByRefSetter.h in Headers */,
-				03D880610F8C81DE0087D071 /* OCObserverMockObject.h in Headers */,
-				03D880D50F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.h in Headers */,
-				03D881090F8DB0BB0087D071 /* OCMObserverRecorder.h in Headers */,
-				03D8822F0FA151E20087D071 /* OCPartialMockObject.h in Headers */,
-				037C13450FCC474D00257C8C /* OCPartialMockRecorder.h in Headers */,
-				03C36703100D69EB00BE9731 /* OCMReturnValueProvider.h in Headers */,
-				03C36724100D6B9600BE9731 /* OCMBoxedReturnValueProvider.h in Headers */,
-				03C36729100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.h in Headers */,
-				03C3672E100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.h in Headers */,
-				03C36775100D744700BE9731 /* OCMNotificationPoster.h in Headers */,
-				03F1FE8A10353A5F00E4962C /* NSMethodSignature+OCMAdditions.h in Headers */,
-				03CFB08C117B308C00935C1E /* OCMBlockCaller.h in Headers */,
-				0340A5BF121E973000158484 /* OCMRealObjectForwarder.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		033C84AE11F585CB0009B9CD /* OCMockPhoneSim */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 033C84B211F586310009B9CD /* Build configuration list for PBXNativeTarget "OCMockPhoneSim" */;
-			buildPhases = (
-				033C84AB11F585CB0009B9CD /* Headers */,
-				033C84AC11F585CB0009B9CD /* Sources */,
-				033C84AD11F585CB0009B9CD /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = OCMockPhoneSim;
-			productName = OCMockPhoneSim;
-			productReference = 033C84AF11F585CB0009B9CD /* libOCMock.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		03BF2D3608F1C69500978C59 /* OCMockTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 03BF2D3B08F1C69600978C59 /* Build configuration list for PBXNativeTarget "OCMockTests" */;
-			buildPhases = (
-				032798EB0E0A0583006CA665 /* ShellScript */,
-				03BF2D3208F1C69500978C59 /* Resources */,
-				03BF2D3308F1C69500978C59 /* Sources */,
-				03BF2D3408F1C69500978C59 /* Frameworks */,
-				03BF2D3508F1C69500978C59 /* Run Script */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				9F35D3D50D349B5300C05E52 /* PBXTargetDependency */,
-			);
-			name = OCMockTests;
-			productName = Test;
-			productReference = 03BF2D3708F1C69500978C59 /* OCMockTests.octest */;
-			productType = "com.apple.product-type.bundle";
-		};
-		03DABFEF11FEB771007AF17B /* OCMockPhoneDevice */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 03DAC01C11FEB771007AF17B /* Build configuration list for PBXNativeTarget "OCMockPhoneDevice" */;
-			buildPhases = (
-				03DABFF011FEB771007AF17B /* Headers */,
-				03DAC00611FEB771007AF17B /* Sources */,
-				03DAC01B11FEB771007AF17B /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = OCMockPhoneDevice;
-			productName = OCMockPhoneSim;
-			productReference = 03DAC01F11FEB771007AF17B /* libOCMock.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		8DC2EF4F0486A6940098B216 /* OCMock */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 03DFEE0808F04987002E8661 /* Build configuration list for PBXNativeTarget "OCMock" */;
-			buildPhases = (
-				8DC2EF500486A6940098B216 /* Headers */,
-				8DC2EF520486A6940098B216 /* Resources */,
-				8DC2EF540486A6940098B216 /* Sources */,
-				8DC2EF560486A6940098B216 /* Frameworks */,
-				8DC2EF580486A6940098B216 /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = OCMock;
-			productInstallPath = "$(HOME)/Library/Frameworks";
-			productName = OCMock;
-			productReference = 8DC2EF5B0486A6940098B216 /* OCMock.framework */;
-			productType = "com.apple.product-type.framework";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		0867D690FE84028FC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				ORGANIZATIONNAME = "Mulle Kybernetik";
-			};
-			buildConfigurationList = 03DFEE1208F04987002E8661 /* Build configuration list for PBXProject "OCMock" */;
-			compatibilityVersion = "Xcode 3.0";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-			);
-			mainGroup = 0867D691FE84028FC02AAC07 /* OCMock */;
-			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8DC2EF4F0486A6940098B216 /* OCMock */,
-				03BF2D3608F1C69500978C59 /* OCMockTests */,
-				033C84AE11F585CB0009B9CD /* OCMockPhoneSim */,
-				03DABFEF11FEB771007AF17B /* OCMockPhoneDevice */,
-				03DAC03611FEB870007AF17B /* OCMockLib */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		03BF2D3208F1C69500978C59 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF520486A6940098B216 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03DE221706DB97DA00E5A2A8 /* License.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		8DC2EF580486A6940098B216 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		032798EB0E0A0583006CA665 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Unpack frameworks required for this target\npushd \"${TARGET_BUILD_DIR}\"\nif [ ! -d Frameworks ]; then\n\tmkdir Frameworks\nfi\ncd Frameworks\nif [ ! -d  OCHamcrest.framework ]; then\n    gnutar xjf \"${PROJECT_DIR}/Frameworks/OCHamcrest.tar.bz2\"\nfi\npopd\n";
-		};
-		03BF2D3508F1C69500978C59 /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Run the unit tests in this test bundle.\nexport DYLD_FRAMEWORK_PATH=\"${TARGET_BUILD_DIR}/Frameworks\"\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
-		};
-		03DAC04011FEB897007AF17B /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# make a new output folder\nmkdir -p \"${BUILD_DIR}/${BUILD_STYLE}/Library\"\n \n# combine lib files for device and simulator platforms into one\nlipo -create \"${BUILD_DIR}/${BUILD_STYLE}-iphoneos/libOCMock.a\" \"${BUILD_DIR}/${BUILD_STYLE}-iphonesimulator/libOCMock.a\" -output \"${TARGET_BUILD_DIR}/Library/libOCMock.a\"\n\n# copy the headers (we could have used a copy files build phase, too)\ncp -R \"${BUILD_DIR}/${BUILD_STYLE}-iphoneos/Headers\" \"${TARGET_BUILD_DIR}/Library\"\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		033C84AC11F585CB0009B9CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				033C857411F58C110009B9CD /* NSNotificationCenter+OCMAdditions.m in Sources */,
-				03E41D9611F5A83D00147791 /* NSMethodSignature+OCMAdditions.m in Sources */,
-				03E41D9811F5A83E00147791 /* NSInvocation+OCMAdditions.m in Sources */,
-				03E41D9A11F5A84000147791 /* OCMPassByRefSetter.m in Sources */,
-				03E41D9C11F5A84200147791 /* OCMConstraint.m in Sources */,
-				03E41D9E11F5A84300147791 /* OCMArg.m in Sources */,
-				03E41DA011F5A84500147791 /* OCMObserverRecorder.m in Sources */,
-				03E41DA211F5A84700147791 /* OCObserverMockObject.m in Sources */,
-				03E41DA411F5A84F00147791 /* OCPartialMockRecorder.m in Sources */,
-				03E41DA611F5A85100147791 /* OCPartialMockObject.m in Sources */,
-				03E41DA811F5A85600147791 /* OCMockRecorder.m in Sources */,
-				03E41DAA11F5A85800147791 /* OCProtocolMockObject.m in Sources */,
-				03E41DAC11F5A85900147791 /* OCClassMockObject.m in Sources */,
-				03E41DAE11F5A85A00147791 /* OCMockObject.m in Sources */,
-				03E41DB111F5A86300147791 /* OCMBlockCaller.m in Sources */,
-				03E41DB311F5A86400147791 /* OCMNotificationPoster.m in Sources */,
-				03E41DB511F5A86500147791 /* OCMIndirectReturnValueProvider.m in Sources */,
-				03E41DB711F5A86800147791 /* OCMExceptionReturnValueProvider.m in Sources */,
-				03E41DB911F5A86900147791 /* OCMBoxedReturnValueProvider.m in Sources */,
-				03E41DBB11F5A86B00147791 /* OCMReturnValueProvider.m in Sources */,
-				0340A5BC121E973000158484 /* OCMRealObjectForwarder.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		03BF2D3308F1C69500978C59 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03BF2D5E08F1C82C00978C59 /* OCMockRecorderTests.m in Sources */,
-				03BF2D5F08F1C82D00978C59 /* OCMockObjectTests.m in Sources */,
-				030106730A3B9B240049FED7 /* NSInvocationOCMAdditionsTests.m in Sources */,
-				034313EA0CCA7BC700A2E080 /* OCMConstraintTests.m in Sources */,
-				032798030E09F8B7006CA665 /* OCMockObjectHamcrestTests.mm in Sources */,
-				03D880550F8C75980087D071 /* OCObserverMockObjectTest.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		03DAC00611FEB771007AF17B /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03DAC00711FEB771007AF17B /* NSNotificationCenter+OCMAdditions.m in Sources */,
-				03DAC00811FEB771007AF17B /* NSMethodSignature+OCMAdditions.m in Sources */,
-				03DAC00911FEB771007AF17B /* NSInvocation+OCMAdditions.m in Sources */,
-				03DAC00A11FEB771007AF17B /* OCMPassByRefSetter.m in Sources */,
-				03DAC00B11FEB771007AF17B /* OCMConstraint.m in Sources */,
-				03DAC00C11FEB771007AF17B /* OCMArg.m in Sources */,
-				03DAC00D11FEB771007AF17B /* OCMObserverRecorder.m in Sources */,
-				03DAC00E11FEB771007AF17B /* OCObserverMockObject.m in Sources */,
-				03DAC00F11FEB771007AF17B /* OCPartialMockRecorder.m in Sources */,
-				03DAC01011FEB771007AF17B /* OCPartialMockObject.m in Sources */,
-				03DAC01111FEB771007AF17B /* OCMockRecorder.m in Sources */,
-				03DAC01211FEB771007AF17B /* OCProtocolMockObject.m in Sources */,
-				03DAC01311FEB771007AF17B /* OCClassMockObject.m in Sources */,
-				03DAC01411FEB771007AF17B /* OCMockObject.m in Sources */,
-				03DAC01511FEB771007AF17B /* OCMBlockCaller.m in Sources */,
-				03DAC01611FEB771007AF17B /* OCMNotificationPoster.m in Sources */,
-				03DAC01711FEB771007AF17B /* OCMIndirectReturnValueProvider.m in Sources */,
-				03DAC01811FEB771007AF17B /* OCMExceptionReturnValueProvider.m in Sources */,
-				03DAC01911FEB771007AF17B /* OCMBoxedReturnValueProvider.m in Sources */,
-				03DAC01A11FEB771007AF17B /* OCMReturnValueProvider.m in Sources */,
-				0340A5BE121E973000158484 /* OCMRealObjectForwarder.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8DC2EF540486A6940098B216 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				03DE1F5906DB911300E5A2A8 /* OCMockObject.m in Sources */,
-				03DE1F5B06DB911300E5A2A8 /* OCMockRecorder.m in Sources */,
-				0338A99907BE7C100066DE8A /* OCClassMockObject.m in Sources */,
-				0338A9F107BE83B50066DE8A /* OCProtocolMockObject.m in Sources */,
-				03A2D0CC09F01D13008A1AFD /* NSInvocation+OCMAdditions.m in Sources */,
-				0343133F0CCA771800A2E080 /* OCMConstraint.m in Sources */,
-				0378606F0F6A32F800A4D9A0 /* OCMArg.m in Sources */,
-				037860E40F6A3D4600A4D9A0 /* OCMPassByRefSetter.m in Sources */,
-				03D880620F8C81DE0087D071 /* OCObserverMockObject.m in Sources */,
-				03D880D60F8DA4750087D071 /* NSNotificationCenter+OCMAdditions.m in Sources */,
-				03D8815B0F8DB37B0087D071 /* OCMObserverRecorder.m in Sources */,
-				03D882300FA151E20087D071 /* OCPartialMockObject.m in Sources */,
-				037C13460FCC474D00257C8C /* OCPartialMockRecorder.m in Sources */,
-				03C36704100D69EB00BE9731 /* OCMReturnValueProvider.m in Sources */,
-				03C36725100D6B9600BE9731 /* OCMBoxedReturnValueProvider.m in Sources */,
-				03C3672A100D6C7D00BE9731 /* OCMExceptionReturnValueProvider.m in Sources */,
-				03C3672F100D6D0F00BE9731 /* OCMIndirectReturnValueProvider.m in Sources */,
-				03C36776100D744700BE9731 /* OCMNotificationPoster.m in Sources */,
-				03F1FE8B10353A5F00E4962C /* NSMethodSignature+OCMAdditions.m in Sources */,
-				03CFB08D117B308C00935C1E /* OCMBlockCaller.m in Sources */,
-				0340A5C0121E973000158484 /* OCMRealObjectForwarder.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		03DAC03A11FEB87B007AF17B /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 033C84AE11F585CB0009B9CD /* OCMockPhoneSim */;
-			targetProxy = 03DAC03911FEB87B007AF17B /* PBXContainerItemProxy */;
-		};
-		03DAC03C11FEB87B007AF17B /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 03DABFEF11FEB771007AF17B /* OCMockPhoneDevice */;
-			targetProxy = 03DAC03B11FEB87B007AF17B /* PBXContainerItemProxy */;
-		};
-		9F35D3D50D349B5300C05E52 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 8DC2EF4F0486A6940098B216 /* OCMock */;
-			targetProxy = 9F35D3D40D349B5300C05E52 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		033C84B011F585CB0009B9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				LD_RUNPATH_SEARCH_PATHS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMock;
-				PUBLIC_HEADERS_FOLDER_PATH = Headers/OCMock;
-				SDKROOT = iphonesimulator4.1;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		033C84B111F585CB0009B9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				LD_RUNPATH_SEARCH_PATHS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMock;
-				PUBLIC_HEADERS_FOLDER_PATH = Headers/OCMock;
-				SDKROOT = iphonesimulator4.1;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		03BF2D3C08F1C69600978C59 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(TARGET_BUILD_DIR)/Frameworks",
-					"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
-				);
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCMock_Prefix.pch;
-				INFOPLIST_FILE = "Test-Info.plist";
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../Frameworks";
-				LIBRARY_STYLE = BUNDLE;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMockTests;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = octest;
-			};
-			name = Debug;
-		};
-		03BF2D3D08F1C69600978C59 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(TARGET_BUILD_DIR)/Frameworks",
-					"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
-				);
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCMock_Prefix.pch;
-				INFOPLIST_FILE = "Test-Info.plist";
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../Frameworks";
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMockTests;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = octest;
-			};
-			name = Release;
-		};
-		03DAC01D11FEB771007AF17B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				LD_RUNPATH_SEARCH_PATHS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMock;
-				PUBLIC_HEADERS_FOLDER_PATH = Headers/OCMock;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		03DAC01E11FEB771007AF17B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_ENABLE_OBJC_GC = unsupported;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.2;
-				LD_RUNPATH_SEARCH_PATHS = "";
-				PREBINDING = NO;
-				PRODUCT_NAME = OCMock;
-				PUBLIC_HEADERS_FOLDER_PATH = Headers/OCMock;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		03DAC03711FEB870007AF17B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = OCMockLib;
-			};
-			name = Debug;
-		};
-		03DAC03811FEB870007AF17B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = OCMockLib;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		03DFEE0908F04987002E8661 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
-				FRAMEWORK_VERSION = A;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_ENABLE_TRIGRAPHS = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCMock_Prefix.pch;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/Frameworks;
-				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
-				LIBRARY_SEARCH_PATHS = "";
-				LIBRARY_STYLE = Dynamic;
-				MACH_O_TYPE = mh_dylib;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-fobjc-exceptions";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = OCMock;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
-				SECTORDER_FLAGS = "";
-				TEST_AFTER_BUILD = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = framework;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
-		03DFEE0A08F04987002E8661 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
-				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
-				COPY_PHASE_STRIP = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
-				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = supported;
-				GCC_ENABLE_TRIGRAPHS = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = OCMock_Prefix.pch;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/Frameworks;
-				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
-				LIBRARY_SEARCH_PATHS = "";
-				LIBRARY_STYLE = Dynamic;
-				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-fobjc-exceptions";
-				OTHER_LDFLAGS = "";
-				PRODUCT_NAME = OCMock;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
-				SECTORDER_FLAGS = "";
-				TEST_AFTER_BUILD = YES;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = framework;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		03DFEE1308F04987002E8661 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_WARN_SHADOW = YES;
-			};
-			name = Debug;
-		};
-		03DFEE1408F04987002E8661 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_INPUT_FILETYPE = automatic;
-				GCC_WARN_SHADOW = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		033C84B211F586310009B9CD /* Build configuration list for PBXNativeTarget "OCMockPhoneSim" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				033C84B011F585CB0009B9CD /* Debug */,
-				033C84B111F585CB0009B9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		03BF2D3B08F1C69600978C59 /* Build configuration list for PBXNativeTarget "OCMockTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				03BF2D3C08F1C69600978C59 /* Debug */,
-				03BF2D3D08F1C69600978C59 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		03DAC01C11FEB771007AF17B /* Build configuration list for PBXNativeTarget "OCMockPhoneDevice" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				03DAC01D11FEB771007AF17B /* Debug */,
-				03DAC01E11FEB771007AF17B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		03DAC03E11FEB87D007AF17B /* Build configuration list for PBXAggregateTarget "OCMockLib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				03DAC03711FEB870007AF17B /* Debug */,
-				03DAC03811FEB870007AF17B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		03DFEE0808F04987002E8661 /* Build configuration list for PBXNativeTarget "OCMock" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				03DFEE0908F04987002E8661 /* Debug */,
-				03DFEE0A08F04987002E8661 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		03DFEE1208F04987002E8661 /* Build configuration list for PBXProject "OCMock" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				03DFEE1308F04987002E8661 /* Debug */,
-				03DFEE1408F04987002E8661 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
-}
diff --git a/third_party/ocmock/OCMock/OCMockObject.h b/third_party/ocmock/OCMock/OCMockObject.h
index 24477c7..ebd2ba3 100644
--- a/third_party/ocmock/OCMock/OCMockObject.h
+++ b/third_party/ocmock/OCMock/OCMockObject.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMockObject.h 69 2010-08-20 16:05:58Z erik $
+//  $Id$
 //  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMockObject.m b/third_party/ocmock/OCMock/OCMockObject.m
index efdaeb0..198c683 100644
--- a/third_party/ocmock/OCMock/OCMockObject.m
+++ b/third_party/ocmock/OCMock/OCMockObject.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMockObject.m 72 2011-01-28 18:45:19Z erik $
+//  $Id$
 //  Copyright (c) 2004-2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -164,7 +164,7 @@
 - (BOOL)handleInvocation:(NSInvocation *)anInvocation
 {
 	OCMockRecorder *recorder = nil;
-	int			   i;
+	unsigned int			   i;
 	
 	for(i = 0; i < [recorders count]; i++)
 	{
diff --git a/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.h b/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.h
deleted file mode 100644
index 1c40e9e..0000000
--- a/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockObjectHamcrestTests.h 57 2010-07-19 06:14:27Z erik $
-//  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-
-@interface OCMockObjectHamcrestTests : SenTestCase 
-{
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.mm b/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.mm
deleted file mode 100644
index 4f0f5dd..0000000
--- a/third_party/ocmock/OCMock/OCMockObjectHamcrestTests.mm
+++ /dev/null
@@ -1,31 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockObjectTests.m 21 2008-01-24 18:59:39Z erik $
-//  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <OCMock/OCMock.h>
-#import "OCMockObjectHamcrestTests.h"
-
-#define HC_SHORTHAND
-#import <OCHamcrest/OCHamcrest.h>
-
-
-@implementation OCMockObjectHamcrestTests
-
-- (void)testAcceptsStubbedMethodWithHamcrestConstraint
-{
-	id mock = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] hasSuffix:(id)startsWith(@"foo")];
-	[mock hasSuffix:@"foobar"];
-}
-
-
-- (void)testRejectsUnstubbedMethodWithHamcrestConstraint
-{
-	id mock = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] hasSuffix:(id)anyOf(equalTo(@"foo"), equalTo(@"bar"), NULL)];
-	STAssertThrows([mock hasSuffix:@"foobar"], @"Should have raised an exception.");
-}
-
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMockObjectTests.h b/third_party/ocmock/OCMock/OCMockObjectTests.h
deleted file mode 100644
index a9e36e9..0000000
--- a/third_party/ocmock/OCMock/OCMockObjectTests.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockObjectTests.h 21 2008-01-24 18:59:39Z erik $
-//  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface OCMockObjectTests : SenTestCase
-{
-	id mock;
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMockObjectTests.m b/third_party/ocmock/OCMock/OCMockObjectTests.m
deleted file mode 100644
index 0f00ec1..0000000
--- a/third_party/ocmock/OCMock/OCMockObjectTests.m
+++ /dev/null
@@ -1,826 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockObjectTests.m 74 2011-02-15 12:59:47Z erik $
-//  Copyright (c) 2004-2010 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <OCMock/OCMock.h>
-#import "OCMockObjectTests.h"
-
-// --------------------------------------------------------------------------------------
-//	Helper classes and protocols for testing
-// --------------------------------------------------------------------------------------
-
-@protocol TestProtocol
-- (int)primitiveValue;
-@optional
-- (id)objectValue;
-@end
-
-@protocol ProtocolWithTypeQualifierMethod
-- (void)aSpecialMethod:(byref in void *)someArg;
-@end
-
-@interface TestClassThatCallsSelf : NSObject
-- (NSString *)method1;
-- (NSString *)method2;
-@end
-
-@implementation TestClassThatCallsSelf
-
-- (NSString *)method1
-{
-	id retVal = [self method2];
-	return retVal;
-}
-
-- (NSString *)method2
-{
-	return @"Foo";
-}
-
-@end
-
-@interface TestObserver	: NSObject
-{
-	@public
-	NSNotification *notification;
-}
-
-@end
-
-@implementation TestObserver
-
-- (void)dealloc
-{
-	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	[notification release];
-	[super dealloc];
-}
-
-- (void)receiveNotification:(NSNotification *)aNotification
-{
-	notification = [aNotification retain];
-}
-
-@end
-
-static NSString *TestNotification = @"TestNotification";
-
-
-// --------------------------------------------------------------------------------------
-//  setup
-// --------------------------------------------------------------------------------------
-
-
-@implementation OCMockObjectTests
-
-- (void)setUp
-{
-	mock = [OCMockObject mockForClass:[NSString class]];
-}
-
-
-// --------------------------------------------------------------------------------------
-//	accepting stubbed methods / rejecting methods not stubbed
-// --------------------------------------------------------------------------------------
-
-- (void)testAcceptsStubbedMethod
-{
-	[[mock stub] lowercaseString];
-	[mock lowercaseString];
-}
-
-- (void)testRaisesExceptionWhenUnknownMethodIsCalled
-{
-	[[mock stub] lowercaseString];
-	STAssertThrows([mock uppercaseString], @"Should have raised an exception.");
-}
-
-
-- (void)testAcceptsStubbedMethodWithSpecificArgument
-{
-	[[mock stub] hasSuffix:@"foo"];
-	[mock hasSuffix:@"foo"];
-}
-
-
-- (void)testAcceptsStubbedMethodWithConstraint
-{
-	[[mock stub] hasSuffix:[OCMArg any]];
-	[mock hasSuffix:@"foo"];
-	[mock hasSuffix:@"bar"];
-}
-
-#if NS_BLOCKS_AVAILABLE
-
-- (void)testAcceptsStubbedMethodWithBlockArgument
-{
-	mock = [OCMockObject mockForClass:[NSArray class]];
-	[[mock stub] indexesOfObjectsPassingTest:[OCMArg any]];
-	[mock indexesOfObjectsPassingTest:^(id obj, NSUInteger idx, BOOL *stop) { return YES; }];
-}
-
-
-- (void)testAcceptsStubbedMethodWithBlockConstraint
-{
-	[[mock stub] hasSuffix:[OCMArg checkWithBlock:^(id value) { return [value isEqualToString:@"foo"]; }]];
-
-	STAssertNoThrow([mock hasSuffix:@"foo"], @"Should not have thrown a exception");   
-	STAssertThrows([mock hasSuffix:@"bar"], @"Should have thrown a exception");   
-}
-	
-#endif
-
-- (void)testAcceptsStubbedMethodWithNilArgument
-{
-	[[mock stub] hasSuffix:nil];
-	
-	[mock hasSuffix:nil];
-}
-
-- (void)testRaisesExceptionWhenMethodWithWrongArgumentIsCalled
-{
-	[[mock stub] hasSuffix:@"foo"];
-	STAssertThrows([mock hasSuffix:@"xyz"], @"Should have raised an exception.");
-}
-
-
-- (void)testAcceptsStubbedMethodWithScalarArgument
-{
-	[[mock stub] stringByPaddingToLength:20 withString:@"foo" startingAtIndex:5];
-	[mock stringByPaddingToLength:20 withString:@"foo" startingAtIndex:5];
-}
-
-
-- (void)testRaisesExceptionWhenMethodWithOneWrongScalarArgumentIsCalled
-{
-	[[mock stub] stringByPaddingToLength:20 withString:@"foo" startingAtIndex:5];
-	STAssertThrows([mock stringByPaddingToLength:20 withString:@"foo" startingAtIndex:3], @"Should have raised an exception.");	
-}
-
-- (void)testAcceptsStubbedMethodWithPointerArgument
-{
-	NSError *error;
-	BOOL yes = YES;
-	[[[mock stub] andReturnValue:OCMOCK_VALUE(yes)] writeToFile:OCMOCK_ANY atomically:YES encoding:NSMacOSRomanStringEncoding error:&error];
-	
-	STAssertTrue([mock writeToFile:@"foo" atomically:YES encoding:NSMacOSRomanStringEncoding error:&error], nil);
-}
-
-- (void)testAcceptsStubbedMethodWithAnyPointerArgument
-{
-	BOOL yes = YES;
-	NSError *error;
-	[[[mock stub] andReturnValue:OCMOCK_VALUE(yes)] writeToFile:OCMOCK_ANY atomically:YES encoding:NSMacOSRomanStringEncoding error:[OCMArg anyPointer]];
-	
-	STAssertTrue([mock writeToFile:@"foo" atomically:YES encoding:NSMacOSRomanStringEncoding error:&error], nil);
-}
-
-- (void)testRaisesExceptionWhenMethodWithWrongPointerArgumentIsCalled
-{
-	NSString *string;
-	NSString *anotherString;
-	NSArray *array;
-	
-	[[mock stub] completePathIntoString:&string caseSensitive:YES matchesIntoArray:&array filterTypes:OCMOCK_ANY];
-	
-	STAssertThrows([mock completePathIntoString:&anotherString caseSensitive:YES matchesIntoArray:&array filterTypes:OCMOCK_ANY], nil);
-}
-
-- (void)testAcceptsStubbedMethodWithVoidPointerArgument
-{
-	mock = [OCMockObject mockForClass:[NSMutableData class]];
-	[[mock stub] appendBytes:NULL length:0];
-	[mock appendBytes:NULL length:0];
-}
-
-
-- (void)testRaisesExceptionWhenMethodWithWrongVoidPointerArgumentIsCalled
-{
-	mock = [OCMockObject mockForClass:[NSMutableData class]];
-	[[mock stub] appendBytes:"foo" length:3];
-	STAssertThrows([mock appendBytes:"bar" length:3], @"Should have raised an exception.");
-}
-
-
-- (void)testAcceptsStubbedMethodWithPointerPointerArgument
-{
-	NSError *error = nil;
-	[[mock stub] initWithContentsOfFile:@"foo.txt" encoding:NSASCIIStringEncoding error:&error];	
-	[mock initWithContentsOfFile:@"foo.txt" encoding:NSASCIIStringEncoding error:&error];
-}
-
-
-- (void)testRaisesExceptionWhenMethodWithWrongPointerPointerArgumentIsCalled
-{
-	NSError *error = nil, *error2;
-	[[mock stub] initWithContentsOfFile:@"foo.txt" encoding:NSASCIIStringEncoding error:&error];	
-	STAssertThrows([mock initWithContentsOfFile:@"foo.txt" encoding:NSASCIIStringEncoding error:&error2], @"Should have raised.");
-}
-
-
-- (void)testAcceptsStubbedMethodWithStructArgument
-{
-    NSRange range = NSMakeRange(0,20);
-	[[mock stub] substringWithRange:range];
-	[mock substringWithRange:range];
-}
-
-
-- (void)testRaisesExceptionWhenMethodWithWrongStructArgumentIsCalled
-{
-    NSRange range = NSMakeRange(0,20);
-    NSRange otherRange = NSMakeRange(0,10);
-	[[mock stub] substringWithRange:range];
-	STAssertThrows([mock substringWithRange:otherRange], @"Should have raised an exception.");	
-}
-
-
-- (void)testCanPassMocksAsArguments
-{
-	id mockArg = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] stringByAppendingString:[OCMArg any]];
-	[mock stringByAppendingString:mockArg];
-}
-
-- (void)testCanStubWithMockArguments
-{
-	id mockArg = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] stringByAppendingString:mockArg];
-	[mock stringByAppendingString:mockArg];
-}
-
-- (void)testRaisesExceptionWhenStubbedMockArgIsNotUsed
-{
-	id mockArg = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] stringByAppendingString:mockArg];
-	STAssertThrows([mock stringByAppendingString:@"foo"], @"Should have raised an exception.");
-}
-
-- (void)testRaisesExceptionWhenDifferentMockArgumentIsPassed
-{
-	id expectedArg = [OCMockObject mockForClass:[NSString class]];
-	id otherArg = [OCMockObject mockForClass:[NSString class]];
-	[[mock stub] stringByAppendingString:otherArg];
-	STAssertThrows([mock stringByAppendingString:expectedArg], @"Should have raised an exception.");	
-}
-
-
-// --------------------------------------------------------------------------------------
-//	returning values from stubbed methods
-// --------------------------------------------------------------------------------------
-
-- (void)testReturnsStubbedReturnValue
-{
-	id returnValue;  
-
-	[[[mock stub] andReturn:@"megamock"] lowercaseString];
-	returnValue = [mock lowercaseString];
-	
-	STAssertEqualObjects(@"megamock", returnValue, @"Should have returned stubbed value.");
-	
-}
-
-- (void)testReturnsStubbedIntReturnValue
-{
-    int expectedValue = 42;
-	[[[mock stub] andReturnValue:OCMOCK_VALUE(expectedValue)] intValue];
-	int returnValue = [mock intValue];
-    
-	STAssertEquals(expectedValue, returnValue, @"Should have returned stubbed value.");
-}
-
-- (void)testRaisesWhenBoxedValueTypesDoNotMatch
-{
-    double expectedValue = 42;
-	[[[mock stub] andReturnValue:OCMOCK_VALUE(expectedValue)] intValue];
-    
-	STAssertThrows([mock intValue], @"Should have raised an exception.");
-}
-
-- (void)testReturnsStubbedNilReturnValue
-{
-	[[[mock stub] andReturn:nil] uppercaseString];
-	
-	id returnValue = [mock uppercaseString];
-	
-	STAssertNil(returnValue, @"Should have returned stubbed value, which is nil.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	raising exceptions, posting notifications, etc.
-// --------------------------------------------------------------------------------------
-
-- (void)testRaisesExceptionWhenAskedTo
-{
-	NSException *exception = [NSException exceptionWithName:@"TestException" reason:@"test" userInfo:nil];
-	[[[mock expect] andThrow:exception] lowercaseString];
-	
-	STAssertThrows([mock lowercaseString], @"Should have raised an exception.");
-}
-
-- (void)testPostsNotificationWhenAskedTo
-{
-	TestObserver *observer = [[[TestObserver alloc] init] autorelease];
-	[[NSNotificationCenter defaultCenter] addObserver:observer selector:@selector(receiveNotification:) name:TestNotification object:nil];
-	
-	NSNotification *notification = [NSNotification notificationWithName:TestNotification object:self];
-	[[[mock stub] andPost:notification] lowercaseString];
-	
-	[mock lowercaseString];
-	
-	STAssertNotNil(observer->notification, @"Should have sent a notification.");
-	STAssertEqualObjects(TestNotification, [observer->notification name], @"Name should match posted one.");
-	STAssertEqualObjects(self, [observer->notification object], @"Object should match posted one.");
-}
-
-- (void)testPostsNotificationInAddtionToReturningValue
-{
-	TestObserver *observer = [[[TestObserver alloc] init] autorelease];
-	[[NSNotificationCenter defaultCenter] addObserver:observer selector:@selector(receiveNotification:) name:TestNotification object:nil];
-	
-	NSNotification *notification = [NSNotification notificationWithName:TestNotification object:self];
-	[[[[mock stub] andReturn:@"foo"] andPost:notification] lowercaseString];
-	
-	STAssertEqualObjects(@"foo", [mock lowercaseString], @"Should have returned stubbed value.");
-	STAssertNotNil(observer->notification, @"Should have sent a notification.");
-}
-
-
-- (NSString *)valueForString:(NSString *)aString andMask:(NSStringCompareOptions)mask
-{
-	return [NSString stringWithFormat:@"[%@, %d]", aString, mask];
-}
-
-- (void)testCallsAlternativeMethodAndPassesOriginalArgumentsAndReturnsValue
-{
-	[[[mock stub] andCall:@selector(valueForString:andMask:) onObject:self] commonPrefixWithString:@"FOO" options:NSCaseInsensitiveSearch];
-	
-	NSString *returnValue = [mock commonPrefixWithString:@"FOO" options:NSCaseInsensitiveSearch];
-	
-	STAssertEqualObjects(@"[FOO, 1]", returnValue, @"Should have passed and returned invocation.");
-}
-
-#if NS_BLOCKS_AVAILABLE
-
-- (void)testCallsBlockWhichCanSetUpReturnValue
-{
-	void (^theBlock)(NSInvocation *) = ^(NSInvocation *invocation) 
-		{
-			NSString *value;
-			[invocation getArgument:&value atIndex:2];
-			value = [NSString stringWithFormat:@"MOCK %@", value];
-			[invocation setReturnValue:&value];
-		};
-		
-	[[[mock stub] andDo:theBlock] stringByAppendingString:[OCMArg any]];
-		
-	STAssertEqualObjects(@"MOCK foo", [mock stringByAppendingString:@"foo"], @"Should have called block.");
-	STAssertEqualObjects(@"MOCK bar", [mock stringByAppendingString:@"bar"], @"Should have called block.");
-}
-
-#endif
-
-- (void)testThrowsWhenTryingToUseForwardToRealObjectOnNonPartialMock
-{
-	STAssertThrows([[[mock expect] andForwardToRealObject] method2], @"Should have raised and exception.");
-}
-
-- (void)testForwardsToRealObjectWhenSetUpAndCalledOnMock
-{
-	TestClassThatCallsSelf *realObject = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:realObject];
-
-	[[[mock expect] andForwardToRealObject] method2];
-	STAssertEquals(@"Foo", [mock method2], @"Should have called method on real object.");
-
-	[mock verify];
-}
-
-- (void)testForwardsToRealObjectWhenSetUpAndCalledOnRealObject
-{
-	TestClassThatCallsSelf *realObject = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:realObject];
-	
-	[[[mock expect] andForwardToRealObject] method2];
-	STAssertEquals(@"Foo", [realObject method2], @"Should have called method on real object.");
-	
-	[mock verify];
-}
-
-
-// --------------------------------------------------------------------------------------
-//	returning values in pass-by-reference arguments
-// --------------------------------------------------------------------------------------
-
-- (void)testReturnsValuesInPassByReferenceArguments
-{
-	NSString *expectedName = [NSString stringWithString:@"Test"];
-	NSArray *expectedArray = [NSArray array];
-	
-	[[mock expect] completePathIntoString:[OCMArg setTo:expectedName] caseSensitive:YES 
-						 matchesIntoArray:[OCMArg setTo:expectedArray] filterTypes:OCMOCK_ANY];
-	
-	NSString *actualName = nil;
-	NSArray *actualArray = nil;
-	[mock completePathIntoString:&actualName caseSensitive:YES matchesIntoArray:&actualArray filterTypes:nil];
-
-	STAssertNoThrow([mock verify], @"An unexpected exception was thrown");
-	STAssertEqualObjects(expectedName, actualName, @"The two string objects should be equal");
-	STAssertEqualObjects(expectedArray, actualArray, @"The two array objects should be equal");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	accepting expected methods
-// --------------------------------------------------------------------------------------
-
-- (void)testAcceptsExpectedMethod
-{
-	[[mock expect] lowercaseString];
-	[mock lowercaseString];
-}
-
-
-- (void)testAcceptsExpectedMethodAndReturnsValue
-{
-	id returnValue;
-
-	[[[mock expect] andReturn:@"Objective-C"] lowercaseString];
-	returnValue = [mock lowercaseString];
-
-	STAssertEqualObjects(@"Objective-C", returnValue, @"Should have returned stubbed value.");
-}
-
-
-- (void)testAcceptsExpectedMethodsInRecordedSequence
-{
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	[mock lowercaseString];
-	[mock uppercaseString];
-}
-
-
-- (void)testAcceptsExpectedMethodsInDifferentSequence
-{
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	[mock uppercaseString];
-	[mock lowercaseString];
-}
-
-
-// --------------------------------------------------------------------------------------
-//	verifying expected methods
-// --------------------------------------------------------------------------------------
-
-- (void)testAcceptsAndVerifiesExpectedMethods
-{
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	[mock lowercaseString];
-	[mock uppercaseString];
-	
-	[mock verify];
-}
-
-
-- (void)testRaisesExceptionOnVerifyWhenNotAllExpectedMethodsWereCalled
-{
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	[mock lowercaseString];
-	
-	STAssertThrows([mock verify], @"Should have raised an exception.");
-}
-
-- (void)testAcceptsAndVerifiesTwoExpectedInvocationsOfSameMethod
-{
-	[[mock expect] lowercaseString];
-	[[mock expect] lowercaseString];
-	
-	[mock lowercaseString];
-	[mock lowercaseString];
-	
-	[mock verify];
-}
-
-
-- (void)testAcceptsAndVerifiesTwoExpectedInvocationsOfSameMethodAndReturnsCorrespondingValues
-{
-	[[[mock expect] andReturn:@"foo"] lowercaseString];
-	[[[mock expect] andReturn:@"bar"] lowercaseString];
-	
-	STAssertEqualObjects(@"foo", [mock lowercaseString], @"Should have returned first stubbed value");
-	STAssertEqualObjects(@"bar", [mock lowercaseString], @"Should have returned seconds stubbed value");
-	
-	[mock verify];
-}
-
-- (void)testReturnsStubbedValuesIndependentOfExpectations
-{
-	[[mock stub] hasSuffix:@"foo"];
-	[[mock expect] hasSuffix:@"bar"];
-	
-	[mock hasSuffix:@"foo"];
-	[mock hasSuffix:@"bar"];
-	[mock hasSuffix:@"foo"]; // Since it's a stub, shouldn't matter how many times we call this
-	
-	[mock verify];
-}
-
--(void)testAcceptsAndVerifiesMethodsWithSelectorArgument
-{
-	[[mock expect] performSelector:@selector(lowercaseString)];
-	[mock performSelector:@selector(lowercaseString)];
-	[mock verify];
-}
-
-
-// --------------------------------------------------------------------------------------
-//	ordered expectations
-// --------------------------------------------------------------------------------------
-
-- (void)testAcceptsExpectedMethodsInRecordedSequenceWhenOrderMatters
-{
-	[mock setExpectationOrderMatters:YES];
-	
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	STAssertNoThrow([mock lowercaseString], @"Should have accepted expected method in sequence.");
-	STAssertNoThrow([mock uppercaseString], @"Should have accepted expected method in sequence.");
-}
-
-- (void)testRaisesExceptionWhenSequenceIsWrongAndOrderMatters
-{
-	[mock setExpectationOrderMatters:YES];
-	
-	[[mock expect] lowercaseString];
-	[[mock expect] uppercaseString];
-	
-	STAssertThrows([mock uppercaseString], @"Should have complained about wrong sequence.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	explicitly rejecting methods (mostly for nice mocks, see below)
-// --------------------------------------------------------------------------------------
-
-- (void)testThrowsWhenRejectedMethodIsCalledOnNiceMock
-{
-	mock = [OCMockObject niceMockForClass:[NSString class]];
-	
-	[[mock reject] uppercaseString];
-	STAssertThrows([mock uppercaseString], @"Should have complained about rejected method being called.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	protocol mocks
-// --------------------------------------------------------------------------------------
-
-- (void)testCanMockFormalProtocol
-{
-	mock = [OCMockObject mockForProtocol:@protocol(NSLocking)];
-	[[mock expect] lock];
-	
-	[mock lock];
-	
-	[mock verify];
-}
-
-- (void)testRaisesWhenUnknownMethodIsCalledOnProtocol
-{
-	mock = [OCMockObject mockForProtocol:@protocol(NSLocking)];
-	STAssertThrows([mock lowercaseString], @"Should have raised an exception.");
-}
-
-- (void)testConformsToMockedProtocol
-{
-	mock = [OCMockObject mockForProtocol:@protocol(NSLocking)];
-	STAssertTrue([mock conformsToProtocol:@protocol(NSLocking)], nil);
-}
-
-- (void)testRespondsToValidProtocolRequiredSelector
-{
-	mock = [OCMockObject mockForProtocol:@protocol(TestProtocol)];	
-    STAssertTrue([mock respondsToSelector:@selector(primitiveValue)], nil);
-}
-
-- (void)testRespondsToValidProtocolOptionalSelector
-{
-	mock = [OCMockObject mockForProtocol:@protocol(TestProtocol)];	
-    STAssertTrue([mock respondsToSelector:@selector(objectValue)], nil);
-}
-
-- (void)testDoesNotRespondToInvalidProtocolSelector
-{
-	mock = [OCMockObject mockForProtocol:@protocol(TestProtocol)];	
-    STAssertFalse([mock respondsToSelector:@selector(fooBar)], nil);
-}
-
-
-// --------------------------------------------------------------------------------------
-//	nice mocks don't complain about unknown methods
-// --------------------------------------------------------------------------------------
-
-- (void)testReturnsDefaultValueWhenUnknownMethodIsCalledOnNiceClassMock
-{
-	mock = [OCMockObject niceMockForClass:[NSString class]];
-	STAssertNil([mock lowercaseString], @"Should return nil on unexpected method call (for nice mock).");	
-	[mock verify];
-}
-
-- (void)testRaisesAnExceptionWhenAnExpectedMethodIsNotCalledOnNiceClassMock
-{
-	mock = [OCMockObject niceMockForClass:[NSString class]];	
-	[[[mock expect] andReturn:@"HELLO!"] uppercaseString];
-	STAssertThrows([mock verify], @"Should have raised an exception because method was not called.");
-}
-
-- (void)testReturnDefaultValueWhenUnknownMethodIsCalledOnProtocolMock
-{
-	mock = [OCMockObject niceMockForProtocol:@protocol(TestProtocol)];
-	STAssertTrue(0 == [mock primitiveValue], @"Should return 0 on unexpected method call (for nice mock).");
-	[mock verify];
-}
-
-- (void)testRaisesAnExceptionWenAnExpectedMethodIsNotCalledOnNiceProtocolMock
-{
-	mock = [OCMockObject niceMockForProtocol:@protocol(TestProtocol)];	
-	[[mock expect] primitiveValue];
-	STAssertThrows([mock verify], @"Should have raised an exception because method was not called.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	partial mocks forward unknown methods to a real instance
-// --------------------------------------------------------------------------------------
-
-- (void)testStubsMethodsOnPartialMock
-{
-	TestClassThatCallsSelf *foo = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:foo];
-	[[[mock stub] andReturn:@"hi"] method1];
-	STAssertEqualObjects(@"hi", [mock method1], @"Should have returned stubbed value");
-}
-
-
-//- (void)testStubsMethodsOnPartialMockForTollFreeBridgedClasses
-//{
-//	mock = [OCMockObject partialMockForObject:[NSString stringWithString:@"hello"]];
-//	[[[mock stub] andReturn:@"hi"] uppercaseString];
-//	STAssertEqualObjects(@"hi", [mock uppercaseString], @"Should have returned stubbed value");
-//}
-
-- (void)testForwardsUnstubbedMethodsCallsToRealObjectOnPartialMock
-{
-	TestClassThatCallsSelf *foo = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:foo];
-	STAssertEqualObjects(@"Foo", [mock method2], @"Should have returned value from real object.");
-}
-
-//- (void)testForwardsUnstubbedMethodsCallsToRealObjectOnPartialMockForTollFreeBridgedClasses
-//{
-//	mock = [OCMockObject partialMockForObject:[NSString stringWithString:@"hello2"]];
-//	STAssertEqualObjects(@"HELLO2", [mock uppercaseString], @"Should have returned value from real object.");
-//}
-
-- (void)testStubsMethodOnRealObjectReference
-{
-	TestClassThatCallsSelf *realObject = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:realObject];
-	[[[mock stub] andReturn:@"TestFoo"] method1];
-	STAssertEqualObjects(@"TestFoo", [realObject method1], @"Should have stubbed method.");
-}
-
-- (void)testRestoresObjectWhenStopped
-{
-	TestClassThatCallsSelf *realObject = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:realObject];
-	[[[mock stub] andReturn:@"TestFoo"] method2];
-	STAssertEqualObjects(@"TestFoo", [realObject method2], @"Should have stubbed method.");
-	[mock stop];
-	STAssertEqualObjects(@"Foo", [realObject method2], @"Should have 'unstubbed' method.");
-}
-
-
-- (void)testCallsToSelfInRealObjectAreShadowedByPartialMock
-{
-	TestClassThatCallsSelf *foo = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:foo];
-	[[[mock stub] andReturn:@"FooFoo"] method2];
-	STAssertEqualObjects(@"FooFoo", [mock method1], @"Should have called through to stubbed method.");
-}
-
-- (NSString *)differentMethodInDifferentClass
-{
-	return @"swizzled!";
-}
-
-- (void)testImplementsMethodSwizzling
-{
-	// using partial mocks and the indirect return value provider
-	TestClassThatCallsSelf *foo = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:foo];
-	[[[mock stub] andCall:@selector(differentMethodInDifferentClass) onObject:self] method1];
-	STAssertEqualObjects(@"swizzled!", [foo method1], @"Should have returned value from different method");
-}
-
-
-- (void)aMethodWithVoidReturn
-{
-}
-
-- (void)testMethodSwizzlingWorksForVoidReturns
-{
-	TestClassThatCallsSelf *foo = [[[TestClassThatCallsSelf alloc] init] autorelease];
-	mock = [OCMockObject partialMockForObject:foo];
-	[[[mock stub] andCall:@selector(aMethodWithVoidReturn) onObject:self] method1];
-	STAssertNoThrow([foo method1], @"Should have worked.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//	mocks should honour the NSObject contract, etc.
-// --------------------------------------------------------------------------------------
-
-- (void)testRespondsToValidSelector
-{
-	STAssertTrue([mock respondsToSelector:@selector(lowercaseString)], nil);
-}
-
-- (void)testDoesNotRespondToInvalidSelector
-{
-	STAssertFalse([mock respondsToSelector:@selector(fooBar)], nil);
-}
-
-- (void)testCanStubValueForKeyMethod
-{
-	id returnValue;
-	
-	mock = [OCMockObject mockForClass:[NSObject class]];
-	[[[mock stub] andReturn:@"SomeValue"] valueForKey:@"SomeKey"];
-	
-	returnValue = [mock valueForKey:@"SomeKey"];
-	
-	STAssertEqualObjects(@"SomeValue", returnValue, @"Should have returned value that was set up.");
-}
-
-- (void)testWorksWithTypeQualifiers
-{
-	id myMock = [OCMockObject mockForProtocol:@protocol(ProtocolWithTypeQualifierMethod)];
-	
-	STAssertNoThrow([[myMock expect] aSpecialMethod:"foo"], @"Should not complain about method with type qualifiers.");
-	STAssertNoThrow([myMock aSpecialMethod:"foo"], @"Should not complain about method with type qualifiers.");
-}
-
-
-// --------------------------------------------------------------------------------------
-//  some internal tests
-// --------------------------------------------------------------------------------------
-
-- (void)testReRaisesFailFastExceptionsOnVerify
-{
-	@try
-	{
-		[mock lowercaseString];
-	}
-	@catch(NSException *exception)
-	{
-		// expected
-	}
-	STAssertThrows([mock verify], @"Should have reraised the exception.");
-}
-
-- (void)testReRaisesRejectExceptionsOnVerify
-{
-	mock = [OCMockObject niceMockForClass:[NSString class]];
-	[[mock reject] uppercaseString];
-	@try
-	{
-		[mock uppercaseString];
-	}
-	@catch(NSException *exception)
-	{
-		// expected
-	}
-	STAssertThrows([mock verify], @"Should have reraised the exception.");
-}
-
-
-- (void)testCanCreateExpectationsAfterInvocations
-{
-	[[mock expect] lowercaseString];
-	[mock lowercaseString];
-	[mock expect];
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMockRecorder.h b/third_party/ocmock/OCMock/OCMockRecorder.h
index af68b17..b11a253 100644
--- a/third_party/ocmock/OCMock/OCMockRecorder.h
+++ b/third_party/ocmock/OCMock/OCMockRecorder.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMockRecorder.h 68 2010-08-20 13:20:52Z erik $
+//  $Id$
 //  Copyright (c) 2004-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCMockRecorder.m b/third_party/ocmock/OCMock/OCMockRecorder.m
index 9969a2c..5cd63d2 100644
--- a/third_party/ocmock/OCMock/OCMockRecorder.m
+++ b/third_party/ocmock/OCMock/OCMockRecorder.m
@@ -1,6 +1,6 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCMockRecorder.m 68 2010-08-20 13:20:52Z erik $
-//  Copyright (c) 2004-2010 by Mulle Kybernetik. See License file for details.
+//  $Id$
+//  Copyright (c) 2004-2011 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
 #import <objc/runtime.h>
@@ -137,7 +137,7 @@
 	if([anInvocation selector] != [recordedInvocation selector])
 		return NO;
 	
-	n = [[recordedInvocation methodSignature] numberOfArguments];
+	n = (int)[[recordedInvocation methodSignature] numberOfArguments];
 	for(i = 2; i < n; i++)
 	{
 		recordedArg = [recordedInvocation getArgumentAtIndexAsObject:i];
@@ -170,8 +170,6 @@
 		}
 		else
 		{
-			if([recordedArg class] != [passedArg class])
-				return NO;
 			if(([recordedArg class] == [NSNumber class]) && 
 				([(NSNumber*)recordedArg compare:(NSNumber*)passedArg] != NSOrderedSame))
 				return NO;
diff --git a/third_party/ocmock/OCMock/OCMockRecorderTests.h b/third_party/ocmock/OCMock/OCMockRecorderTests.h
deleted file mode 100644
index f0783e1..0000000
--- a/third_party/ocmock/OCMock/OCMockRecorderTests.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockRecorderTests.h 21 2008-01-24 18:59:39Z erik $
-//  Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface OCMockRecorderTests : SenTestCase 
-{
-	NSInvocation *testInvocation;
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMockRecorderTests.m b/third_party/ocmock/OCMock/OCMockRecorderTests.m
deleted file mode 100644
index a20fa54..0000000
--- a/third_party/ocmock/OCMock/OCMockRecorderTests.m
+++ /dev/null
@@ -1,81 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCMockRecorderTests.m 61 2010-07-21 02:38:57Z erik $
-//  Copyright (c) 2004-2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import "OCMockRecorderTests.h"
-#import <OCMock/OCMockRecorder.h>
-#import "OCMReturnValueProvider.h"
-#import "OCMExceptionReturnValueProvider.h"
-
-
-@implementation OCMockRecorderTests
-
-- (void)setUp
-{
-	NSMethodSignature *signature;
- 
-	signature = [NSString instanceMethodSignatureForSelector:@selector(initWithString:)];
-	testInvocation = [NSInvocation invocationWithMethodSignature:signature];
-	[testInvocation setSelector:@selector(initWithString:)];
-}
-
-
-- (void)testStoresAndMatchesInvocation
-{
-	OCMockRecorder *recorder;
-	NSString	   *arg;
-	
-	arg = @"I love mocks.";
-	[testInvocation setArgument:&arg atIndex:2];
-	
-	recorder = [[[OCMockRecorder alloc] initWithSignatureResolver:[NSString string]] autorelease];
-	[(id)recorder initWithString:arg];
-
-	STAssertTrue([recorder matchesInvocation:testInvocation], @"Should match.");
-}
-
-
-- (void)testOnlyMatchesInvocationWithRightArguments
-{
-	OCMockRecorder *recorder;
-	NSString	   *arg;
-	
-	arg = @"I love mocks.";
-	[testInvocation setArgument:&arg atIndex:2];
-	
-	recorder = [[[OCMockRecorder alloc] initWithSignatureResolver:[NSString string]] autorelease];
-	[(id)recorder initWithString:@"whatever"];
-	
-	STAssertFalse([recorder matchesInvocation:testInvocation], @"Should not match.");
-}
-
-
-- (void)testAddsReturnValueProvider
-{
-	OCMockRecorder *recorder;
-	NSArray		   *handlerList;
-
-	recorder = [[[OCMockRecorder alloc] initWithSignatureResolver:[NSString string]] autorelease];
-	[recorder andReturn:@"foo"];
-	handlerList = [recorder invocationHandlers];
-	
-	STAssertEquals((NSUInteger)1, [handlerList count], @"Should have added one handler.");
-	STAssertEqualObjects([OCMReturnValueProvider class], [[handlerList objectAtIndex:0] class], @"Should have added correct handler.");
-}
-
-- (void)testAddsExceptionReturnValueProvider
-{
-	OCMockRecorder	*recorder;
-	NSArray			*handlerList;
-	
-	recorder = [[[OCMockRecorder alloc] initWithSignatureResolver:[NSString string]] autorelease];
-	[recorder andThrow:[NSException exceptionWithName:@"TestException" reason:@"A reason" userInfo:nil]];
-	handlerList = [recorder invocationHandlers];
-
-	STAssertEquals((NSUInteger)1, [handlerList count], @"Should have added one handler.");
-	STAssertEqualObjects([OCMExceptionReturnValueProvider class], [[handlerList objectAtIndex:0] class], @"Should have added correct handler.");
-	
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCMock_Prefix.pch b/third_party/ocmock/OCMock/OCMock_Prefix.pch
deleted file mode 100644
index 2546442..0000000
--- a/third_party/ocmock/OCMock/OCMock_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files in the 'OCMock' project.
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif
diff --git a/third_party/ocmock/OCMock/OCObserverMockObject.h b/third_party/ocmock/OCMock/OCObserverMockObject.h
index 2ff416a..908ad2f 100644
--- a/third_party/ocmock/OCMock/OCObserverMockObject.h
+++ b/third_party/ocmock/OCMock/OCObserverMockObject.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCObserverMockObject.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCObserverMockObject.m b/third_party/ocmock/OCMock/OCObserverMockObject.m
index 56ddf99..8509856 100644
--- a/third_party/ocmock/OCMock/OCObserverMockObject.m
+++ b/third_party/ocmock/OCMock/OCObserverMockObject.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCObserverMockObject.m 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
@@ -13,7 +13,7 @@
 
 - (id)init
 {
-	[super init];
+	self = [super init];
 	recorders = [[NSMutableArray alloc] init];
 	return self;
 }
@@ -64,7 +64,7 @@
 
 - (void)handleNotification:(NSNotification *)aNotification
 {
-	int i, limit;
+	NSUInteger i, limit;
 	
 	limit = expectationOrderMatters ? 1 : [recorders count];
 	for(i = 0; i < limit; i++)
diff --git a/third_party/ocmock/OCMock/OCObserverMockObjectTest.h b/third_party/ocmock/OCMock/OCObserverMockObjectTest.h
deleted file mode 100644
index de4fc5e..0000000
--- a/third_party/ocmock/OCMock/OCObserverMockObjectTest.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCObserverMockObjectTest.h 57 2010-07-19 06:14:27Z erik $
-//  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <SenTestingKit/SenTestingKit.h>
-
-
-@interface OCObserverMockObjectTest : SenTestCase 
-{
-	NSNotificationCenter *center;
-	
-	id mock;
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCObserverMockObjectTest.m b/third_party/ocmock/OCMock/OCObserverMockObjectTest.m
deleted file mode 100644
index b058434..0000000
--- a/third_party/ocmock/OCMock/OCObserverMockObjectTest.m
+++ /dev/null
@@ -1,127 +0,0 @@
-//---------------------------------------------------------------------------------------
-//  $Id: OCObserverMockObjectTest.m 57 2010-07-19 06:14:27Z erik $
-//  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
-
-#import <OCMock/OCMock.h>
-#import "OCObserverMockObjectTest.h"
-
-static NSString *TestNotificationOne = @"TestNotificationOne";
-
-
-@implementation OCObserverMockObjectTest
-
-- (void)setUp
-{
-	center = [[[NSNotificationCenter alloc] init] autorelease];
-	mock = [OCMockObject observerMock]; 
-}
-
-- (void)testAcceptsExpectedNotification
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-    
-    [center postNotificationName:TestNotificationOne object:self];
-	
-    [mock verify];
-}
-
-- (void)testAcceptsExpectedNotificationWithSpecifiedObjectAndUserInfo
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-	NSDictionary *info = [NSDictionary dictionaryWithObject:@"foo" forKey:@"key"];
-    [[mock expect] notificationWithName:TestNotificationOne object:self userInfo:info];
-    
-    [center postNotificationName:TestNotificationOne object:self userInfo:info];
-	
-    [mock verify];
-}
-
-- (void)testAcceptsNotificationsInAnyOrder
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-	[[mock expect] notificationWithName:TestNotificationOne object:self];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-	
-	[center postNotificationName:TestNotificationOne object:[NSString string]];
-	[center postNotificationName:TestNotificationOne object:self];
-}
-
-- (void)testAcceptsNotificationsInCorrectOrderWhenOrderMatters
-{
-	[mock setExpectationOrderMatters:YES];
-
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-	[[mock expect] notificationWithName:TestNotificationOne object:self];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-	
-	[center postNotificationName:TestNotificationOne object:self];
-	[center postNotificationName:TestNotificationOne object:[NSString string]];
-}
-
-- (void)testRaisesExceptionWhenSequenceIsWrongAndOrderMatters
-{
-	[mock setExpectationOrderMatters:YES];
-	
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-	[[mock expect] notificationWithName:TestNotificationOne object:self];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-	
-	STAssertThrows([center postNotificationName:TestNotificationOne object:[NSString string]], @"Should have complained about sequence.");
-}
-
-- (void)testRaisesEvenThoughOverlappingExpectationsCouldHaveBeenSatisfied
-{
-	// this test demonstrates a shortcoming, not a feature
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-	[[mock expect] notificationWithName:TestNotificationOne object:self];
-	
-	[center postNotificationName:TestNotificationOne object:self];
-	STAssertThrows([center postNotificationName:TestNotificationOne object:[NSString string]], nil);
-}
-
-- (void)testRaisesExceptionWhenUnexpectedNotificationIsReceived
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-	
-    STAssertThrows([center postNotificationName:TestNotificationOne object:self], nil);
-}
-
-- (void)testRaisesWhenNotificationWithWrongObjectIsReceived
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:self];
-	
-	STAssertThrows([center postNotificationName:TestNotificationOne object:[NSString string]], nil);
-}
-
-- (void)testRaisesWhenNotificationWithWrongUserInfoIsReceived
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:self 
-							   userInfo:[NSDictionary dictionaryWithObject:@"foo" forKey:@"key"]];
-	STAssertThrows([center postNotificationName:TestNotificationOne object:[NSString string] 
-									   userInfo:[NSDictionary dictionaryWithObject:@"bar" forKey:@"key"]], nil);
-}
-
-- (void)testRaisesOnVerifyWhenExpectedNotificationIsNotSent
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-
-	STAssertThrows([mock verify], nil);
-}
-
-- (void)testRaisesOnVerifyWhenNotAllNotificationsWereSent
-{
-	[center addMockObserver:mock name:TestNotificationOne object:nil];
-    [[mock expect] notificationWithName:TestNotificationOne object:[OCMArg any]];
-	[[mock expect] notificationWithName:TestNotificationOne object:self];
-
-	[center postNotificationName:TestNotificationOne object:self];
-	STAssertThrows([mock verify], nil);
-}
-
-@end
diff --git a/third_party/ocmock/OCMock/OCPartialMockObject.h b/third_party/ocmock/OCMock/OCPartialMockObject.h
index 03ad101..bd549ed 100644
--- a/third_party/ocmock/OCMock/OCPartialMockObject.h
+++ b/third_party/ocmock/OCMock/OCPartialMockObject.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCPartialMockObject.h 74 2011-02-15 12:59:47Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCPartialMockObject.m b/third_party/ocmock/OCMock/OCPartialMockObject.m
index 89e8a6c..ebb889f 100644
--- a/third_party/ocmock/OCMock/OCPartialMockObject.m
+++ b/third_party/ocmock/OCMock/OCPartialMockObject.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCPartialMockObject.m 74 2011-02-15 12:59:47Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCPartialMockRecorder.h b/third_party/ocmock/OCMock/OCPartialMockRecorder.h
index c6d3972..95ce4e6 100644
--- a/third_party/ocmock/OCMock/OCPartialMockRecorder.h
+++ b/third_party/ocmock/OCMock/OCPartialMockRecorder.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCPartialMockRecorder.h 57 2010-07-19 06:14:27Z erik $
+//  $Id$
 //  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCPartialMockRecorder.m b/third_party/ocmock/OCMock/OCPartialMockRecorder.m
index 696310f..f40cb7c 100644
--- a/third_party/ocmock/OCMock/OCPartialMockRecorder.m
+++ b/third_party/ocmock/OCMock/OCPartialMockRecorder.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCPartialMockRecorder.m 68 2010-08-20 13:20:52Z erik $
+//  $Id$
 //  Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCProtocolMockObject.h b/third_party/ocmock/OCMock/OCProtocolMockObject.h
index 66ff046..88f3229 100644
--- a/third_party/ocmock/OCMock/OCProtocolMockObject.h
+++ b/third_party/ocmock/OCMock/OCProtocolMockObject.h
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCProtocolMockObject.h 21 2008-01-24 18:59:39Z erik $
+//  $Id$
 //  Copyright (c) 2005-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/OCProtocolMockObject.m b/third_party/ocmock/OCMock/OCProtocolMockObject.m
index 20d35c1..fa4130b 100644
--- a/third_party/ocmock/OCMock/OCProtocolMockObject.m
+++ b/third_party/ocmock/OCMock/OCProtocolMockObject.m
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------------------
-//  $Id: OCProtocolMockObject.m 52 2009-08-14 07:21:10Z erik $
+//  $Id$
 //  Copyright (c) 2005-2008 by Mulle Kybernetik. See License file for details.
 //---------------------------------------------------------------------------------------
 
diff --git a/third_party/ocmock/OCMock/Test-Info.plist b/third_party/ocmock/OCMock/Test-Info.plist
deleted file mode 100644
index e221462..0000000
--- a/third_party/ocmock/OCMock/Test-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.mulle-kybernetik.${EXECUTABLE_NAME}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/third_party/ocmock/OCMock/en.lproj/InfoPlist.strings b/third_party/ocmock/OCMock/en.lproj/InfoPlist.strings
new file mode 100644
index 0000000..477b28f
--- /dev/null
+++ b/third_party/ocmock/OCMock/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/third_party/ocmock/OCMock/version.plist b/third_party/ocmock/OCMock/version.plist
deleted file mode 100644
index 02d7a0a..0000000
--- a/third_party/ocmock/OCMock/version.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildVersion</key>
-	<string>38</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>ProjectName</key>
-	<string>DevToolsWizardTemplates</string>
-	<key>SourceVersion</key>
-	<string>2350000</string>
-</dict>
-</plist>
diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium
index 1714bea..fafe83b 100644
--- a/third_party/ocmock/README.chromium
+++ b/third_party/ocmock/README.chromium
@@ -1,9 +1,9 @@
 Name: ocmock
-URL: http://www.mulle-kybernetik.com/software/OCMock/
+URL: https://github.com/erikdoe/ocmock
 Version: unknown
-Revision: 77
+Revision: 7f521db0628086185123666b0979e48d6ecaeac1
 License: BSD with advertising clause
-License File: OCMock/License.txt
+License File: License.txt
 Security Critical: no
 
 Description:
@@ -12,5 +12,8 @@ with the concept of mock objects please visit mockobjects.com which has more
 details and discussions about this approach to testing software.
 
 Local Modifications:
-gtest_support.h/.mm and ocmock_extensions.h/.mm are not part of the
-ocmock package, and are chromium specific additions.
+This is only a partial inclusion of the OCMock tree. This only includes
+/Source/OCMock because the tests and other files are not necessary for Chromium.
+The License.txt and Changes.txt file are also present from /Source.
+
+Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm.
diff --git a/third_party/ocmock/ocmock.gyp b/third_party/ocmock/ocmock.gyp
index 2c3b809..11e8a01 100644
--- a/third_party/ocmock/ocmock.gyp
+++ b/third_party/ocmock/ocmock.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
author	rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-01-18 15:59:13 +0000
committer	rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-01-18 15:59:13 +0000
commit	4e4e75553acc95f32c1e6e65fca6957d11a9a146 (patch)
tree	17ed8a379174b5a7fa0bf9587f9190edde018a46 /third_party
parent	6cad92abb5227e9a581edf6b241e074e0b484f6c (diff)
download	chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.zip chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.tar.gz chromium_src-4e4e75553acc95f32c1e6e65fca6957d11a9a146.tar.bz2