[null] Improve test clarity with expect.assertions and descriptive parameter names

Author: jamesgpearce

test/unit/core/store/store-nulls.test.ts

@@ -196,65 +196,50 @@ describe('Null listeners and events', () => {
   });
 
   test('Cell listener fires when setting to null', () => {
-    let called = 0;
-    let newCell;
-    let oldCell;
-    store.addCellListener('t1', 'r1', 'c1', (_store, _t, _r, _c, nCell, oCell) => {
-      called++;
-      newCell = nCell;
-      oldCell = oCell;
+    expect.assertions(2);
+    store.addCellListener('t1', 'r1', 'c1', (_store, _table, _row, _cell, newCell, oldCell) => {
+      expect(newCell).toBe(null);
+      expect(oldCell).toBeUndefined();
     });
 
     store.setCell('t1', 'r1', 'c1', null);
-    expect(called).toBe(1);
-    expect(newCell).toBe(null);
-    expect(oldCell).toBeUndefined();
   });
 
   test('Cell listener fires when changing from null', () => {
     store.setCell('t1', 'r1', 'c1', null);
-    let called = 0;
-    let newCell;
-    let oldCell;
-    store.addCellListener('t1', 'r1', 'c1', (_store, _t, _r, _c, nCell, oCell) => {
-      called++;
-      newCell = nCell;
-      oldCell = oCell;
+    expect.assertions(2);
+    store.addCellListener('t1', 'r1', 'c1', (_store, _table, _row, _cell, newCell, oldCell) => {
+      expect(newCell).toBe('hello');
+      expect(oldCell).toBe(null);
     });
 
     store.setCell('t1', 'r1', 'c1', 'hello');
-    expect(called).toBe(1);
-    expect(newCell).toBe('hello');
-    expect(oldCell).toBe(null);
   });
 
   test('Value listener fires when setting to null', () => {
-    let called = 0;
-    let newValue;
-    let oldValue;
-    store.addValueListener('v1', (_store, _v, nValue, oValue) => {
-      called++;
-      newValue = nValue;
-      oldValue = oValue;
+    expect.assertions(2);
+    store.addValueListener('v1', (_store, _valueId, newValue, oldValue) => {
+      expect(newValue).toBe(null);
+      expect(oldValue).toBeUndefined();
     });
 
     store.setValue('v1', null);
-    expect(called).toBe(1);
-    expect(newValue).toBe(null);
-    expect(oldValue).toBeUndefined();
   });
 
   test('HasCell listener distinguishes null from deleted', () => {
-    let calls: boolean[] = [];
-    store.addHasCellListener('t1', 'r1', 'c1', (_store, _t, _r, _c, hasCell) => {
-      calls.push(hasCell);
+    expect.assertions(2);
+    let callCount = 0;
+    store.addHasCellListener('t1', 'r1', 'c1', (_store, _table, _row, _cell, hasCell) => {
+      if (callCount === 0) {
+        expect(hasCell).toBe(true);
+      } else if (callCount === 1) {
+        expect(hasCell).toBe(false);
+      }
+      callCount++;
     });
 
     store.setCell('t1', 'r1', 'c1', null);
-    expect(calls).toEqual([true]);
-
     store.delCell('t1', 'r1', 'c1');
-    expect(calls).toEqual([true, false]);
   });
 });