Merge pull request #611 from gabhaska/nsindexset-branch

Author: swift-ci

Foundation/NSIndexSet.swift

@@ -78,7 +78,13 @@ open class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
         return copy(with: nil)
     }
 
-    open func copy(with zone: NSZone? = nil) -> Any  { NSUnimplemented() }
+    open func copy(with zone: NSZone? = nil) -> Any {
+        if type(of: self) === NSIndexSet.self {
+            // return self for immutable type
+            return self
+        }
+        return NSIndexSet(indexSet: self._bridgeToSwift())
+    }
 
     open override func mutableCopy() -> Any {
         return mutableCopy(with: nil)
@@ -505,6 +511,16 @@ open class NSMutableIndexSet : NSIndexSet {
     open func add(_ indexSet: IndexSet) {
         indexSet.rangeView.forEach { add(in: NSRange(location: $0.lowerBound, length: $0.upperBound - $0.lowerBound)) }
     }
+
+    open override func copy(with zone: NSZone? = nil) -> Any {
+        if type(of: self) === NSMutableIndexSet.self {
+            let indexSet = NSMutableIndexSet()
+            indexSet._ranges = self._ranges
+            indexSet._count = self._count
+            return indexSet
+        }
+        return NSMutableIndexSet(indexSet: self._bridgeToSwift())
+    }
 
     open func remove(_ indexSet: IndexSet) {
         indexSet.rangeView.forEach { remove(in: NSRange(location: $0.lowerBound, length: $0.upperBound - $0.lowerBound)) }

TestFoundation/TestNSIndexSet.swift

@@ -27,6 +27,7 @@ class TestNSIndexSet : XCTestCase {
             ("test_removal", test_removal),
             ("test_addition", test_addition),
             ("test_setAlgebra", test_setAlgebra),
+            ("test_copy", test_copy),
         ]
     }
 
@@ -50,7 +51,29 @@ class TestNSIndexSet : XCTestCase {
         XCTAssertEqual(set3.lastIndex, 10)
 
     }
-    
+
+    func test_copy() {
+        let range: NSRange = NSRange(location: 3, length: 4)
+        let array : [Int] = [1,2,3,4,5,6,7,8,9,10]
+        let indexSet = NSMutableIndexSet()
+        for index in array {
+            indexSet.add(index)
+        }
+
+        //Test copy operation of NSIndexSet case which is immutable
+        let selfIndexSet: NSIndexSet = NSIndexSet(indexesIn: range)
+        let selfIndexSetCopy = selfIndexSet.copy() as! NSIndexSet
+        XCTAssertTrue(selfIndexSetCopy === selfIndexSet)
+        XCTAssertTrue(selfIndexSetCopy.isEqual(to: selfIndexSet._bridgeToSwift()))
+
+        //Test copy operation of NSMutableIndexSet case
+        let mutableIndexSet: NSIndexSet = indexSet
+        indexSet.add(11)
+        let mutableIndexSetCopy = mutableIndexSet.copy() as! NSIndexSet
+        XCTAssertFalse(mutableIndexSetCopy === mutableIndexSet)
+        XCTAssertTrue(mutableIndexSetCopy.isEqual(to: mutableIndexSet._bridgeToSwift()))
+    }
+
     func test_enumeration() {
         let set = IndexSet(integersIn: 4..<11)
         var result = Array<Int>()