isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

insertSorted: Refactor comparator functions to be arrow functions

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2822>
This commit is contained in:
Evan Welsh 2023-07-09 22:58:22 -07:00
parent df8fb2899d
commit 9e84891240
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/unit/insertSorted.js
View File

@ -10,12 +10,8 @@ const Environment = imports.ui.environment;
Environment.init(); Environment.init();
const Util = imports.misc.util; const Util = imports.misc.util;
function cmp(one, two) {
return one-two;
}
let arrayInt = [1, 2, 3, 5, 6]; let arrayInt = [1, 2, 3, 5, 6];
Util.insertSorted(arrayInt, 4, cmp); Util.insertSorted(arrayInt, 4, (one, two) => one - two);
Assertions.assertArrayEquals('first test', [1, 2, 3, 4, 5, 6], arrayInt); Assertions.assertArrayEquals('first test', [1, 2, 3, 4, 5, 6], arrayInt);
@ -29,25 +25,20 @@ let obj2 = { a: 2, b: 0 };
let obj3 = { a: 2, b: 1 }; let obj3 = { a: 2, b: 1 };
let obj4 = { a: 3 }; let obj4 = { a: 3 };
function objCmp(one, two) {
return one.a - two.a;
}
let arrayObj = [obj1, obj3, obj4]; let arrayObj = [obj1, obj3, obj4];
// obj2 compares equivalent to obj3, should be // obj2 compares equivalent to obj3, should be
// inserted before // inserted before
Util.insertSorted(arrayObj, obj2, objCmp); Util.insertSorted(arrayObj, obj2, (one, two) => one.a - two.a);
Assertions.assertArrayEquals('object test', [obj1, obj2, obj3, obj4], arrayObj); Assertions.assertArrayEquals('object test', [obj1, obj2, obj3, obj4], arrayObj);
function checkedCmp(one, two) { const checkedCmp = (one, two) => {
if (typeof one != 'number' || if (typeof one != 'number' || typeof two != 'number')
typeof two != 'number')
throw new TypeError('Invalid type passed to checkedCmp'); throw new TypeError('Invalid type passed to checkedCmp');
return one-two; return one - two;
} };
let arrayEmpty = []; let arrayEmpty = [];