commit d8c82052ae25121482f3113ff20ce3e8e0eecbe7
author Sergey Minakov <devias.naith@gmail.com> Fri Mar 03 00:31:23 2017 +0400
committer Tony Parker <anthony.parker@apple.com> Thu Mar 02 12:31:23 2017 -0800
tree b83c5ea141c66429f4ae5f84e85b5beedde5d2ef
parent 8fc21679cd4f8e1156e6aff685c1f004ce2faa34

fix NSCache limit (#900)

Foundation/NSCache.swift

diff --git a/Foundation/NSCache.swift b/Foundation/NSCache.swift
index ae294f3..cce3797 100644
--- a/Foundation/NSCache.swift
+++ b/Foundation/NSCache.swift
@@ -138,7 +138,9 @@
                 insert(entry)
             }
         } else {
-            _entries[keyRef] = NSCacheEntry(key: key, value: obj, cost: g)
+            let entry = NSCacheEntry(key: key, value: obj, cost: g)
+            _entries[keyRef] = entry
+            insert(entry)
         }
         _lock.unlock()
         

TestFoundation/TestNSCache.swift

diff --git a/TestFoundation/TestNSCache.swift b/TestFoundation/TestNSCache.swift
index 2a5d1db..1dde6d5 100644
--- a/TestFoundation/TestNSCache.swift
+++ b/TestFoundation/TestNSCache.swift
@@ -21,7 +21,8 @@
         return [
             ("test_setWithUnmutableKeys", test_setWithUnmutableKeys),
             ("test_setWithMutableKeys", test_setWithMutableKeys),
-//            ("test_countLimit", test_countLimit),
+            ("test_costLimit", test_costLimit),
+            ("test_countLimit", test_countLimit),
         ]
     }
     
@@ -73,19 +74,36 @@
         XCTAssertNil(cache.object(forKey: key2), "should be nil")
     }
     
+    func test_costLimit() {
+        let cache = NSCache<NSString, NSString>()
+        cache.totalCostLimit = 10
+        
+        cache.setObject("object0", forKey: "0", cost: 4)
+        cache.setObject("object2", forKey: "2", cost: 5)
+        
+        cache.setObject("object1", forKey: "1", cost: 5)
+        
+        XCTAssertNil(cache.object(forKey: "0"), "should be nil")
+        XCTAssertEqual(cache.object(forKey: "2"), "object2", "should be equal to 'object2'")
+        XCTAssertEqual(cache.object(forKey: "1"), "object1", "should be equal to 'object1'")
+    }
+    
     func test_countLimit() {
         let cache = NSCache<NSString, NSString>()
-        cache.countLimit = 1
+        cache.countLimit = 2
         
         let key1 = NSString(string: "key1")
         let key2 = NSString(string: "key2")
+        let key3 = NSString(string: "key3")
         let value = NSString(string: "value")
         
         cache.setObject(value, forKey: key1)
         cache.setObject(value, forKey: key2)
+        cache.setObject(value, forKey: key3)
         
         XCTAssertEqual(cache.object(forKey: key2), value, "should be equal to \(value)")
+        XCTAssertEqual(cache.object(forKey: key3), value, "should be equal to \(value)")
         XCTAssertNil(cache.object(forKey: key1), "should be nil")
-
+        
     }
 }