Clean up tests

package.json

@@ -65,6 +65,7 @@
   },
   "jest": {
     "coverageReporters": [
+      "text",
       "lcov"
     ]
   }

src/cache/__tests__/FifoCacheObject.spec.js

@@ -20,23 +20,25 @@ describe('FifoCacheObject', () => {
     expect(actual).toBe(expected);
   });
 
-  it('Should limit cache queue by removing the first item', () => {
+  it('Should limit cache queue by removing the first added items', () => {
     const cache = newCache(5);
+    const entries = [1, 2, 3, 4];
+    const newEntries = [5, 6, 7];
 
-    cache.set(0, 0);
-    const newEntries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
     fillCache(cache, newEntries);
 
-    expect(cache.get(0)).toBe(undefined);
-    newEntries.map(entry => {
+    expect(cache.get(1)).toBe(undefined);
+    expect(cache.get(2)).toBe(undefined);
+    [4, 5, 6, 7].map(entry => {
       expect(cache.get(entry)).toBe(entry);
     });
   });
 
   it('Should remove a single item', () => {
     const cache = newCache(5);
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
     cache.remove(3);
 
@@ -46,14 +48,32 @@ describe('FifoCacheObject', () => {
     });
   });
 
+  it('Should mantain cache updated after removing extraneous entry', () => {
+    const cache = newCache(5);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
+
+    cache.remove(7); // Extraneous
+    cache.remove(3);
+    cache.set(6, 6);
+    cache.set(7, 7);
+
+    expect(cache.get(1)).toBe(undefined);
+    expect(cache.get(3)).toBe(undefined);
+
+    [2, 4, 5, 6, 7].map(entry => {
+      expect(cache.get(entry)).toBe(entry);
+    });
+  });
+
   it('Should clear the cache', () => {
     const cache = newCache(5);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
     cache.clear();
 
-    newEntries.map(entry => {
+    [1, 2, 3, 4, 5].map(entry => {
       expect(cache.get(entry)).toBe(undefined);
     });
   });

src/cache/__tests__/FlatCacheObject.spec.js

@@ -18,8 +18,8 @@ describe('FlatCacheObject', () => {
 
   it('Should remove a single item', () => {
     const cache = new FlatCacheObject();
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
     cache.remove(3);
 
@@ -31,12 +31,12 @@ describe('FlatCacheObject', () => {
 
   it('Should clear the cache', () => {
     const cache = new FlatCacheObject();
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
     cache.clear();
 
-    newEntries.map(entry => {
+    [1, 2, 3, 4, 5].map(entry => {
       expect(cache.get(entry)).toBe(undefined);
     });
   });

src/cache/__tests__/LruCacheObject.spec.js

@@ -22,8 +22,8 @@ describe('LruCacheObject', () => {
 
   it('Should remove a single item', () => {
     const cache = newCache(5);
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
     cache.remove(3);
 
@@ -32,8 +32,8 @@ describe('LruCacheObject', () => {
 
   it('Should remove a single item und update cache ordering', () => {
     const cache = newCache(5);
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
     cache.remove(3);
     cache.set(6, 6);
@@ -46,29 +46,29 @@ describe('LruCacheObject', () => {
 
   it('Should clear the cache', () => {
     const cache = newCache(5);
-    const newEntries = [1, 2, 3, 4, 5];
-    fillCache(cache, newEntries);
+    const entries = [1, 2, 3, 4, 5];
+    fillCache(cache, entries);
 
     cache.clear();
 
-    newEntries.map(entry => {
+    [1, 2, 3, 4, 5].map(entry => {
       expect(cache.get(entry)).toBe(undefined);
     });
   });
 
   it('Should limit cache queue by removing the least recently used item', () => {
     const cache = newCache(5);
 
-    const newEntries1 = [0, 1, 2];
-    const newEntries2 = [3, 4, 5];
-    fillCache(cache, newEntries1);
+    const entries = [0, 1, 2];
+    const newEntries = [3, 4, 5];
+    fillCache(cache, entries);
     cache.get(0);
-    fillCache(cache, newEntries2);
+    fillCache(cache, newEntries);
 
     expect(cache.get(0)).toBe(0);
     expect(cache.get(1)).toBe(undefined);
     expect(cache.get(2)).toBe(2);
-    newEntries2.map(entry => {
+    newEntries.map(entry => {
       expect(cache.get(entry)).toBe(entry);
     });
   });