updated for Swift 3.0

swift-DEVELOPMENT-SNAPSHOT-2016-05-03

Author: colemancda

Sources/FoundationUnitTests/NSFileManagerTests.swift

@@ -26,7 +26,7 @@ class FileManagerTests: XCTestCase {
 
     func testGetCurrentDirectory() {
 
-        XCTAssert(FileManager.currentDirectory == NSFileManager.defaultManager().currentDirectoryPath)
+        XCTAssert(FileManager.currentDirectory == NSFileManager.default().currentDirectoryPath)
     }
 
     func testFileExists() {
@@ -35,7 +35,7 @@ class FileManagerTests: XCTestCase {
 
         let path = NSTemporaryDirectory() + "/" + fileName
 
-        XCTAssert(NSFileManager.defaultManager().createFile(atPath: path, contents: NSData(), attributes: nil))
+        XCTAssert(NSFileManager.default().createFile(atPath: path, contents: NSData(), attributes: nil))
 
         XCTAssert(FileManager.fileExists(at: path))
 
@@ -44,9 +44,9 @@ class FileManagerTests: XCTestCase {
 
     func testDirectoryExists() {
 
-        let path = try! NSFileManager.defaultManager().urlForDirectory( NSSearchPathDirectory.userDirectory, in: NSSearchPathDomainMask.allDomainsMask, appropriateFor: nil, create: false).path!
+        let path = try! NSFileManager.default().urlForDirectory( NSSearchPathDirectory.userDirectory, in: NSSearchPathDomainMask.allDomainsMask, appropriateFor: nil, create: false).path!
 
-        assert(NSFileManager.defaultManager().fileExists(atPath: path, isDirectory: nil),
+        assert(NSFileManager.default().fileExists(atPath: path, isDirectory: nil),
             "Setting non existent directory as test parameter")
 
         XCTAssert(FileManager.directoryExists(at: path))
@@ -66,7 +66,7 @@ class FileManagerTests: XCTestCase {
 
         let path = NSTemporaryDirectory() + "/" + fileName + ".txt"
 
-        XCTAssert(NSFileManager.defaultManager().createFile(atPath: path, contents: data.toFoundation(), attributes: nil))
+        XCTAssert(NSFileManager.default().createFile(atPath: path, contents: data.toFoundation(), attributes: nil))
 
         // read file
 
@@ -92,7 +92,7 @@ class FileManagerTests: XCTestCase {
         let path = NSTemporaryDirectory() + fileName + ".txt"
 
         // create empty file
-        XCTAssert(NSFileManager.defaultManager().createFile(atPath: path, contents: NSData(), attributes: nil))
+        XCTAssert(NSFileManager.default().createFile(atPath: path, contents: NSData(), attributes: nil))
 
         // write file
         do { try FileManager.set(contents: data, at: path) }
@@ -126,9 +126,9 @@ class FileManagerTests: XCTestCase {
 
         // read data
 
-        XCTAssert(NSFileManager.defaultManager().fileExists(atPath: path))
+        XCTAssert(NSFileManager.default().fileExists(atPath: path))
 
-        NSFileManager.defaultManager()
+        NSFileManager.default()
 
         guard let readData = NSData(contentsOfFile: path)
             else { XCTFail("Could not read data"); return }

Sources/SwiftFoundation/POSIXRegularExpression.swift

@@ -82,7 +82,7 @@ public extension POSIXRegularExpression {
 
                 let range = Int(subexpressionMatch.rm_so) ..< Int(subexpressionMatch.rm_eo)
 
-                match.subexpressionRanges.append(RegularExpressionMatch.Range.Found(range))
+                match.subexpressionRanges.append(RegularExpressionMatch.Range.Found(Range(range)))
             }
         }
 

Sources/SwiftFoundation/Range.swift

@@ -6,13 +6,13 @@
 //  Copyright © 2016 PureSwift. All rights reserved.
 //
 
-public extension Range where Element: Integer {
+public extension Range where Bound: Integer {
 
     func isSubset(_ other: Range) -> Bool {
 
-        return self.startIndex >= other.startIndex
-            && self.startIndex <= other.endIndex
-            && self.endIndex >= other.startIndex
-            && self.endIndex <= other.endIndex
+        return self.lowerBound >= other.lowerBound
+            && self.lowerBound <= other.upperBound
+            && self.upperBound >= other.lowerBound
+            && self.upperBound <= other.upperBound
     }
 }

Sources/SwiftFoundation/RegularExpression.swift

@@ -1,4 +1,4 @@
-//
+//
 //  RegularExpression.swift
 //  SwiftFoundation
 //
@@ -135,6 +135,7 @@ public struct RegularExpressionMatch {
 }
 
 public extension String {
+    
     func substring(range: RegularExpressionMatch.Range) -> String? {
         switch range {
         case .NotFound:
@@ -143,9 +144,4 @@ public extension String {
             return substring(range: r)
         }
     }
-    
-    func substring(range: Range<Int>) -> String? {
-        let indexRange = utf8.startIndex.advanced(by: range.startIndex) ..< utf8.startIndex.advanced(by: range.endIndex)
-        return String(utf8[indexRange])
-    }
 }

Sources/SwiftFoundation/String.swift

@@ -46,4 +46,9 @@ public extension String {
 
         return Data(byteValue: [] + utf8)
     }
+    
+    func substring(range: Range<Int>) -> String? {
+        let indexRange = utf8.index(utf8.startIndex, offsetBy: range.lowerBound) ..< utf8.index(utf8.startIndex, offsetBy: range.upperBound)
+        return String(utf8[indexRange])
+    }
 }

Sources/UnitTests/RangeTests.swift

@@ -15,14 +15,46 @@ final class RangeTests: XCTestCase {
 
     func testSubset() {
 
-        let superset = 1 ... 10
+        let superset = Range(1 ... 10)
 
-        XCTAssert((1...10).isSubset(superset))
-        XCTAssert((1...9).isSubset(superset))
-        XCTAssert((2...10).isSubset(superset))
-        XCTAssert((2...9).isSubset(superset))
+        XCTAssert(Range(1...10).isSubset(superset))
+        XCTAssert(Range(1...9).isSubset(superset))
+        XCTAssert(Range(2...10).isSubset(superset))
+        XCTAssert(Range(2...9).isSubset(superset))
 
-        XCTAssert((0...10).isSubset(superset) == false)
-        XCTAssert((0...11).isSubset(superset) == false)
+        XCTAssert((Range(0...10).isSubset(superset)) == false)
+        XCTAssert((Range(0...11).isSubset(superset)) == false)
+        
+        
+    }
+    
+    func testSubsetContainsElement() {
+        
+        let superset = Range(1 ... 10)
+        
+        XCTAssert(Range(1...10).verifyElements(of: superset))
+        XCTAssert(Range(1...9).verifyElements(of: superset))
+        XCTAssert(Range(2...10).verifyElements(of: superset))
+        XCTAssert(Range(2...9).verifyElements(of: superset))
+        
+        XCTAssert((Range(0...10).verifyElements(of: superset)) == false)
+        XCTAssert((Range(0...11).verifyElements(of: superset)) == false)
     }
 }
+
+private extension Range where Bound: Integer {
+    
+    func verifyElements(of superset: Range<Int>) -> Bool {
+        
+        /// dont try this at home kids
+        let range = unsafeBitCast(self, to: Range<Int>.self)
+        
+        for element in range.lowerBound ..< range.upperBound {
+            
+            guard superset.contains(element)
+                else { return false }
+        }
+        
+        return true
+    }
+}