And more linux fixes - this time for unit tests

Author: michael-lehew

TestFoundation/TestNSData.swift

@@ -64,9 +64,9 @@ class TestNSData: XCTestCase {
                     // Copy the data to our new length buffer
                     let newBuffer = malloc(newValue)!
                     if newValue <= _length {
-                        memmove(newBuffer, ptr.baseAddress, newValue)
+                        memmove(newBuffer, ptr.baseAddress!, newValue)
                     } else if newValue > _length {
-                        memmove(newBuffer, ptr.baseAddress, _length)
+                        memmove(newBuffer, ptr.baseAddress!, _length)
                         memset(newBuffer + _length, 1, newValue - _length)
                     }
                     let bytePtr = newBuffer.bindMemory(to: UInt8.self, capacity: newValue)
@@ -84,7 +84,7 @@ class TestNSData: XCTestCase {
                 // Need to allocate the buffer now.
                 // It doesn't matter if the buffer is uniquely referenced or not here.
                 let buffer = malloc(length)
-                memset(buffer, 1, length)
+                memset(buffer!, 1, length)
                 let bytePtr = buffer!.bindMemory(to: UInt8.self, capacity: length)
                 let result = UnsafeMutableBufferPointer(start: bytePtr, count: length)
                 _pointer = result
@@ -97,10 +97,10 @@ class TestNSData: XCTestCase {
             let newBuffer = malloc(newBufferLength)
             if let ptr = _pointer {
                 // Copy the existing data to the new box, then return its pointer
-                memmove(newBuffer, ptr.baseAddress, newBufferLength)
+                memmove(newBuffer!, ptr.baseAddress, newBufferLength)
             } else {
                 // Set new data to 1s
-                memset(newBuffer, 1, newBufferLength)
+                memset(newBuffer!, 1, newBufferLength)
             }
             let bytePtr = newBuffer!.bindMemory(to: UInt8.self, capacity: newBufferLength)
             let result = UnsafeMutableBufferPointer(start: bytePtr, count: newBufferLength)
@@ -112,7 +112,7 @@ class TestNSData: XCTestCase {
         override func getBytes(_ buffer: UnsafeMutableRawPointer, length: Int) {
             if let d = _pointer {
                 // Get the real data from the buffer
-                memmove(buffer, d.baseAddress, length)
+                memmove(buffer, d.baseAddress!, length)
             } else {
                 // A more efficient implementation of getBytes in the case where no one has asked for our backing bytes
                 memset(buffer, 1, length)
@@ -663,7 +663,7 @@ extension TestNSData {
 
         // Create a home for our test data
         let x = NSString()
-        let dirPath = try! (NSTemporaryDirectory().bridge()).stringByAppendingPathComponent(NSUUID().uuidString)
+        let dirPath = (NSTemporaryDirectory().bridge()).stringByAppendingPathComponent(NSUUID().uuidString)
         try! FileManager.default.createDirectory(atPath: dirPath, withIntermediateDirectories: true, attributes: nil)
         let filePath = (dirPath.bridge()).stringByAppendingPathComponent("temp_file")
         guard FileManager.default.createFile(atPath: filePath, contents: nil, attributes: nil) else { XCTAssertTrue(false, "Unable to create temporary file"); return}