Merge branch 'pr/319'

Author: parkera

Foundation/NSPredicate.swift

@@ -89,25 +89,51 @@ extension NSArray {
 }
 
 extension NSMutableArray {
-    public func filterUsingPredicate(_ predicate: NSPredicate) { NSUnimplemented() } // evaluate a predicate against an array of objects and filter the mutable array directly
+    public func filterUsingPredicate(_ predicate: NSPredicate) {
+        let indexesToRemove = NSMutableIndexSet()
+        for (index, object) in self.enumerated() {
+            if !predicate.evaluateWithObject(object) {
+                indexesToRemove.addIndex(index)
+            }
+        }
+        self.removeObjectsAtIndexes(indexesToRemove)
+    } // evaluate a predicate against an array of objects and filter the mutable array directly
 }
 
 extension NSSet {
-    public func filteredSetUsingPredicate(_ predicate: NSPredicate) -> Set<NSObject> { NSUnimplemented() } // evaluate a predicate against a set of objects and return a filtered set
+    public func filteredSetUsingPredicate(_ predicate: NSPredicate) -> Set<NSObject> {
+        return Set(bridge().filter({ object in
+            return predicate.evaluateWithObject(object)
+        }))
+    } // evaluate a predicate against a set of objects and return a filtered set
 }
 
 extension NSMutableSet {
-    public func filterUsingPredicate(_ predicate: NSPredicate) { NSUnimplemented() } // evaluate a predicate against a set of objects and filter the mutable set directly
+    public func filterUsingPredicate(_ predicate: NSPredicate) {
+        for object in self {
+            if !predicate.evaluateWithObject(object) {
+                self.removeObject(object)
+            }
+        }
+    } // evaluate a predicate against a set of objects and filter the mutable set directly
 }
 
 extension NSOrderedSet {
-    
-    public func filteredOrderedSetUsingPredicate(_ p: NSPredicate) -> NSOrderedSet { NSUnimplemented() } // evaluate a predicate against an ordered set of objects and return a filtered ordered set
+    public func filteredOrderedSetUsingPredicate(_ predicate: NSPredicate) -> NSOrderedSet {
+        return NSOrderedSet(array: self._orderedStorage.bridge().filter({ object in
+            return predicate.evaluateWithObject(object)
+        }))
+    } // evaluate a predicate against an ordered set of objects and return a filtered ordered set
 }
 
 extension NSMutableOrderedSet {
-    
-    public func filterUsingPredicate(_ p: NSPredicate) { NSUnimplemented() } // evaluate a predicate against an ordered set of objects and filter the mutable ordered set directly
+    public func filterUsingPredicate(_ predicate: NSPredicate) {
+        let indexesToRemove = NSMutableIndexSet()
+        for (index, object) in self.enumerated() {
+            if !predicate.evaluateWithObject(object) {
+                indexesToRemove.addIndex(index)
+            }
+        }
+        self.removeObjectsAtIndexes(indexesToRemove)
+    } // evaluate a predicate against an ordered set of objects and filter the mutable ordered set directly
 }
-
-

TestFoundation/TestNSPredicate.swift

@@ -22,6 +22,11 @@ class TestNSPredicate: XCTestCase {
             ("test_BooleanPredicate", test_BooleanPredicate),
             ("test_BlockPredicateWithoutVariableBindings", test_BlockPredicateWithoutVariableBindings),
             ("test_filterNSArray", test_filterNSArray),
+            ("test_filterNSMutableArray", test_filterNSMutableArray),
+            ("test_filterNSSet", test_filterNSSet),
+            ("test_filterNSMutableSet", test_filterNSMutableSet),
+            ("test_filterNSOrderedSet", test_filterNSOrderedSet),
+            ("test_filterNSMutableOrderedSet", test_filterNSMutableOrderedSet),
         ]
     }
 
@@ -43,15 +48,57 @@ class TestNSPredicate: XCTestCase {
         XCTAssertFalse(isNSStringPredicate.evaluateWithObject(NSArray()))
     }
 
+    let lengthLessThanThreePredicate = NSPredicate { (obj, bindings) -> Bool in
+        return (obj as? NSString).map({ $0.length < 3 }) == true
+    }
+
+    let startArray = ["1".bridge(), "12".bridge(), "123".bridge(), "1234".bridge()]
+    let expectedArray = ["1".bridge(), "12".bridge()]
 
     func test_filterNSArray() {
-        let predicate = NSPredicate { (obj, bindings) -> Bool in
-            return (obj as? NSString).map({ $0.length <= 2 }) == true
-        }
+        let array = NSArray(array: startArray)
+        let filteredArray = array.filteredArrayUsingPredicate(lengthLessThanThreePredicate).bridge()
+
+        XCTAssertEqual(expectedArray.bridge(), filteredArray)
+    }
+
+    func test_filterNSMutableArray() {
+        let array = NSMutableArray(array: startArray)
+
+        array.filterUsingPredicate(lengthLessThanThreePredicate)
+
+        XCTAssertEqual(expectedArray.bridge(), array)
+    }
+
+    func test_filterNSSet() {
+        let set = Set(startArray).bridge()
+        let filteredSet = set.filteredSetUsingPredicate(lengthLessThanThreePredicate).bridge()
+
+        XCTAssertEqual(Set(expectedArray).bridge(), filteredSet)
+    }
+
+    func test_filterNSMutableSet() {
+        let set = NSMutableSet(objects: ["1".bridge(), "12".bridge(), "123".bridge(), "1234".bridge()], count: 4)
+        set.filterUsingPredicate(lengthLessThanThreePredicate)
+
+        XCTAssertEqual(Set(expectedArray).bridge(), set)
+    }
+
+    func test_filterNSOrderedSet() {
+        let orderedSet = NSOrderedSet(array: startArray)
+        let filteredOrderedSet = orderedSet.filteredOrderedSetUsingPredicate(lengthLessThanThreePredicate)
+
+        XCTAssertEqual(NSOrderedSet(array: expectedArray), filteredOrderedSet)
+    }
+
+    func test_filterNSMutableOrderedSet() {
+        let orderedSet = NSMutableOrderedSet()
+        orderedSet.addObjectsFromArray(startArray)
 
-        let array = NSArray(array: ["1".bridge(), "12".bridge(), "123".bridge(), "1234".bridge()])
-        let filteredArray = array.filteredArrayUsingPredicate(predicate).bridge()
+        orderedSet.filterUsingPredicate(lengthLessThanThreePredicate)
 
-        XCTAssertEqual(["1".bridge(), "12".bridge()].bridge(), filteredArray)
+        let expectedOrderedSet = NSMutableOrderedSet()
+        expectedOrderedSet.addObjectsFromArray(expectedArray)
+        XCTAssertEqual(expectedOrderedSet, orderedSet)
     }
 }