Merge pull request #7045 from IgniteUI/hPopov/additional-refactoring-master

Additional grid sorting test refactoring (master)

Author: zdrawku

projects/igniteui-angular/src/lib/grids/grid/grid.sorting.spec.ts

@@ -1,29 +1,18 @@
 import { async, TestBed, fakeAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { SortingDirection } from '../../data-operations/sorting-expression.interface';
 import { IgxGridComponent } from './grid.component';
 import { IgxGridModule } from './index';
 import { DefaultSortingStrategy, NoopSortingStrategy } from '../../data-operations/sorting-strategy';
 import { IgxGridCellComponent } from '../cell.component';
 import { configureTestSuite } from '../../test-utils/configure-suite';
-import { IgxGridFilteringRowComponent } from '../filtering/base/grid-filtering-row.component';
-import { IgxChipComponent } from '../../chips/chip.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { GridFunctions } from '../../test-utils/grid-functions.spec';
 import { GridDeclaredColumnsComponent, SortByParityComponent } from '../../test-utils/grid-samples.spec';
-import { ControlsFunction } from '../../test-utils/controls-functions.spec';
 import { UIInteractions } from '../../test-utils/ui-interactions.spec';
 
 const SORTING_ICON_ASC_CONTENT = 'arrow_upward';
 const SORTING_ICON_DESC_CONTENT = 'arrow_downward';
 
-
-function getCurrentCellFromGrid(grid, rowIndex, cellIndex) {
-    const gridRow = grid.rowList.toArray()[rowIndex];
-    const gridCell = gridRow.cells.toArray()[cellIndex];
-    return gridCell;
-}
-
 describe('IgxGrid - Grid Sorting #grid', () => {
 
     configureTestSuite();
@@ -251,13 +240,13 @@ describe('IgxGrid - Grid Sorting #grid', () => {
             GridFunctions.clickHeaderSortIcon(firstHeaderCell);
             fixture.detectChanges();
 
-            const firstRowFirstCell = getCurrentCellFromGrid(grid, 0, 0);
-            const firstRowSecondCell = getCurrentCellFromGrid(grid, 0, 1);
+            const firstRowFirstCell = GridFunctions.getCurrentCellFromGrid(grid, 0, 0);
+            const firstRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, 0, 1);
             expect(GridFunctions.getValueFromCellElement(firstRowSecondCell)).toEqual('Brad');
             expect(GridFunctions.getValueFromCellElement(firstRowFirstCell)).toEqual('1');
 
-            const lastRowFirstCell = getCurrentCellFromGrid(grid, grid.data.length - 1, 0);
-            const lastRowSecondCell = getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
+            const lastRowFirstCell = GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 0);
+            const lastRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
             expect(GridFunctions.getValueFromCellElement(lastRowFirstCell)).toEqual('7');
             expect(GridFunctions.getValueFromCellElement(lastRowSecondCell)).toEqual('Rick');
         });
@@ -270,13 +259,13 @@ describe('IgxGrid - Grid Sorting #grid', () => {
             GridFunctions.clickHeaderSortIcon(firstHeaderCell);
             fixture.detectChanges();
 
-            const firstRowFirstCell = getCurrentCellFromGrid(grid, 0, 0);
-            const firstRowSecondCell = getCurrentCellFromGrid(grid, 0, 1);
+            const firstRowFirstCell = GridFunctions.getCurrentCellFromGrid(grid, 0, 0);
+            const firstRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, 0, 1);
             expect(GridFunctions.getValueFromCellElement(firstRowFirstCell)).toEqual('7');
             expect(GridFunctions.getValueFromCellElement(firstRowSecondCell)).toEqual('Rick');
 
-            const lastRowFirstCell = getCurrentCellFromGrid(grid, grid.data.length - 1, 0);
-            const lastRowSecondCell = getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
+            const lastRowFirstCell = GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 0);
+            const lastRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
             expect(GridFunctions.getValueFromCellElement(lastRowFirstCell)).toEqual('1');
             expect(GridFunctions.getValueFromCellElement(lastRowSecondCell)).toEqual('Brad');
         });
@@ -291,10 +280,10 @@ describe('IgxGrid - Grid Sorting #grid', () => {
             GridFunctions.clickHeaderSortIcon(firstHeaderCell);
             fixture.detectChanges();
 
-            const firstRowSecondCell = getCurrentCellFromGrid(grid, 0, 1);
+            const firstRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, 0, 1);
             expect(GridFunctions.getValueFromCellElement(firstRowSecondCell)).toEqual('Jane');
 
-            const lastRowSecondCell = getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
+            const lastRowSecondCell = GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1);
             expect(GridFunctions.getValueFromCellElement(lastRowSecondCell)).toEqual('Connor');
 
         });
@@ -357,15 +346,17 @@ describe('IgxGrid - Grid Sorting #grid', () => {
             fixture.detectChanges();
 
             // Verify that the grid is NOT sorted.
-            expect(GridFunctions.getValueFromCellElement(getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane');
-            expect(GridFunctions.getValueFromCellElement(getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor');
+            expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane');
+            // tslint:disable-next-line: max-line-length
+            expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor');
 
             GridFunctions.clickHeaderSortIcon(firstHeaderCell);
             fixture.detectChanges();
 
             // Verify that the grid is NOT sorted.
-            expect(GridFunctions.getValueFromCellElement(getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane');
-            expect(GridFunctions.getValueFromCellElement(getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor');
+            expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane');
+            // tslint:disable-next-line: max-line-length
+            expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor');
         });
     });
 });