Merge pull request #7 from Adlai-Holler/FixArrayGetObjects

Use Correct Source Index in NSArray.getObjects

Author: phausler

Foundation/NSArray.swift

@@ -178,15 +178,14 @@ public class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NS
     /// - Experiment: This is a draft API currently under consideration for official import into Foundation
     /// - Note: Since this API is under consideration it may be either removed or revised in the near future
     public func getObjects(inout objects: [AnyObject], range: NSRange) {
+        objects.reserveCapacity(objects.count + range.length)
+
         if self.dynamicType === NSArray.self || self.dynamicType === NSMutableArray.self {
-            if range.location == 0 && range.length == count {
-                objects = _storage
-                return
-            }
-        }
-        for idx in 0..<range.length {
-            objects[idx] = self[idx]
+            objects += _storage[range.toRange()!]
+            return
         }
+
+        objects += range.toRange()!.map { self[$0] }
     }
 
     public func indexOfObject(anObject: AnyObject) -> Int {

TestFoundation/TestNSArray.swift

@@ -26,6 +26,7 @@ class TestNSArray : XCTestCase {
             ("test_BasicConstruction", test_BasicConstruction),
             ("test_enumeration", test_enumeration),
             ("test_sequenceType", test_sequenceType),
+            ("test_getObjects", test_getObjects),
         ]
     }
 
@@ -70,4 +71,17 @@ class TestNSArray : XCTestCase {
         XCTAssertEqual(res, ["foo", "bar", "baz"])
     }
 
+    func test_getObjects() {
+        let array : NSArray = ["foo", "bar", "baz", "foo1", "bar2", "baz3",].bridge()
+        var objects = [AnyObject]()
+        array.getObjects(&objects, range: NSMakeRange(1, 3))
+        XCTAssertEqual(objects.count, 3)
+        let fetched = [
+            (objects[0] as! NSString).bridge(),
+            (objects[1] as! NSString).bridge(),
+            (objects[2] as! NSString).bridge(),
+        ]
+        XCTAssertEqual(fetched, ["bar", "baz", "foo1"])
+    }
+
 }