Skip to content

Commit 50b7086

Browse files
authored
Merge pull request #1809 from ogres/nsnull-description
2 parents e216c61 + 2c06508 commit 50b7086

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Foundation/NSNull.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ open class NSNull : NSObject, NSCopying, NSSecureCoding {
3434
return true
3535
}
3636

37+
open override var description: String {
38+
return "<null>"
39+
}
40+
3741
open override func isEqual(_ object: Any?) -> Bool {
3842
return object is NSNull
3943
}

TestFoundation/TestNSNull.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class TestNSNull : XCTestCase {
1111

1212
static var allTests: [(String, (TestNSNull) -> () throws -> Void)] {
1313
return [
14-
("test_alwaysEqual", test_alwaysEqual)
14+
("test_alwaysEqual", test_alwaysEqual),
15+
("test_description", test_description),
1516
]
1617
}
1718

@@ -34,4 +35,8 @@ class TestNSNull : XCTestCase {
3435
//Make sure that NSNull() != .None
3536
XCTAssertNotEqual(null_1, null_4)
3637
}
38+
39+
func test_description() {
40+
XCTAssertEqual(NSNull().description, "<null>")
41+
}
3742
}

TestFoundation/main.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ XCTMain([
8686
testCase(TestURLResponse.allTests),
8787
testCase(TestHTTPURLResponse.allTests),
8888
testCase(TestURLSession.allTests),
89-
testCase(TestNSNull.allTests),
9089
testCase(TestNSUUID.allTests),
9190
testCase(TestNSValue.allTests),
9291
testCase(TestUserDefaults.allTests),

0 commit comments

Comments
 (0)