[hotfix/4457]

 - unit tests the getters and selectors

Author: prx-lmo

packages/core/test/core/factories/Grid.spec.js

@@ -324,6 +324,64 @@ describe('Grid factory', function() {
 		});
 	});
 
+	describe('getting Rows', function(){
+		it('should get Rows', function(){
+			expect(grid.getRow()).toBe(null);
+			expect(grid.getRows(grid.rows[0].entity)).toBe(grid.rows[0]);
+			expect(grid.getRows(grid.rows[0].entity), [grid.rows[0]]).toBe(grid.rows[0]);
+		});
+
+		it('should get Rows by key', function(){
+			grid.rows[0].entity = {str: 'abc', num: 123, nll: null, multi: true};
+			grid.rows[1].entity = {multi: true};
+			grid.rows[0].str = 'abc';
+			grid.rows[0].num = 123;
+			grid.rows[0].nll = null;
+			grid.rows[0].innerMulti = false;
+			grid.rows[1].innerMulti = false;
+
+			expect(grid.getRowsByKey()).toBe(null);
+			expect(grid.getRowsByKey(true, "test")).toBe(null);
+			expect(grid.getRowsByKey(true, "str", "abc")).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(true, "str", "def")).toBe(null);
+			expect(grid.getRowsByKey(true, "num", 123)).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(true, "nll", null)).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(true, "multi", true).length).toBe(2);
+
+			expect(grid.getRowsByKey(false, "test")).toBe(null);
+			expect(grid.getRowsByKey(false, "str", "abc")).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(false, "str", "def")).toBe(null);
+			expect(grid.getRowsByKey(false, "num", 123)).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(false, "nll", null)).toBe([grid.rows[0]]);
+			expect(grid.getRowsByKey(true, "innerMulti", false).length).toBe(2);
+		});
+
+		it('should find first Row by key', function(){
+			grid.rows[0].entity = {str: 'abc', num: 123, nll: null, multi: true};
+			grid.rows[1].entity = {multi: true};
+			grid.rows[0].str = 'abc';
+			grid.rows[0].num = 123;
+			grid.rows[0].nll = null;
+			grid.rows[0].innerMulti = false;
+			grid.rows[1].innerMulti = false;
+
+			expect(grid.findRowByKey()).toBe(null);
+			expect(grid.findRowByKey(true, "test")).toBe(null);
+			expect(grid.findRowByKey(true, "str", "abc")).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(true, "str", "def")).toBe(null);
+			expect(grid.findRowByKey(true, "num", 123)).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(true, "nll", null)).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(true, "multi", true).length).toBe(1);
+
+			expect(grid.findRowByKey(false, "test")).toBe(null);
+			expect(grid.findRowByKey(false, "str", "abc")).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(false, "str", "def")).toBe(null);
+			expect(grid.findRowByKey(false, "num", 123)).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(false, "nll", null)).toBe([grid.rows[0]]);
+			expect(grid.findRowByKey(true, "innerMulti", false).length).toBe(1);
+		});
+	})
+
 	describe('buildColumns', function() {
 		it('guess correct column types when not specified', function() {
 			var dataRow = {str: 'abc', num: 123, dat: new Date(), bool: true, obj: {}, nll: null, negNum: -1, posNum: +1};

packages/selection/test/uiGridSelectionService.spec.js

@@ -197,6 +197,68 @@ describe('ui.grid.selection uiGridSelectionService', function() {
 			grid.api.selection.selectRow(grid.rows[4].entity);
 			expect(grid.rows[4].isSelected).toBe(false);
 		});
+
+		it('select by key then unselect rows by key in entity, including selecting rows already selected and unselecting rows not selected', function() {
+			grid.rows[4].entity = {str: 'abc'};
+			grid.rows[6].entity = {str: 'def'};
+			grid.api.selection.selectRowByKey(true, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(true);
+
+			grid.api.selection.selectRowByKey(true, "str", "def");
+			expect(grid.rows[4].isSelected).toBe(true);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.selectRowByKey(true, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(true);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(true, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(true, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(true, "str", "def");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(false);
+
+			grid.rows[4].enableSelection = false;
+			grid.api.selection.selectRowByKey(true, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+		});
+
+		it('select by key then unselect rows by key outside entity, including selecting rows already selected and unselecting rows not selected', function() {
+			grid.rows[4] = {str: 'abc'};
+			grid.rows[6] = {str: 'def'};
+			grid.api.selection.selectRowByKey(false, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(true);
+
+			grid.api.selection.selectRowByKey(false, "str", "def");
+			expect(grid.rows[4].isSelected).toBe(true);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.selectRowByKey(false, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(true);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(false, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(false, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(true);
+
+			grid.api.selection.unSelectRowByKey(false, "str", "def");
+			expect(grid.rows[4].isSelected).toBe(false);
+			expect(grid.rows[6].isSelected).toBe(false);
+
+			grid.rows[4].enableSelection = false;
+			grid.api.selection.selectRowByKey(false, "str", "abc");
+			expect(grid.rows[4].isSelected).toBe(false);
+		});
 	});
 
 	describe('setSelected function', function() {