Ensure the stars for all pointers belong to the variable rather than the type. Refs #614

This commit is contained in:
Jawwad Ahmad
2012-06-04 22:47:30 -04:00
parent eaa5484b01
commit abb46c382c
191 changed files with 3678 additions and 3628 deletions

View File

@@ -31,14 +31,14 @@
- (void)testShouldSerializeToFormEncodedData
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key2" toKeyPath:@"key2-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/x-www-form-urlencoded" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
assertThat(data, is(equalTo(@"key2-form-name=value2&key1-form-name=value1")));
@@ -46,15 +46,15 @@
- (void)testShouldSerializeADateToFormEncodedData
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"date" toKeyPath:@"date-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/x-www-form-urlencoded" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -63,19 +63,19 @@
- (void)testShouldSerializeADateToAStringUsingThePreferredDateFormatter
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDateFormatter *dateFormatter = [[NSDateFormatter new] autorelease];
dateFormatter.dateFormat = @"MM/dd/yyyy";
dateFormatter.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
mapping.preferredDateFormatter = dateFormatter;
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"date" toKeyPath:@"date-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/x-www-form-urlencoded" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -84,16 +84,16 @@
- (void)testShouldSerializeADateToJSON
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDate dateWithTimeIntervalSince1970:0], @"date", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"date" toKeyPath:@"date-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -102,16 +102,16 @@
- (void)testShouldSerializeNSDecimalNumberAttributesToJSON
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDecimalNumber decimalNumberWithString:@"18274191731731.4557723623"], @"number", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSDecimalNumber decimalNumberWithString:@"18274191731731.4557723623"], @"number", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"number" toKeyPath:@"number-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -120,23 +120,23 @@
- (void)testShouldSerializeRelationshipsToo
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2",
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2",
[NSArray arrayWithObjects:
[NSDictionary dictionaryWithObjectsAndKeys:@"relationship1Value1", @"relatioship1Key1", nil],
[NSDictionary dictionaryWithObjectsAndKeys:@"relationship1Value2", @"relatioship1Key1", nil], nil], @"relationship1",
[NSDictionary dictionaryWithObjectsAndKeys:@"subValue1", @"subKey1", nil], @"relationship2",
nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key2" toKeyPath:@"key2-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"relationship1.relatioship1Key1" toKeyPath:@"relationship1-form-name[r1k1]"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"relationship2.subKey1" toKeyPath:@"relationship2-form-name[subKey1]"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/x-www-form-urlencoded" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -149,14 +149,14 @@
- (void)testShouldSerializeToJSON
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key2" toKeyPath:@"key2-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -165,11 +165,11 @@
- (void)testShouldSetReturnNilIfItDoesNotFindAnythingToSerialize
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key12123" toKeyPath:@"key1-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
assertThat(serialization, is(nilValue()));
@@ -177,26 +177,26 @@
- (void)testShouldSerializeNestedObjectsContainingDatesToJSON
{
RKMappableObject* object = [[RKMappableObject new] autorelease];
RKMappableObject *object = [[RKMappableObject new] autorelease];
object.stringTest = @"The string";
RKMappableAssociation* association = [[RKMappableAssociation new] autorelease];
RKMappableAssociation *association = [[RKMappableAssociation new] autorelease];
association.date = [NSDate dateWithTimeIntervalSince1970:0];
object.hasOne = association;
// Setup object mappings
RKObjectMapping* objectMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
RKObjectMapping *objectMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[objectMapping mapAttributes:@"stringTest", nil];
RKObjectMapping* relationshipMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
RKObjectMapping *relationshipMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[relationshipMapping mapAttributes:@"date", nil];
[objectMapping mapRelationship:@"hasOne" withMapping:relationshipMapping];
// Serialize
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:objectMapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:objectMapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
assertThat(error, is(nilValue()));
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
// Encodes differently on iOS / OS X
@@ -209,15 +209,15 @@
- (void)testShouldEncloseTheSerializationInAContainerIfRequested
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", @"value2", @"key2", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
mapping.rootKeyPath = @"stuff";
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key2" toKeyPath:@"key2-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/x-www-form-urlencoded" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -226,42 +226,42 @@
- (void)testShouldSerializeToManyRelationships
{
RKMappableObject* object = [[RKMappableObject new] autorelease];
RKMappableObject *object = [[RKMappableObject new] autorelease];
object.stringTest = @"The string";
RKMappableAssociation* association = [[RKMappableAssociation new] autorelease];
RKMappableAssociation *association = [[RKMappableAssociation new] autorelease];
association.date = [NSDate dateWithTimeIntervalSince1970:0];
object.hasMany = [NSSet setWithObject:association];
// Setup object mappings
RKObjectMapping* objectMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
RKObjectMapping *objectMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[objectMapping mapAttributes:@"stringTest", nil];
RKObjectMapping* relationshipMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
RKObjectMapping *relationshipMapping = [RKObjectMapping mappingForClass:[NSMutableDictionary class]];
[relationshipMapping mapAttributes:@"date", nil];
[objectMapping mapRelationship:@"hasMany" withMapping:relationshipMapping];
// Serialize
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:objectMapping];
NSError* error = nil;
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:objectMapping];
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
assertThat(error, is(nilValue()));
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(data, is(equalTo(@"{\"hasMany\":[{\"date\":\"1970-01-01 00:00:00 +0000\"}],\"stringTest\":\"The string\"}")));
}
- (void)testShouldSerializeAnNSNumberContainingABooleanToTrueFalseIfRequested
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSNumber numberWithBool:YES], @"boolean", nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
RKObjectAttributeMapping* attributeMapping = [RKObjectAttributeMapping mappingFromKeyPath:@"boolean" toKeyPath:@"boolean-value"];
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1", [NSNumber numberWithBool:YES], @"boolean", nil];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
RKObjectAttributeMapping *attributeMapping = [RKObjectAttributeMapping mappingFromKeyPath:@"boolean" toKeyPath:@"boolean-value"];
[mapping addAttributeMapping:attributeMapping];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));
@@ -270,18 +270,18 @@
- (void)testShouldSerializeANSOrderedSetToJSON
{
NSDictionary* object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1",
NSDictionary *object = [NSDictionary dictionaryWithObjectsAndKeys:@"value1", @"key1",
[NSOrderedSet orderedSetWithObjects:@"setElementOne", @"setElementTwo", @"setElementThree", nil], @"set",
nil];
RKObjectMapping* mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[NSDictionary class]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"key1" toKeyPath:@"key1-form-name"]];
[mapping addAttributeMapping:[RKObjectAttributeMapping mappingFromKeyPath:@"set" toKeyPath:@"set-form-name"]];
RKObjectSerializer* serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
RKObjectSerializer *serializer = [RKObjectSerializer serializerWithObject:object mapping:mapping];
NSError* error = nil;
NSError *error = nil;
id<RKRequestSerializable> serialization = [serializer serializationForMIMEType:@"application/json" error:&error];
NSString* data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
NSString *data = [[[NSString alloc] initWithData:[serialization HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
assertThat(error, is(nilValue()));