Merge pull request #1460 from saiHemak/urldescription

Author: swift-ci

Foundation/NSURL.swift

@@ -255,7 +255,11 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
     }
 
     open override var description: String {
-        return self.absoluteString
+        if self.relativeString != self.absoluteString {
+            return "\(self.relativeString) -- \(self.baseURL!)"
+        } else {
+            return self.absoluteString
+        }
     }
 
     deinit {

TestFoundation/TestURL.swift

@@ -519,6 +519,12 @@ class TestURL : XCTestCase {
    func test_description() {
         let url = URL(string: "http://amazon.in")!
         XCTAssertEqual(url.description, "http://amazon.in")
+        var urlComponents = URLComponents()
+        urlComponents.port = 8080
+        urlComponents.host = "amazon.in"
+        urlComponents.password = "abcd"
+        let relativeURL = urlComponents.url(relativeTo: url)
+        XCTAssertEqual(relativeURL?.description, "//:[email protected]:8080 -- http://amazon.in")
     }
 }