Merge pull request swiftlang#1516 from otaviolima/remove-superfluous-XCTAssertNotNil

swift-ci · web-flow · commit 57e5f7fbeda3 · 2018-04-16T02:18:22.000-07:00
diff --git a/TestFoundation/TestDateFormatter.swift b/TestFoundation/TestDateFormatter.swift
@@ -56,7 +56,6 @@ class TestDateFormatter: XCTestCase {
                             "shortStandaloneQuarterSymbols" : ["Q1", "Q2", "Q3", "Q4"]]
         
         let f = DateFormatter()
-        XCTAssertNotNil(f)
         XCTAssertNotNil(f.timeZone)
         XCTAssertNotNil(f.locale)
         
diff --git a/TestFoundation/TestFileManager.swift b/TestFoundation/TestFileManager.swift
@@ -153,7 +153,6 @@ class TestFileManager : XCTestCase {
     func test_fileSystemRepresentation() {
         let str = "☃"
         let result = FileManager.default.fileSystemRepresentation(withPath: str)
-        XCTAssertNotNil(result)
         XCTAssertEqual(UInt8(bitPattern: result[0]), 0xE2)
         XCTAssertEqual(UInt8(bitPattern: result[1]), 0x98)
         XCTAssertEqual(UInt8(bitPattern: result[2]), 0x83)
@@ -657,7 +656,6 @@ class TestFileManager : XCTestCase {
     func test_temporaryDirectoryForUser() {
         let filemanger = FileManager.default
         let tmpDir = filemanger.temporaryDirectory
-        XCTAssertNotNil(tmpDir)
         let tmpFileUrl = tmpDir.appendingPathComponent("test.bin")
         let tmpFilePath = tmpFileUrl.path
         
diff --git a/TestFoundation/TestNSData.swift b/TestFoundation/TestNSData.swift
@@ -833,7 +833,6 @@ class TestNSData: LoopbackServerTest {
     // Check all of the NSMutableData constructors are available.
     func test_initNSMutableData() {
         let mData = NSMutableData()
-        XCTAssertNotNil(mData)
         XCTAssertEqual(mData.length, 0)
     }
 
diff --git a/TestFoundation/TestNSURLRequest.swift b/TestFoundation/TestNSURLRequest.swift
@@ -40,7 +40,6 @@ class TestNSURLRequest : XCTestCase {
     func test_construction() {
         let request = NSURLRequest(url: url)
         // Match macOS Foundation responses
-        XCTAssertNotNil(request)
         XCTAssertEqual(request.url, url)
         XCTAssertEqual(request.httpMethod, "GET")
         XCTAssertNil(request.allHTTPHeaderFields)
@@ -52,7 +51,6 @@ class TestNSURLRequest : XCTestCase {
         let request = NSMutableURLRequest(url: url)
         
         //Confirm initial state matches NSURLRequest responses
-        XCTAssertNotNil(request)
         XCTAssertEqual(request.url, url)
         XCTAssertEqual(request.httpMethod, "GET")
         XCTAssertNil(request.allHTTPHeaderFields)
diff --git a/TestFoundation/TestNotificationCenter.swift b/TestFoundation/TestNotificationCenter.swift
@@ -35,7 +35,6 @@ class TestNotificationCenter : XCTestCase {
     
     func test_defaultCenter() {
         let defaultCenter1 = NotificationCenter.default
-        XCTAssertNotNil(defaultCenter1)
         let defaultCenter2 = NotificationCenter.default
         XCTAssertEqual(defaultCenter1, defaultCenter2)
     }
diff --git a/TestFoundation/TestNotificationQueue.swift b/TestFoundation/TestNotificationQueue.swift
@@ -38,13 +38,11 @@ FIXME SR-4280 timeouts in TestNSNotificationQueue tests
 
     func test_defaultQueue() {
         let defaultQueue1 = NotificationQueue.default
-        XCTAssertNotNil(defaultQueue1)
         let defaultQueue2 = NotificationQueue.default
         XCTAssertEqual(defaultQueue1, defaultQueue2)
 
         executeInBackgroundThread() {
             let defaultQueueForBackgroundThread = NotificationQueue.default
-            XCTAssertNotNil(defaultQueueForBackgroundThread)
             XCTAssertEqual(defaultQueueForBackgroundThread, NotificationQueue.default)
             XCTAssertNotEqual(defaultQueueForBackgroundThread, defaultQueue1)
         }
diff --git a/TestFoundation/TestPipe.swift b/TestFoundation/TestPipe.swift
@@ -38,7 +38,7 @@ class TestPipe : XCTestCase {
         let data = aPipe.fileHandleForReading.readData(ofLength: text.count)
         
         // Confirm that we did read data
-        XCTAssertNotNil(data)
+        XCTAssertEqual(data.count, stringAsData?.count, "Expected to read \(String(describing:stringAsData?.count)) from pipe but read \(data.count) instead")
         
         // Confirm the data can be converted to a String
         let convertedData = String(data: data, encoding: .utf8)
diff --git a/TestFoundation/TestProcessInfo.swift b/TestFoundation/TestProcessInfo.swift
@@ -34,7 +34,7 @@ class TestProcessInfo : XCTestCase {
         XCTAssertFalse(versionString.isEmpty)
         
         let version = processInfo.operatingSystemVersion
-        XCTAssertNotNil(version.majorVersion != 0)
+        XCTAssert(version.majorVersion != 0)
     }
     
     func test_processName() {
diff --git a/TestFoundation/TestRunLoop.swift b/TestFoundation/TestRunLoop.swift
@@ -38,9 +38,7 @@ class TestRunLoop : XCTestCase {
     
     func test_runLoopInit() {
         let mainRunLoop = RunLoop.main
-        XCTAssertNotNil(mainRunLoop)
         let currentRunLoop = RunLoop.current
-        XCTAssertNotNil(currentRunLoop)
 
         let secondAccessOfMainLoop = RunLoop.main
         XCTAssertEqual(mainRunLoop, secondAccessOfMainLoop, "fetching the main loop a second time should be equal")
diff --git a/TestFoundation/TestThread.swift b/TestFoundation/TestThread.swift
@@ -39,8 +39,6 @@ class TestThread : XCTestCase {
     func test_currentThread() {
         let thread1 = Thread.current
         let thread2 = Thread.current
-        XCTAssertNotNil(thread1)
-        XCTAssertNotNil(thread2)
         XCTAssertEqual(thread1, thread2)
         XCTAssertEqual(thread1, Thread.mainThread)
     }
diff --git a/TestFoundation/TestURL.swift b/TestFoundation/TestURL.swift
@@ -71,9 +71,7 @@ class TestURL : XCTestCase {
     
     func test_fileURLWithPath_relativeTo() {
         let homeDirectory = NSHomeDirectory()
-        XCTAssertNotNil(homeDirectory, "Failed to find home directory")
         let homeURL = URL(fileURLWithPath: homeDirectory, isDirectory: true)
-        XCTAssertNotNil(homeURL, "fileURLWithPath:isDirectory: failed")
         XCTAssertEqual(homeDirectory, homeURL.path)
 
         #if os(macOS)
@@ -88,14 +86,11 @@ class TestURL : XCTestCase {
         #endif
         // we're telling fileURLWithPath:isDirectory:relativeTo: Documents is a directory
         let url1 = URL(fileURLWithFileSystemRepresentation: relativePath, isDirectory: true, relativeTo: baseURL)
-        XCTAssertNotNil(url1, "fileURLWithPath:isDirectory:relativeTo: failed")
         // we're letting fileURLWithPath:relativeTo: determine Documents is a directory with I/O
         let url2 = URL(fileURLWithPath: relativePath, relativeTo: baseURL)
-        XCTAssertNotNil(url2, "fileURLWithPath:relativeTo: failed")
         XCTAssertEqual(url1, url2, "\(url1) was not equal to \(url2)")
         // we're telling fileURLWithPath:relativeTo: Documents is a directory with a trailing slash
         let url3 = URL(fileURLWithPath: relativePath + "/", relativeTo: baseURL)
-        XCTAssertNotNil(url3, "fileURLWithPath:relativeTo: failed")
         XCTAssertEqual(url1, url3, "\(url1) was not equal to \(url3)")
     }
     
diff --git a/TestFoundation/TestURLCredential.swift b/TestFoundation/TestURLCredential.swift
@@ -28,7 +28,6 @@ class TestURLCredential : XCTestCase {
     
     func test_construction() {
         let credential = URLCredential(user: "swiftUser", password: "swiftPassword", persistence: .forSession)
-        XCTAssertNotNil(credential)
         XCTAssertEqual(credential.user, "swiftUser")
         XCTAssertEqual(credential.password, "swiftPassword")
         XCTAssertEqual(credential.persistence, URLCredential.Persistence.forSession)
diff --git a/TestFoundation/TestURLRequest.swift b/TestFoundation/TestURLRequest.swift
@@ -37,7 +37,6 @@ class TestURLRequest : XCTestCase {
     func test_construction() {
         let request = URLRequest(url: url)
         // Match macOS Foundation responses
-        XCTAssertNotNil(request)
         XCTAssertEqual(request.url, url)
         XCTAssertEqual(request.httpMethod, "GET")
         XCTAssertNil(request.allHTTPHeaderFields)
@@ -49,7 +48,6 @@ class TestURLRequest : XCTestCase {
         var request = URLRequest(url: url)
         
         //Confirm initial state matches NSURLRequest responses
-        XCTAssertNotNil(request)
         XCTAssertEqual(request.url, url)
         XCTAssertEqual(request.httpMethod, "GET")
         XCTAssertNil(request.allHTTPHeaderFields)

Original file line number	Diff line number	Diff line change
`@@ -833,7 +833,6 @@ class TestNSData: LoopbackServerTest {`
`833`	`833`	`// Check all of the NSMutableData constructors are available.`
`834`	`834`	`func test_initNSMutableData() {`
`835`	`835`	`let mData = NSMutableData()`
`836`		`- XCTAssertNotNil(mData)`
`837`	`836`	`XCTAssertEqual(mData.length, 0)`
`838`	`837`	`}`
`839`	`838`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ class TestNotificationCenter : XCTestCase {`
`35`	`35`
`36`	`36`	`func test_defaultCenter() {`
`37`	`37`	`let defaultCenter1 = NotificationCenter.default`
`38`		`- XCTAssertNotNil(defaultCenter1)`
`39`	`38`	`let defaultCenter2 = NotificationCenter.default`
`40`	`39`	`XCTAssertEqual(defaultCenter1, defaultCenter2)`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class TestProcessInfo : XCTestCase {`
`34`	`34`	`XCTAssertFalse(versionString.isEmpty)`
`35`	`35`
`36`	`36`	`let version = processInfo.operatingSystemVersion`
`37`		`- XCTAssertNotNil(version.majorVersion != 0)`
	`37`	`+ XCTAssert(version.majorVersion != 0)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func test_processName() {`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ class TestThread : XCTestCase {`
`39`	`39`	`func test_currentThread() {`
`40`	`40`	`let thread1 = Thread.current`
`41`	`41`	`let thread2 = Thread.current`
`42`		`- XCTAssertNotNil(thread1)`
`43`		`- XCTAssertNotNil(thread2)`
`44`	`42`	`XCTAssertEqual(thread1, thread2)`
`45`	`43`	`XCTAssertEqual(thread1, Thread.mainThread)`
`46`	`44`	`}`