Merge pull request #300 from seabaylea/NSURLComponent

Fix failure in setter for NSURLComponents.port

Author: parkera

CoreFoundation/URL.subproj/CFURLComponents.c

@@ -655,7 +655,7 @@ CF_EXPORT Boolean _CFURLComponentsSetPort(CFURLComponentsRef components, CFNumbe
     } else {
         components->_portComponent = NULL;
     }
-    components->_passwordComponentValid = true;
+    components->_portComponentValid = true;
     __CFUnlock(&components->_lock);
     return true;
 }

TestFoundation/TestNSURL.swift

@@ -423,6 +423,7 @@ class TestNSURLComponents : XCTestCase {
     static var allTests: [(String, TestNSURLComponents -> () throws -> Void)] {
         return [
             ("test_string", test_string),
+            ("test_port", test_portSetter),
         ]
     }
 
@@ -435,5 +436,15 @@ class TestNSURLComponents : XCTestCase {
             XCTAssertEqual(components.string!, expectedString, "should be the expected string (\(components.string!) != \(expectedString))")
         }
     }
+    
+    func test_portSetter() {
+        let urlString = "http://myhost.mydomain.com"
+        let port: NSNumber = 8080
+        let expectedString = "http://myhost.mydomain.com:8080"
+        let url = NSURLComponents(string: urlString)
+        url!.port = port
+        let receivedString = url!.string
+        XCTAssertEqual(receivedString, expectedString, "expected \(expectedString) but received \(receivedString)")
+    }
 
 }