Merge pull request #1346 from ianpartridge/urlrequest-description

Author: swift-ci

Foundation/NSURLRequest.swift

@@ -346,6 +346,11 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
     open internal(set) var httpShouldHandleCookies: Bool = true
 
     open internal(set) var httpShouldUsePipelining: Bool = true
+
+    open override var description: String {
+        let url = self.url?.description ?? "(null)"
+        return super.description + " { URL: \(url) }"
+    }
 }
 
 /// An `NSMutableURLRequest` object represents a mutable URL load

TestFoundation/TestNSURLRequest.swift

@@ -31,6 +31,7 @@ class TestNSURLRequest : XCTestCase {
             ("test_NSCoding_2", test_NSCoding_2),
             ("test_NSCoding_3", test_NSCoding_3),
             ("test_methodNormalization", test_methodNormalization),
+            ("test_description", test_description),
         ]
     }
 
@@ -283,4 +284,18 @@ class TestNSURLRequest : XCTestCase {
             XCTAssertEqual(request.httpMethod, n.value)
         }
     }
+
+    func test_description() {
+        let url = URL(string: "http://swift.org")!
+        let request = NSMutableURLRequest(url: url)
+
+        if request.description.range(of: "http://swift.org") == nil {
+            XCTFail("description should contain URL")
+        }
+
+        request.url = nil
+        if request.description.range(of: "(null)") == nil {
+            XCTFail("description of nil URL should contain (null)")
+        }
+    }
 }

TestFoundation/TestURLRequest.swift

@@ -28,6 +28,7 @@ class TestURLRequest : XCTestCase {
             ("test_mutableCopy_2", test_mutableCopy_2),
             ("test_mutableCopy_3", test_mutableCopy_3),
             ("test_methodNormalization", test_methodNormalization),
+            ("test_description", test_description),
         ]
     }
 
@@ -237,5 +238,15 @@ class TestURLRequest : XCTestCase {
             XCTAssertEqual(request.httpMethod, n.value)
         }
     }
+
+    func test_description() {
+        let url = URL(string: "http://swift.org")!
+
+        var request = URLRequest(url: url)
+        XCTAssertEqual(request.description, "http://swift.org")
+
+        request.url = nil
+        XCTAssertEqual(request.description, "url: nil")
+    }
 }