Fixing unit tests for Linux

WIP
PureSwift · Sep 24, 2016 · cf25a8e · cf25a8e
1 parent 96ba487
commit cf25a8e
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 21 deletions.
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -7,6 +7,7 @@
 //
 
 import XCTest
+@testable import UnitTests
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
     func XCTMain(_ testCases: [XCTestCaseEntry]) { fatalError("Not Implemented. Linux only") }

diff --git a/Tests/UnitTests/DataTests.swift b/Tests/UnitTests/DataTests.swift
@@ -11,7 +11,7 @@
 #endif
 
 import XCTest
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class DataTests: XCTestCase {
 

diff --git a/Tests/UnitTests/DateComponentsTest.swift b/Tests/UnitTests/DateComponentsTest.swift
@@ -6,8 +6,12 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class DateComponentsTest: XCTestCase {
 

diff --git a/Tests/UnitTests/JSONTests.swift b/Tests/UnitTests/JSONTests.swift
@@ -6,8 +6,12 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class JSONTests: XCTestCase {
 

diff --git a/Tests/UnitTests/POSIXTimeTests.swift b/Tests/UnitTests/POSIXTimeTests.swift
@@ -13,7 +13,7 @@
 #endif
 
 import XCTest
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class POSIXTimeTests: XCTestCase {
 

diff --git a/Tests/UnitTests/RangeTests.swift b/Tests/UnitTests/RangeTests.swift
@@ -6,8 +6,12 @@
 //  Copyright © 2016 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class RangeTests: XCTestCase {
 
@@ -57,4 +61,4 @@ private extension Range where Bound: Integer {
 
         return true
     }
-}
+}
diff --git a/Tests/UnitTests/RegularExpressionTests.swift b/Tests/UnitTests/RegularExpressionTests.swift
@@ -6,9 +6,13 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
-import SwiftFoundation
 import Foundation
+@testable import SwiftFoundation
 
 final class RegularExpressionTests: XCTestCase {
 
@@ -124,15 +128,3 @@ final class RegularExpressionTests: XCTestCase {
         }
     }
 }
-
-#if os(Linux)
-
-extension NSRange {
-
-    init(_ range: Range<Int>) {
-
-        self = NSRange(CountableRange(range))
-    }
-}
-
-#endif
diff --git a/Tests/UnitTests/StringTests.swift b/Tests/UnitTests/StringTests.swift
@@ -6,7 +6,12 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
+@testable import SwiftFoundation
 
 final class StringTests: XCTestCase {
 

diff --git a/Tests/UnitTests/UUIDTests.swift b/Tests/UnitTests/UUIDTests.swift
@@ -6,9 +6,12 @@
 //  Copyright © 2015 PureSwift. All rights reserved.
 //
 
+#if os(Linux)
+    import Glibc
+#endif
+
 import XCTest
-import SwiftFoundation
-import SwiftFoundation
+@testable import SwiftFoundation
 
 final class UUIDTests: XCTestCase {