Merge pull request #3 from 0xced/more-tests

More tests and a few fixes.

Author: calebd

CMDQueryStringSerialization.xcodeproj/project.pbxproj

@@ -75,7 +75,10 @@
 				3B6EAF9C188F5D78005D2EB4 /* Frameworks */,
 				3B6EAF9B188F5D78005D2EB4 /* Products */,
 			);
+			indentWidth = 4;
 			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 0;
 		};
 		3B6EAF9B188F5D78005D2EB4 /* Products */ = {
 			isa = PBXGroup;

CMDQueryStringSerialization/CMDQueryStringSerialization.m

@@ -37,6 +37,9 @@ + (NSDictionary *)dictionaryWithQueryString:(NSString *)string {
 
 
 + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary {
+    if (!dictionary) {
+        return nil;
+    }
     NSMutableArray *pairs = [NSMutableArray arrayWithCapacity:[dictionary count]];
     [dictionary enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
         void (^addPair)(NSString *key, NSString *value) = ^(NSString *key, NSString *value) {
@@ -70,11 +73,14 @@ - (NSString *)cmd_stringByAddingEscapes {
 
 
 - (NSString *)cmd_stringByRemovingEscapes {
-    return [self stringByRemovingPercentEncoding];
+    return [self stringByRemovingPercentEncoding] ?: @"";
 }
 
 
 - (void)cmd_enumeratePairs:(void (^) (NSString *key, NSString *value))block {
+    if ([self length] == 0) {
+        return;
+    }
     NSArray *pairs = [self componentsSeparatedByString:@"&"];
     [pairs enumerateObjectsUsingBlock:^(NSString *pair, NSUInteger index, BOOL *stop) {
         NSRange range = [pair rangeOfString:@"="];

CMDQueryStringSerializationTests/CMDQueryStringSerializationTests.m

@@ -67,4 +67,80 @@ - (void)testQueryStringWithRepeatingParameterWithBracketsToDictionary {
     XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
 }
 
+- (void)testQueryStringWithEmoji {
+    NSString *desiredString = @"grinning=%F0%9F%98%81&winking=%F0%9F%98%89";
+    NSDictionary *desiredDictionary = @{
+        @"grinning" : @"😁",
+        @"winking" : @"\U0001F609"
+    };
+    
+    NSString *actualString = [CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary];
+    XCTAssertEqualObjects(actualString, desiredString, @"Query string is incorrect.");
+    
+    NSDictionary *actualDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:desiredString];
+    XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
+}
+
+- (void)testNilQueryString {
+    NSDictionary *nilDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:nil];
+    XCTAssertNil(nilDictionary);
+}
+
+- (void)testNilDictionary {
+    NSString *nilString = [CMDQueryStringSerialization queryStringWithDictionary:nil];
+    XCTAssertNil(nilString);
+}
+
+- (void)testEmptyQueryString {
+    NSString *desiredString = @"";
+    NSDictionary *desiredDictionary = @{ };
+    
+    NSString *actualString = [CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary];
+    XCTAssertEqualObjects(actualString, desiredString, @"Query string is incorrect.");
+    
+    NSDictionary *actualDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:desiredString];
+    XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
+}
+
+- (void)testEmptyQueryStringKey {
+    NSString *desiredString = @"=value";
+    NSDictionary *desiredDictionary = @{ @"" : @"value" };
+    
+    NSString *actualString = [CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary];
+    XCTAssertEqualObjects(actualString, desiredString, @"Query string is incorrect.");
+    
+    NSDictionary *actualDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:desiredString];
+    XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
+}
+
+- (void)testEmptyQueryStringValue {
+    NSString *desiredString = @"key=";
+    NSDictionary *desiredDictionary = @{ @"key" : @"" };
+    
+    NSString *actualString = [CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary];
+    XCTAssertEqualObjects(actualString, desiredString, @"Query string is incorrect.");
+    
+    NSDictionary *actualDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:desiredString];
+    XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
+}
+
+- (void)testQueryStringWithoutEqualCharacter {
+    NSDictionary *desiredDictionary = @{ @"key" : @"" };
+    
+    NSDictionary *actualDictionary = [CMDQueryStringSerialization dictionaryWithQueryString:@"key"];
+    XCTAssertEqualObjects(actualDictionary, desiredDictionary, @"Query parameters are incorrect.");
+}
+
+- (void)testDictionaryWithUnserializableKey {
+    NSDictionary *desiredDictionary = @{ [NSDate date] : @"value" };
+    
+    XCTAssertThrowsSpecificNamed([CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary], NSException, NSInvalidArgumentException);
+}
+
+- (void)testDictionaryWithUnserializableValue {
+    NSDictionary *desiredDictionary = @{ @"key" : [NSDate date] };
+    
+    XCTAssertThrowsSpecificNamed([CMDQueryStringSerialization queryStringWithDictionary:desiredDictionary], NSException, NSInvalidArgumentException);
+}
+
 @end