add more tests

Author: VREMSoftwareDevelopment

react/src/components/table/Header.jsx

@@ -20,28 +20,30 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { TableCell, TableHead, TableRow, TableSortLabel } from '@mui/material';
 
-const SortableCell = ({ prefix, cellInfo, sortHandler, ascending, orderBy }) => {
-    const direction = ascending ? 'asc' : 'desc';
-    const sortDirection = (orderBy, id) => (orderBy === id ? direction : false);
-    const defaultDirection = (orderBy, id) => (orderBy === id ? direction : 'asc');
+const ASCENDING = 'asc';
+const DESCENDING = 'desc';
 
-    return (
-        <TableCell
-            data-testid={prefix + '-' + cellInfo.id}
-            id={prefix + '-' + cellInfo.id}
-            align={cellInfo.align}
-            sortDirection={sortDirection(orderBy, cellInfo.id)}
+const getDirection = (ascending) => (ascending ? ASCENDING : DESCENDING);
+const sortDirection = (orderBy, id, ascending) => (orderBy === id ? getDirection(ascending) : false);
+const sortDefaultDirection = (orderBy, id, ascending) => getDirection(ascending || orderBy !== id);
+const isActive = (orderBy, id) => orderBy === id;
+
+const SortableCell = ({ prefix, cellInfo, sortHandler, ascending, orderBy }) => (
+    <TableCell
+        data-testid={prefix + '-' + cellInfo.id}
+        id={prefix + '-' + cellInfo.id}
+        align={cellInfo.align}
+        sortDirection={sortDirection(orderBy, cellInfo.id, ascending)}
+    >
+        <TableSortLabel
+            active={isActive(orderBy, cellInfo.id)}
+            direction={sortDefaultDirection(orderBy, cellInfo.id, ascending)}
+            onClick={sortHandler(cellInfo.id)}
         >
-            <TableSortLabel
-                active={orderBy === cellInfo.id}
-                direction={defaultDirection(orderBy, cellInfo.id)}
-                onClick={sortHandler(cellInfo.id)}
-            >
-                {cellInfo.label}
-            </TableSortLabel>
-        </TableCell>
-    );
-};
+            {cellInfo.label}
+        </TableSortLabel>
+    </TableCell>
+);
 
 // Stryker disable all
 SortableCell.propTypes = {
@@ -115,6 +117,6 @@ Header.propTypes = {
 };
 // Stryker restore all
 
-export { Header, Cell, SortableCell };
+export { Header, Cell, SortableCell, getDirection, sortDirection, sortDefaultDirection, isActive };
 
 export default Header;

react/src/components/table/Header.test.jsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
-import { Header, Cell, SortableCell } from './Header';
+import { Header, Cell, SortableCell, getDirection, sortDirection, sortDefaultDirection, isActive } from './Header';
 
 describe('Header Suite', () => {
     const onRequestSort = jest.fn();
@@ -155,4 +155,27 @@ describe('Header Suite', () => {
             expect(document.querySelector('#test-name')).toBeInTheDocument();
         });
     });
+
+    it('getDirection', () => {
+        expect(getDirection(true)).toBe('asc');
+        expect(getDirection(false)).toBe('desc');
+    });
+
+    it('isActive', () => {
+        expect(isActive('id1', 'id1')).toBeTruthy();
+        expect(isActive('id1', 'id2')).toBeFalsy();
+    });
+
+    it('sortDirection', () => {
+        expect(sortDirection('id1', 'id1', true)).toBe('asc');
+        expect(sortDirection('id1', 'id1', false)).toBe('desc');
+        expect(sortDirection('id1', 'id2', true)).toBeFalsy();
+    });
+
+    it('sortDefaultDirection', () => {
+        expect(sortDefaultDirection('id1', 'id1', true)).toBe('asc');
+        expect(sortDefaultDirection('id1', 'id1', false)).toBe('desc');
+        expect(sortDefaultDirection('id1', 'id2', true)).toBe('asc');
+        expect(sortDefaultDirection('id1', 'id2', false)).toBe('asc');
+    });
 });

react/src/utils/SortUtils.js

@@ -16,7 +16,7 @@
  * Bandwidth Monitor
  */
 
-export const comparator = (isAscending, orderBy) => {
+const comparator = (isAscending, orderBy) => {
     const ascending = (a, b, orderBy) => {
         if (a[orderBy] < b[orderBy]) return -1;
         if (a[orderBy] > b[orderBy]) return 1;
@@ -30,4 +30,6 @@ export const comparator = (isAscending, orderBy) => {
     return isAscending ? (a, b) => ascending(a, b, orderBy) : (a, b) => descending(a, b, orderBy);
 };
 
-export const sort = (values, comparator) => [...values].sort(comparator);
+const sort = (values, comparator) => [...values].sort(comparator);
+
+export { sort, comparator };

react/src/utils/SortUtils.test.js

@@ -20,39 +20,45 @@ import { comparator, sort } from './SortUtils';
 
 describe('SortUtils', () => {
     describe('comparator', () => {
-        it('ascending', () => {
+        it('ascending 1', () => {
+            const a = { value: 20 };
+            const b = { value: 10 };
+            const fn = comparator(true, 'value');
+            expect(fn(a, b)).toEqual(1);
+        });
+
+        it('ascending -1', () => {
             const a = { value: 10 };
             const b = { value: 20 };
-
             const fn = comparator(true, 'value');
-
             expect(fn(a, b)).toEqual(-1);
         });
 
-        it('ascending equals', () => {
+        it('ascending 0', () => {
             const a = { value: 10 };
             const b = { value: 10 };
-
             const fn = comparator(true, 'value');
-
             expect(fn(a, b)).toEqual(0);
         });
 
-        it('descending', () => {
+        it('descending 1', () => {
             const a = { value: 10 };
             const b = { value: 20 };
-
             const fn = comparator(false, 'value');
-
             expect(fn(a, b)).toEqual(1);
         });
 
-        it('descending equals', () => {
-            const a = { value: 10 };
+        it('descending -1', () => {
+            const a = { value: 20 };
             const b = { value: 10 };
-
             const fn = comparator(false, 'value');
+            expect(fn(a, b)).toEqual(-1);
+        });
 
+        it('descending 0', () => {
+            const a = { value: 10 };
+            const b = { value: 10 };
+            const fn = comparator(false, 'value');
             expect(fn(a, b)).toEqual(0);
         });
     });

react/vite.config.mjs

@@ -13,7 +13,7 @@ export default defineConfig({
         port: 3000,
         open: true,
         watch: {
-            ignored: ['**/reports/**'],
+            ignored: ['**/reports/**', '**/stryker*/**'],
         },
     },
     plugins: [