Merge pull request #298 from pushkarnk/nsorderedset

Implementing reversedObjectEnumeration() and reversedOrderedSet in NSOrderedSet

Author: phausler

Foundation/NSOrderedSet.swift

@@ -224,9 +224,18 @@ extension NSOrderedSet {
         }
     }
 
-    public func reverseObjectEnumerator() -> NSEnumerator { NSUnimplemented() }
+    public func reverseObjectEnumerator() -> NSEnumerator { 
+        if self.dynamicType === NSOrderedSet.self || self.dynamicType === NSMutableOrderedSet.self {
+            return NSGeneratorEnumerator(_orderedStorage.reversed().makeIterator())
+        } else {
+            NSRequiresConcreteImplementation()
+        }
+    }
 
-    /*@NSCopying*/ public var reversedOrderedSet: NSOrderedSet { NSUnimplemented() }
+    /*@NSCopying*/ 
+    public var reversedOrderedSet: NSOrderedSet { 
+        return NSOrderedSet(array: _orderedStorage.reversed().bridge().bridge())     
+    }
 
     // These two methods return a facade object for the receiving ordered set,
     // which acts like an immutable array or set (respectively).  Note that

TestFoundation/TestNSOrderedSet.swift

@@ -26,6 +26,9 @@ class TestNSOrderedSet : XCTestCase {
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_Enumeration", test_Enumeration),
             ("test_Uniqueness", test_Uniqueness),
+            ("test_reversedEnumeration", test_reversedEnumeration),
+            ("test_reversedOrderedSet", test_reversedOrderedSet),
+            ("test_reversedEmpty", test_reversedEmpty),
             ("test_ObjectAtIndex", test_ObjectAtIndex),
             ("test_ObjectsAtIndexes", test_ObjectsAtIndexes),
             ("test_GetObjects", test_GetObjects),
@@ -49,6 +52,8 @@ class TestNSOrderedSet : XCTestCase {
             ("test_Union", test_Union),
             ("test_Initializers", test_Initializers),
             ("test_Sorting", test_Sorting),
+            ("test_reversedEnumerationMutable", test_reversedEnumerationMutable),
+            ("test_reversedOrderedSetMutable", test_reversedOrderedSetMutable),
         ]
     }
 
@@ -76,6 +81,36 @@ class TestNSOrderedSet : XCTestCase {
         XCTAssertEqual(set.objectAtIndex(1) as? NSString, "bar")
     }
 
+    func test_reversedEnumeration() {
+        let arr = ["foo", "bar", "baz"]
+        let set = NSOrderedSet(array: arr.bridge().bridge())
+        var index = set.count - 1
+        let revSet = set.reverseObjectEnumerator()
+        for item in revSet {
+            XCTAssertEqual(set.objectAtIndex(index) as? NSString, item as? NSString)
+            index -= 1
+        }
+    }
+
+    func test_reversedOrderedSet() {
+        let days = ["monday", "tuesday", "wednesday", "thursday", "friday"]
+        let work = NSOrderedSet(array: days.bridge().bridge())
+        let krow = work.reversedOrderedSet
+        var index = work.count - 1
+        for item in krow {
+           XCTAssertEqual(work.objectAtIndex(index) as? NSString, item as? NSString)
+           index -= 1
+        }
+    }
+
+    func test_reversedEmpty() {
+        let set = NSOrderedSet(array: [])
+        let reversedEnum = set.reverseObjectEnumerator()
+        XCTAssertNil(reversedEnum.nextObject())
+        let reversedSet = set.reversedOrderedSet
+        XCTAssertNil(reversedSet.firstObject)
+    }
+
     func test_ObjectAtIndex() {
         let set = NSOrderedSet(array: ["foo", "bar", "baz"].bridge().bridge())
         XCTAssertEqual(set.objectAtIndex(0) as? NSString, "foo")
@@ -330,4 +365,43 @@ class TestNSOrderedSet : XCTestCase {
         XCTAssertEqual(set[2] as? NSString, "b")
         XCTAssertEqual(set[3] as? NSString, "d")
     }
+
+    func test_reversedEnumerationMutable() {
+        let arr = ["foo", "bar", "baz"]
+        let set = NSMutableOrderedSet()
+        set.addObjectsFromArray(arr.bridge().bridge())
+
+        set.addObject("jazz".bridge())
+        var index = set.count - 1
+        var revSet = set.reverseObjectEnumerator()
+        for item in revSet {
+            XCTAssertEqual(set.objectAtIndex(index) as? NSString, item as? NSString)
+            index -= 1
+        }
+
+        set.removeObject("jazz".bridge())
+        index = set.count - 1
+        revSet = set.reverseObjectEnumerator()
+        for item in revSet {
+            XCTAssertEqual(set.objectAtIndex(index) as? NSString, item as? NSString)
+            index -= 1
+        }
+
+
+    }
+
+    func test_reversedOrderedSetMutable() {
+        let days = ["monday", "tuesday", "wednesday", "thursday", "friday"]
+        let work =  NSMutableOrderedSet()
+        work.addObjectsFromArray(days.bridge().bridge())
+        var krow = work.reversedOrderedSet
+        XCTAssertEqual(work.firstObject as? NSString, krow.lastObject as? NSString)
+        XCTAssertEqual(work.lastObject as? NSString, krow.firstObject as? NSString)
+
+        work.addObject("saturday".bridge())
+        krow = work.reversedOrderedSet
+        XCTAssertEqual(work.firstObject as? NSString, krow.lastObject as? NSString)
+        XCTAssertEqual(work.lastObject as? NSString, krow.firstObject as? NSString)
+    }
+
 }