Add test coverage and fixes for RKMappingTest. closes RestKit#1086

Author: blakewatters

Code/ObjectMapping/RKMappingOperation.m

@@ -603,7 +603,6 @@ - (BOOL)applyRelationshipMappings
 {
     NSAssert(self.dataSource, @"Cannot perform relationship mapping without a data source");
     NSMutableArray *mappingsApplied = [NSMutableArray array];
-    id destinationObject = nil;
 
     for (RKRelationshipMapping *relationshipMapping in [self relationshipMappings]) {
         if ([self isCancelled]) return NO;
@@ -702,7 +701,8 @@ - (BOOL)applyRelationshipMappings
 
         // Notify the delegate
         if ([self.delegate respondsToSelector:@selector(mappingOperation:didSetValue:forKeyPath:usingMapping:)]) {
-            [self.delegate mappingOperation:self didSetValue:destinationObject forKeyPath:relationshipMapping.destinationKeyPath usingMapping:relationshipMapping];
+            id setValue = [self.destinationObject valueForKeyPath:relationshipMapping.destinationKeyPath];
+            [self.delegate mappingOperation:self didSetValue:setValue forKeyPath:relationshipMapping.destinationKeyPath usingMapping:relationshipMapping];
         }
 
         // Fail out if a validation error has occurred

Code/ObjectMapping/RKObjectMapping.h

@@ -376,7 +376,7 @@
 /**
  Returns the preferred date formatter to use when generating NSString representations from NSDate attributes. This type of transformation occurs when RestKit is mapping local objects into JSON or form encoded serializations that do not have a native time construct.
 
- Defaults to an instance of the `RKISO8601DateFormatter` configured with the UTC time-zone. The format string is equal to "YYYY-MM-DDThh:mm:ssTZD"
+ Defaults to an instance of the `RKISO8601DateFormatter` configured with the UTC time-zone. The format string is equal to "yyyy-MM-DDThh:mm:ssTZD"
  
  For details about the ISO-8601 format, see http://www.w3.org/TR/NOTE-datetime
 

Code/Support/RestKit-Prefix.pch

@@ -13,4 +13,5 @@
         #import <SystemConfiguration/SystemConfiguration.h>
         #import <CoreServices/CoreServices.h>
     #endif
+    #import <CoreData/CoreData.h>
 #endif

Code/Testing.h

@@ -11,3 +11,7 @@
 #import "RKTestFactory.h"
 #import "RKTestHelpers.h"
 #import "RKMappingTest.h"
+
+#ifdef _COREDATADEFINES_H
+#import "RKConnectionTestExpectation.h"
+#endif

Code/Testing/RKConnectionTestExpectation.h

@@ -18,6 +18,8 @@
 //  limitations under the License.
 //
 
+#ifdef _COREDATADEFINES_H
+
 #import <Foundation/Foundation.h>
 
 /**
@@ -81,3 +83,5 @@
 - (NSString *)summary;
 
 @end
+
+#endif

Code/Testing/RKConnectionTestExpectation.m

@@ -18,7 +18,8 @@
 //  limitations under the License.
 //
 
-#import <CoreData/CoreData.h>
+#ifdef _COREDATADEFINES_H
+
 #import "RKConnectionTestExpectation.h"
 #import "RKObjectUtilities.h"
 
@@ -64,3 +65,5 @@ - (NSString *)description
 }
 
 @end
+
+#endif

Code/Testing/RKMappingTest.h

@@ -19,7 +19,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
 #import "RKMappingOperation.h"
 #import "RKPropertyMappingTestExpectation.h"
 
@@ -195,6 +194,8 @@ extern NSString * const RKMappingTestExpectationErrorKey;
  */
 @property (nonatomic, strong, readonly) id destinationObject;
 
+#ifdef _COREDATADEFINES_H
+
 ///----------------------------
 /// @name Core Data Integration
 ///----------------------------
@@ -213,4 +214,6 @@ extern NSString * const RKMappingTestExpectationErrorKey;
  */
 @property (nonatomic, strong) id<RKManagedObjectCaching> managedObjectCache;
 
+#endif // _COREDATADEFINES_H
+
 @end

Code/Testing/RKMappingTest.m

@@ -242,7 +242,7 @@ - (BOOL)event:(RKMappingTestEvent *)event satisfiesExpectation:(id)expectation e
                 NSString *reason = [NSString stringWithFormat:@"expected to %@, but instead got %@ '%@'",
                                     expectation, [event.value class], event.value];
                 if (error) *error = [self errorForExpectation:expectation
-                                                     withCode:RKMappingTestEvaluationBlockError
+                                                     withCode:RKMappingTestValueInequalityError
                                                      userInfo:userInfo
                                                   description:description
                                                        reason:reason];
@@ -258,7 +258,7 @@ - (BOOL)event:(RKMappingTestEvent *)event satisfiesExpectation:(id)expectation e
                     NSString *reason = [NSString stringWithFormat:@"expected to %@, but was instead mapped using: %@",
                                         expectation, relationshipMapping];
                     if (error) *error = [self errorForExpectation:expectation
-                                                         withCode:RKMappingTestValueInequalityError
+                                                         withCode:RKMappingTestMappingMismatchError
                                                          userInfo:userInfo
                                                       description:description
                                                            reason:reason];
@@ -319,6 +319,7 @@ - (BOOL)event:(RKMappingTestEvent *)event satisfiesExpectation:(id)expectation e
     // If we have been given an explicit data source, use it
     if (self.mappingOperationDataSource) return self.mappingOperationDataSource;
 
+#ifdef _COREDATADEFINES_H
     if ([self.mapping isKindOfClass:[RKEntityMapping class]]) {
         NSAssert(self.managedObjectContext, @"Cannot test an `RKEntityMapping` with a nil managed object context.");
         id<RKManagedObjectCaching> managedObjectCache = self.managedObjectCache ?: [RKFetchRequestManagedObjectCache new];
@@ -332,6 +333,9 @@ - (BOOL)event:(RKMappingTestEvent *)event satisfiesExpectation:(id)expectation e
     } else {
         return [RKObjectMappingOperationDataSource new];
     }
+#else
+    return [RKObjectMappingOperationDataSource new];
+#endif
 }
 
 - (void)performMapping
@@ -350,7 +354,8 @@ - (void)performMapping
         }
 
         // Let the connection operations execute to completion
-        if ([mappingOperation.dataSource isKindOfClass:[RKManagedObjectMappingOperationDataSource class]]) {
+        Class managedObjectMappingOperationDataSourceClass = NSClassFromString(@"RKManagedObjectMappingOperationDataSource");
+        if ([mappingOperation.dataSource isKindOfClass:managedObjectMappingOperationDataSourceClass]) {
             NSOperationQueue *operationQueue = [(RKManagedObjectMappingOperationDataSource *)mappingOperation.dataSource operationQueue];
             if (! [operationQueue isEqual:[NSOperationQueue mainQueue]]) {
                 [operationQueue waitUntilAllOperationsAreFinished];
@@ -410,7 +415,8 @@ - (BOOL)evaluate
 - (BOOL)evaluateExpectation:(id)expectation error:(NSError **)error
 {
     NSParameterAssert(expectation);
-    NSAssert([expectation isKindOfClass:[RKPropertyMappingTestExpectation class]] || [expectation isKindOfClass:[RKConnectionTestExpectation class]], @"Must be an instance of `RKPropertyMappingTestExpectation` or `RKConnectionTestExpectation`");
+    Class connectionTestExpectation = NSClassFromString(@"RKConnectionTestExpectation");
+    NSAssert([expectation isKindOfClass:[RKPropertyMappingTestExpectation class]] || (connectionTestExpectation && [expectation isKindOfClass:connectionTestExpectation]), @"Must be an instance of `RKPropertyMappingTestExpectation` or `RKConnectionTestExpectation`");
     [self performMapping];
 
     RKMappingTestEvent *event = [self eventMatchingExpectation:expectation];

README.md

@@ -223,6 +223,8 @@ operation.managedObjectCache = managedObjectStore.managedObjectCache;
 } failure:^(RKObjectRequestOperation *operation, NSError *error) {
 	NSLog(@"Failed with error: %@", [error localizedDescription]);
 }];
+NSOperationQueue *operationQueue = [NSOperationQueue new];
+[operationQueue addOperation:operation];
 ```
 
 ### Map a Client Error Response to an NSError

RestKit.xcodeproj/project.pbxproj

@@ -497,6 +497,8 @@
 		25B408271491CDDC00F21111 /* RKPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 25B408241491CDDB00F21111 /* RKPathUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		25B408281491CDDC00F21111 /* RKPathUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B408251491CDDB00F21111 /* RKPathUtilities.m */; };
 		25B408291491CDDC00F21111 /* RKPathUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B408251491CDDB00F21111 /* RKPathUtilities.m */; };
+		25B639CC16961EFA0065EB7B /* RKMappingTestTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B639CB16961EFA0065EB7B /* RKMappingTestTest.m */; };
+		25B639CD16961EFA0065EB7B /* RKMappingTestTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B639CB16961EFA0065EB7B /* RKMappingTestTest.m */; };
 		25B6E95514CF795D00B1E881 /* RKErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 25B6E95414CF795D00B1E881 /* RKErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		25B6E95614CF795D00B1E881 /* RKErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 25B6E95414CF795D00B1E881 /* RKErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		25B6E95814CF7A1C00B1E881 /* RKErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B6E95714CF7A1C00B1E881 /* RKErrors.m */; };
@@ -893,6 +895,7 @@
 		25AFF8F015B4CF1F0051877F /* RKMappingErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RKMappingErrors.h; sourceTree = "<group>"; };
 		25B408241491CDDB00F21111 /* RKPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKPathUtilities.h; sourceTree = "<group>"; };
 		25B408251491CDDB00F21111 /* RKPathUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKPathUtilities.m; sourceTree = "<group>"; };
+		25B639CB16961EFA0065EB7B /* RKMappingTestTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKMappingTestTest.m; sourceTree = "<group>"; };
 		25B6E95414CF795D00B1E881 /* RKErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKErrors.h; sourceTree = "<group>"; };
 		25B6E95714CF7A1C00B1E881 /* RKErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKErrors.m; sourceTree = "<group>"; };
 		25B6E95A14CF7E3C00B1E881 /* RKObjectMappingMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKObjectMappingMatcher.h; sourceTree = "<group>"; };
@@ -1292,6 +1295,7 @@
 				2516101B1456F2330060A5C5 /* ObjectMapping */,
 				251610511456F2330060A5C5 /* Support */,
 				25104F9B15C33E3A00829135 /* Search */,
+				25B639C816961EC70065EB7B /* Testing */,
 				251610471456F2330060A5C5 /* Server */,
 			);
 			path = Tests;
@@ -1561,6 +1565,15 @@
 			name = Testing;
 			sourceTree = "<group>";
 		};
+		25B639C816961EC70065EB7B /* Testing */ = {
+			isa = PBXGroup;
+			children = (
+				25B639CB16961EFA0065EB7B /* RKMappingTestTest.m */,
+			);
+			name = Testing;
+			path = Logic/Testing;
+			sourceTree = "<group>";
+		};
 		25BCB31715ED57D500EE84DD /* AFNetworking */ = {
 			isa = PBXGroup;
 			children = (
@@ -2358,6 +2371,7 @@
 				2536D1FD167270F100DF9BB0 /* RKRouterTest.m in Sources */,
 				2551338F167838590017E4B6 /* RKHTTPRequestOperationTest.m in Sources */,
 				255133CF167AC7600017E4B6 /* RKManagedObjectRequestOperationTest.m in Sources */,
+				25B639CC16961EFA0065EB7B /* RKMappingTestTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2508,6 +2522,7 @@
 				2543A25E1664FD3200821D5B /* RKResponseDescriptorTest.m in Sources */,
 				2536D1FE167270F100DF9BB0 /* RKRouterTest.m in Sources */,
 				25513390167838590017E4B6 /* RKHTTPRequestOperationTest.m in Sources */,
+				25B639CD16961EFA0065EB7B /* RKMappingTestTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Tests/Fixtures/JSON/humans/with_to_one_relationship.json

@@ -1 +1,12 @@
-{"human":{"name":"Blake Watters","id":null,"age":28,"favorite_cat":{"name": "Asia"}}}
+{
+    "human": {
+        "name": "Blake Watters",
+        "id": null,
+        "age": 28,
+        "favorite_cat_id": 1234,
+        "favorite_cat": {
+            "name": "Asia",
+            "id": 1234
+        }
+    }
+}

Tests/Fixtures/JSON/user.json

@@ -26,5 +26,8 @@
             "id": 7,
             "name": "Rachit Shukla"
         }
-    ]
+    ],
+    "created_at": "2011-02-02 07:53:08",
+    "latitude": 12345,
+    "longitude": 56789
 }