Merge pull request #719 from saiHemak/nsurlqueryitem

Author: swift-ci

CoreFoundation/URL.subproj/CFURLComponents.c

@@ -1073,7 +1073,8 @@ CF_EXPORT CFArrayRef _CFURLComponentsCopyQueryItems(CFURLComponentsRef component
                         else {
                             valueString = CFSTR("");
                         }
-                        CFTypeRef keys[] = {CFSTR("name"), CFSTR("value")};
+                        CFStringRef name = CFSTR("name");
+                        CFTypeRef keys[] = {name, CFSTR("value")};
                         CFTypeRef values[] = {nameString, valueString};
                         CFDictionaryRef entry = CFDictionaryCreate(kCFAllocatorSystemDefault, keys, values, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
                         CFArrayAppendValue(intermediateResult, entry);
@@ -1097,7 +1098,8 @@ CF_EXPORT CFArrayRef _CFURLComponentsCopyQueryItems(CFURLComponentsRef component
                         else {
                             nameString =  CFSTR("");
                         }
-                        CFTypeRef keys[] = {CFSTR("name")};
+                        CFStringRef name = CFSTR("name");
+                        CFTypeRef keys[] = {name};
                         CFTypeRef values[] = {nameString};
                         CFDictionaryRef entry = CFDictionaryCreate(kCFAllocatorSystemDefault, keys, values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
                         CFArrayAppendValue(intermediateResult, entry);
@@ -1126,7 +1128,8 @@ CF_EXPORT CFArrayRef _CFURLComponentsCopyQueryItems(CFURLComponentsRef component
                 else {
                     valueString = CFSTR("");
                 }
-                CFTypeRef keys[] = {CFSTR("name"), CFSTR("value")};
+                CFStringRef name = CFSTR("name");
+                CFTypeRef keys[] = {name, CFSTR("value")};
                 CFTypeRef values[] = {nameString, valueString};
                 CFDictionaryRef entry = CFDictionaryCreate(kCFAllocatorSystemDefault, keys, values, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
                 CFArrayAppendValue(intermediateResult, entry);
@@ -1148,7 +1151,8 @@ CF_EXPORT CFArrayRef _CFURLComponentsCopyQueryItems(CFURLComponentsRef component
                 else {
                     nameString =  CFSTR("");
                 }
-                CFTypeRef keys[] = {CFSTR("name")};
+                CFStringRef name = CFSTR("name");
+                CFTypeRef keys[] = {name};
                 CFTypeRef values[] = {nameString};
                 CFDictionaryRef entry = CFDictionaryCreate(kCFAllocatorSystemDefault, keys, values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
                 CFArrayAppendValue(intermediateResult, entry);
@@ -1206,7 +1210,7 @@ CF_EXPORT void _CFURLComponentsSetQueryItems(CFURLComponentsRef components, CFAr
                     chars[0] = '=';
                     CFStringAppendCharactersToAppendBuffer(&buf, chars, 1);
                     CFStringRef stringWithPercentEncoding = _CFStringCreateByAddingPercentEncodingWithAllowedCharacters(kCFAllocatorSystemDefault, value, queryNameValueAllowed);
-                    CFStringAppendStringToAppendBuffer(&buf, value);
+                    CFStringAppendStringToAppendBuffer(&buf, stringWithPercentEncoding);
                     CFRelease(stringWithPercentEncoding);
                 }
                 // else the query item string will be simply "name"

Foundation/NSURL.swift

@@ -1256,8 +1256,9 @@ open class NSURLComponents: NSObject, NSCopying {
 
                 return (0..<count).map { idx in
                     let oneEntry = unsafeBitCast(CFArrayGetValueAtIndex(queryArray, idx), to: NSDictionary.self)
-                    let entryName = oneEntry.object(forKey: "name"._cfObject) as! String
-                    let entryValue = oneEntry.object(forKey: "value"._cfObject) as? String
+                    let swiftEntry = oneEntry._swiftObject 
+                    let entryName = swiftEntry["name"] as! String
+                    let entryValue = swiftEntry["value"] as? String
                     return URLQueryItem(name: entryName, value: entryValue)
                 }
             } else {

TestFoundation/TestNSURL.swift

@@ -446,7 +446,8 @@ class TestNSURLComponents : XCTestCase {
             ("test_string", test_string),
             ("test_port", test_portSetter),
             ("test_url", test_url),
-            ("test_copy", test_copy)
+            ("test_copy", test_copy),
+            ("test_createURLWithComponents", test_createURLWithComponents)
         ]
     }
 
@@ -524,4 +525,20 @@ class TestNSURLComponents : XCTestCase {
         /* Assert that NSURLComponents.copy is actually a copy of NSURLComponents */ 
         XCTAssertTrue(copy.isEqual(urlComponent))
     }
+    
+    func test_createURLWithComponents() {
+        let urlComponents = NSURLComponents()
+        urlComponents.scheme = "https";
+        urlComponents.host = "com.test.swift";
+        urlComponents.path = "/test/path";
+        let date = Date()
+        let query1 = URLQueryItem(name: "date", value: date.description)
+        let query2 = URLQueryItem(name: "simpleDict", value: "false")
+        let query3 = URLQueryItem(name: "checkTest", value: "false")
+        let query4 = URLQueryItem(name: "someKey", value: "afsdjhfgsdkf^fhdjgf")
+        urlComponents.queryItems = [query1, query2, query3, query4]
+        XCTAssertNotNil(urlComponents.url?.query)
+        XCTAssertEqual(urlComponents.queryItems?.count, 4)
+    }
+
 }