Wrap test into NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT / rename _Error -> Error

Author: albertaleksieiev

Foundation/Stream.swift

@@ -114,7 +114,7 @@ open class Stream: NSObject {
 // InputStream is an abstract class representing the base functionality of a read stream.
 // Subclassers are required to implement these methods.
 open class InputStream: Stream {
-    enum _Error: Error {
+    enum Error: Swift.Error {
         case cantSeekInputStream
     }
 
@@ -159,7 +159,7 @@ open class InputStream: Stream {
         return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream)))!
     }
 
-    open override var streamError: Error? {
+    open override var streamError: Swift.Error? {
         return CFReadStreamCopyError(_stream)
     }
 }
@@ -234,7 +234,7 @@ extension InputStream {
             return
         }
 
-        guard position < Int.max else { throw _Error.cantSeekInputStream }
+        guard position < Int.max else { throw Error.cantSeekInputStream }
 
         let bufferSize = 1024
         var remainingBytes = Int(position)
@@ -243,7 +243,7 @@ extension InputStream {
 
         guard let pointer = buffer.baseAddress?.assumingMemoryBound(to: UInt8.self) else {
             buffer.deallocate()
-            throw _Error.cantSeekInputStream
+            throw Error.cantSeekInputStream
         }
 
         if self.streamStatus == .notOpen {
@@ -253,14 +253,14 @@ extension InputStream {
         while remainingBytes > 0 && self.hasBytesAvailable {
             let read = self.read(pointer, maxLength: min(bufferSize, remainingBytes))
             if read == -1 {
-                throw _Error.cantSeekInputStream
+                throw Error.cantSeekInputStream
             }
             remainingBytes -= read
         }
 
         buffer.deallocate()
         if remainingBytes != 0 {
-            throw _Error.cantSeekInputStream
+            throw Error.cantSeekInputStream
         }
     }
 }

TestFoundation/TestStream.swift

@@ -7,13 +7,14 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
-#if (os(Linux) || os(Android))
-    @testable import Foundation
-#else
-    @testable import SwiftFoundation
+#if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
+    #if (os(Linux) || os(Android))
+        @testable import Foundation
+    #else
+        @testable import SwiftFoundation
+    #endif
 #endif
 
-
 private extension Data {
     init(reading input: InputStream) {
         self.init()
@@ -142,6 +143,7 @@ class TestStream : XCTestCase {
     }
 
     func test_InputStreamSeekToPosition() {
+#if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
         let str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras congue laoreet facilisis. Sed porta tristique orci. Fusce ut nisl dignissim, tempor tortor id, molestie neque. Nam non tincidunt mi. Integer ac diam quis leo aliquam congue et non magna. In porta mauris suscipit erat pulvinar, sed fringilla quam ornare. Nulla vulputate et ligula vitae sollicitudin. Nulla vel vehicula risus. Quisque eu urna ullamcorper, tincidunt ante vitae, aliquet sem. Suspendisse nec turpis placerat, porttitor ex vel, tristique orci. Maecenas pretium, augue non elementum imperdiet, diam ex vestibulum tortor, non ultrices ante enim iaculis ex. Fusce ut nisl dignissim, tempor tortor id, molestie neque. Nam non tincidunt mi. Integer ac diam quis leo aliquam congue et non magna. In porta mauris suscipit erat pulvinar, sed fringilla quam ornare. Nulla vulputate et ligula vitae sollicitudin. Nulla vel vehicula risus. Quisque eu urna ullamcorper, tincidunt ante vitae, aliquet sem. Suspendisse nec turpis placerat, porttitor ex vel, tristique orci. Maecenas pretium, augue non elementum imperdiet, diam ex vestibulum tortor, non ultrices ante enim iaculis ex.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras congue laoreet facilisis. Sed porta tristique orci. Fusce ut nisl dignissim, tempor tortor id, molestie neque. Nam non tincidunt mi. Integer ac diam quis leo aliquam congue et non magna. In porta mauris suscipit erat pulvinar, sed fringilla quam ornare. Nulla vulputate et ligula vitae sollicitudin. Nulla vel vehicula risus. Quisque eu urna ullamcorper, tincidunt ante vitae, aliquet sem. Suspendisse nec turpis placerat, porttitor ex vel."
         XCTAssert(str.count > 1024) // str.count must be bigger than buffersize inside InputStream.seek func.
 
@@ -178,11 +180,14 @@ class TestStream : XCTestCase {
         do {
             try testSubdata(UInt64(str.count + 1)) // out of boundaries
             XCTFail()
-        } catch let error as InputStream._Error {
+        } catch let error as InputStream.Error {
             XCTAssertEqual(error, .cantSeekInputStream)
         } catch {
             XCTFail()
         }
+#else
+        print("NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT is not defined, skip it")
+#endif
     }
 
     func test_outputStreamCreationToFile() {