Fix bug in mapper delegate configuration and add missing test coverag…

…e for response mapper operation and both object request operation classes. closes RestKit#1156

Code/Network/RKResponseMapperOperation.m

@@ -296,6 +296,7 @@ - (RKMappingResult *)performMappingWithObject:(id)sourceObject error:(NSError **
     RKObjectMappingOperationDataSource *dataSource = [RKObjectMappingOperationDataSource new];
     self.mapperOperation = [[RKMapperOperation alloc] initWithRepresentation:sourceObject mappingsDictionary:self.responseMappingsDictionary];
     self.mapperOperation.mappingOperationDataSource = dataSource;
+    self.mapperOperation.delegate = self.mapperDelegate;
     if (NSLocationInRange(self.response.statusCode, RKStatusCodeRangeForClass(RKStatusCodeClassSuccessful))) {
         self.mapperOperation.targetObject = self.targetObject;
     } else {

Tests/Logic/Network/RKManagedObjectRequestOperationTest.m

@@ -34,6 +34,19 @@ - (NSSet *)localObjectsFromFetchRequestsMatchingRequestURL:(NSError **)error;
 @end
 NSSet *RKSetByRemovingSubkeypathsFromSet(NSSet *setOfKeyPaths);
 
+
+@interface RKTestDelegateManagedObjectRequestOperation : RKManagedObjectRequestOperation
+@end
+
+@implementation RKTestDelegateManagedObjectRequestOperation
+
+- (void)mapperWillStartMapping:(RKMapperOperation *)mapper
+{
+    // For stubbing
+}
+
+@end
+
 @interface RKManagedObjectRequestOperationTest : RKTestCase
 
 @end
@@ -787,4 +800,21 @@ - (void)testThatSuccessfulCompletionSavesManagedObjectIfTargetObjectIsUnsavedEve
     }];
 }
 
+- (void)testThatMapperOperationDelegateIsPassedThroughToUnderlyingMapperOperation
+{
+    RKManagedObjectStore *managedObjectStore = [RKTestFactory managedObjectStore];
+    RKEntityMapping *entityMapping = [RKEntityMapping mappingForEntityForName:@"Human" inManagedObjectStore:managedObjectStore];
+    [entityMapping addAttributeMappingsFromArray:@[ @"name" ]];
+    RKResponseDescriptor *responseDescriptor = [RKResponseDescriptor responseDescriptorWithMapping:entityMapping pathPattern:nil keyPath:@"human" statusCodes:[NSIndexSet indexSetWithIndex:200]];
+
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"/JSON/humans/with_to_one_relationship.json" relativeToURL:[RKTestFactory baseURL]]];
+    RKTestDelegateManagedObjectRequestOperation *managedObjectRequestOperation = [[RKTestDelegateManagedObjectRequestOperation alloc] initWithRequest:request responseDescriptors:@[ responseDescriptor ]];
+    id mockOperation = [OCMockObject partialMockForObject:managedObjectRequestOperation];
+    [[mockOperation expect] mapperWillStartMapping:OCMOCK_ANY];
+    managedObjectRequestOperation.managedObjectContext = managedObjectStore.persistentStoreManagedObjectContext;
+    [managedObjectRequestOperation start];
+    expect([managedObjectRequestOperation isFinished]).will.beTruthy();
+    [mockOperation verify];
+}
+
 @end

Tests/Logic/Network/RKObjectRequestOperationTest.m

@@ -22,6 +22,18 @@ @interface RKTestComplexUser : NSObject
 
 @end
 
+@interface RKMapperTestObjectRequestOperation : RKObjectRequestOperation
+@end
+
+@implementation RKMapperTestObjectRequestOperation
+
+- (void)mapperWillStartMapping:(RKMapperOperation *)mapper
+{
+    // Used for stubbing
+}
+
+@end
+
 @implementation RKTestComplexUser
 @end
 
@@ -597,4 +609,15 @@ - (void)testThatLoadingAnUnexpectedStatusCodeReturnsCorrectErrorMessage
     expect([requestOperation.error localizedDescription]).to.equal(@"Expected status code in (200-299,400-499), got 503");
 }
 
+- (void)testThatMapperOperationDelegateIsPassedThroughToUnderlyingMapperOperation
+{
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"/JSON/ComplexNestedUser.json" relativeToURL:[RKTestFactory baseURL]]];
+    RKMapperTestObjectRequestOperation *requestOperation = [[RKMapperTestObjectRequestOperation alloc] initWithRequest:request responseDescriptors:@[ [self responseDescriptorForComplexUser] ]];
+    id mockOperation = [OCMockObject partialMockForObject:requestOperation];
+    [[mockOperation expect] mapperWillStartMapping:OCMOCK_ANY];
+    [requestOperation start];
+    expect([requestOperation isFinished]).will.beTruthy();
+    [mockOperation verify];
+}
+
 @end

Tests/Logic/Network/RKResponseMapperOperationTest.m

@@ -29,7 +29,6 @@ - (NSString *)description
 @end
 
 @interface RKObjectResponseMapperOperationTest : RKTestCase
-
 @end
 
 @implementation RKObjectResponseMapperOperationTest
@@ -293,4 +292,25 @@ - (void)testThatObjectResponseMapperOperationDoesNotMapWithTargetObjectForUnsucc
     expect([mapper.error code]).notTo.equal(RKMappingErrorTypeMismatch);
 }
 
+- (void)testThatMapperOperationDelegateIsPassedThroughToUnderlyingMapperOperation
+{
+    id mockDelegate = [OCMockObject niceMockForProtocol:@protocol(RKMapperOperationDelegate)];
+    [[mockDelegate expect] mapperWillStartMapping:OCMOCK_ANY];
+
+    NSURL *responseURL = [NSURL URLWithString:@"http://restkit.org/api/v1/users"];
+    NSHTTPURLResponse *response = [[NSHTTPURLResponse alloc] initWithURL:responseURL statusCode:200 HTTPVersion:@"1.1" headerFields:@{@"Content-Type": @"application/json"}];
+    NSData *data = [@"{\"name\": \"Blake\"}" dataUsingEncoding:NSUTF8StringEncoding];
+
+    RKTestUser *testUser = [RKTestUser new];
+    RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[RKTestUser class]];
+    [mapping addAttributeMappingsFromArray:@[ @"name" ]];
+    RKResponseDescriptor *responseDescriptor = [RKResponseDescriptor responseDescriptorWithMapping:mapping pathPattern:nil keyPath:nil statusCodes:[NSIndexSet indexSetWithIndex:200]];
+
+    RKObjectResponseMapperOperation *mapper = [[RKObjectResponseMapperOperation alloc] initWithResponse:response data:data responseDescriptors:@[ responseDescriptor ]];
+    mapper.mapperDelegate = mockDelegate;
+    mapper.targetObject = testUser;
+    [mapper start];    
+    [mockDelegate verify];
+}
+
 @end