Merge branch 'pr/116'

Author: parkera

Foundation/NSURL.swift

@@ -516,11 +516,8 @@ public class NSURLComponents : NSObject, NSCopying {
 
     // Returns a URL created from the NSURLComponents. If the NSURLComponents has an authority component (user, password, host or port) and a path component, then the path must either begin with "/" or be an empty string. If the NSURLComponents does not have an authority component (user, password, host or port) and has a path component, the path component must not start with "//". If those requirements are not met, nil is returned.
     public var URL: NSURL? {
-        if let result = _CFURLComponentsCopyURL(_components) {
-            return unsafeBitCast(result, NSURL.self)
-        } else {
-            return nil
-        }
+        guard let result = _CFURLComponentsCopyURL(_components) else { return nil }
+        return unsafeBitCast(result, NSURL.self)
     }
 
     // Returns a URL created from the NSURLComponents relative to a base URL. If the NSURLComponents has an authority component (user, password, host or port) and a path component, then the path must either begin with "/" or be an empty string. If the NSURLComponents does not have an authority component (user, password, host or port) and has a path component, the path component must not start with "//". If those requirements are not met, nil is returned.
@@ -530,7 +527,7 @@ public class NSURLComponents : NSObject, NSCopying {
 
     // Returns a URL string created from the NSURLComponents. If the NSURLComponents has an authority component (user, password, host or port) and a path component, then the path must either begin with "/" or be an empty string. If the NSURLComponents does not have an authority component (user, password, host or port) and has a path component, the path component must not start with "//". If those requirements are not met, nil is returned.
     public var string: String?  {
-        NSUnimplemented()
+        return _CFURLComponentsCopyString(_components)?._swiftObject
     }
 
     // Warning: IETF STD 66 (rfc3986) says the use of the format "user:password" in the userinfo subcomponent of a URI is deprecated because passing authentication information in clear text has proven to be a security risk. However, there are cases where this practice is still needed, and so the user and password components and methods are provided.

TestFoundation/TestNSURL.swift

@@ -43,6 +43,21 @@ let kCFURLCreateAbsoluteURLWithBytesCreator = "CFURLCreateAbsoluteURLWithBytes"
 let kNullURLString = "<null url>"
 let kNullString = "<null>"
 
+/// Reads the test data plist file and returns the list of objects
+private func getTestData() -> [Any]? {
+    let testFilePath = testBundle().pathForResource("NSURLTestData", ofType: "plist")
+    let data = NSData(contentsOfFile: testFilePath!)
+    guard let testRoot = try? NSPropertyListSerialization.propertyListWithData(data!, options: [], format: nil) as? [String : Any] else {
+        XCTFail("Unable to deserialize property list data")
+        return nil
+    }
+    guard let parsingTests = testRoot![kURLTestParsingTestsKey] as? [Any] else {
+        XCTFail("Unable to create the parsingTests dictionary")
+        return nil
+    }
+    return parsingTests
+}
+
 class TestNSURL : XCTestCase {
     var allTests : [(String, () -> ())] {
         return [
@@ -74,7 +89,8 @@ class TestNSURL : XCTestCase {
 */
     }
 
-    internal func URLWithString(urlString : String, baseString : String?) -> NSURL? {
+    /// Returns a URL from the given url string and base
+    private func URLWithString(urlString : String, baseString : String?) -> NSURL? {
         if let baseString = baseString {
             let baseURL = NSURL(string: baseString)
             return NSURL(string: urlString, relativeToURL: baseURL)
@@ -168,21 +184,8 @@ class TestNSURL : XCTestCase {
     }
 
     func test_URLStrings() {
-        let testFilePath = testBundle().pathForResource("NSURLTestData", ofType: "plist")
-        let data = NSData(contentsOfFile: testFilePath!)
-        var testRoot : [String : Any]?
-        do {
-            testRoot = try NSPropertyListSerialization.propertyListWithData(data!, options: [], format: nil) as? [String : Any]
-        } catch {
-            XCTFail("Unable to deserialize property list data")
-        }
-        XCTAssertNotNil(testRoot, "Unable to create the testRoot dictionary")
-        
-        let parsingTests = testRoot![kURLTestParsingTestsKey] as? [Any]
-        XCTAssertNotNil(parsingTests, "Unable to create the parsingTests dictionary")
-        
-        for obj in parsingTests! {
-            let testDict = obj as! [String : Any]
+        for obj in getTestData()! {
+            let testDict = obj as! [String: Any]
             let title = testDict[kURLTestTitleKey] as! String
             let inURL = testDict[kURLTestUrlKey]! as! String
             let inBase = testDict[kURLTestBaseKey] as! String?
@@ -193,7 +196,7 @@ class TestNSURL : XCTestCase {
             var url : NSURL? = nil
             switch (testDict[kURLTestURLCreatorKey]! as! String) {
             case kNSURLWithStringCreator:
-                url = self.URLWithString(inURL, baseString: inBase)
+                url = URLWithString(inURL, baseString: inBase)
             case kCFURLCreateWithStringCreator, kCFURLCreateWithBytesCreator, kCFURLCreateAbsoluteURLWithBytesCreator:
                 // TODO: Not supported right now
                 continue
@@ -342,5 +345,23 @@ class TestNSURL : XCTestCase {
         XCTAssertTrue(strncmp(gFileDoesNotExistName, &fileSystemRep[gRelativeOffsetFromBaseCurrentWorkingDirectory], strlen(gFileDoesNotExistName)) == 0, @"fileSystemRepresentation of file path is wrong");
         */
     }
+}
+    
+class TestNSURLComponents : XCTestCase {
+    var allTests : [(String, () -> ())] {
+        return [
+            ("test_string", test_string),
+        ]
+    }
+    
+    func test_string() {
+        for obj in getTestData()! {
+            let testDict = obj as! [String: Any]
+            let unencodedString = testDict[kURLTestUrlKey] as! String
+            let expectedString = NSString(string: unencodedString).stringByAddingPercentEncodingWithAllowedCharacters(.URLPathAllowedCharacterSet())!
+            guard let components = NSURLComponents(string: expectedString) else { continue }
+            XCTAssertEqual(components.string!, expectedString, "should be the expected string (\(components.string!) != \(expectedString))")
+        }
+    }
 
 }

TestFoundation/main.swift

@@ -46,6 +46,7 @@ XCTMain([
     TestNSString(),
     TestNSTimeZone(),
     TestNSURL(),
+    TestNSURLComponents(),
     TestNSURLRequest(),
     TestNSURLResponse(),
     TestNSUUID(),