Work in progress

Conflicts:
	Code/CoreData/RKManagedObjectLoader.h
	Code/CoreData/RKManagedObjectLoader.m
	Code/CoreData/RKManagedObjectMapping.m
	Code/CoreData/RKManagedObjectMappingOperation.m
	Code/CoreData/RKManagedObjectStore.m
	Code/CoreData/RKManagedObjectThreadSafeInvocation.h
	Code/CoreData/RKManagedObjectThreadSafeInvocation.m
	Code/CoreData/RKSearchableManagedObject.m
	Code/ObjectMapping/RKObjectLoader.m
	Code/ObjectMapping/RKObjectMapper.h
	Code/ObjectMapping/RKObjectMappingOperation.m
	RestKit.xcodeproj/project.pbxproj
	Tests/Logic/CoreData/RKManagedObjectThreadSafeInvocationTest.m
This commit is contained in:
Blake Watters
2012-07-13 13:07:42 -04:00
parent 87797780a4
commit f0706dbdbf
47 changed files with 1610 additions and 642 deletions

View File

@@ -204,6 +204,10 @@ static RKTestFactory *sharedFactory = nil;
+ (void)setUp
{
[RKObjectManager setSharedManager:nil];
[RKClient setSharedClient:nil];
[RKManagedObjectStore setDefaultObjectStore:nil];
[NSManagedObjectContext setDefaultContext:nil];
[RKObjectManager setDefaultMappingQueue:nil];
[RKObjectMapping setDefaultDateFormatters:nil];