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

tests: Move assertArrayEquals to shared assertions file

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:56:26 -07:00
parent b798efcc1d
commit df8fb2899d
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/common/assertions.js Normal file
View File

@ -0,0 +1,17 @@
/* exported assertArrayEquals */
const JsUnit = imports.jsUnit;
/**
* Asserts if two arrays have the same length and each element passes assertEquals
*
* @template T
* @param {string} errorMessage an error message if the arrays are not equal
* @param {T[]} array1 the first array
* @param {T[]} array2 the second array
*/
function assertArrayEquals(errorMessage, array1, array2) {
JsUnit.assertEquals(`${errorMessage} length`, array1.length, array2.length);
for (let j = 0; j < array1.length; j++)
JsUnit.assertEquals(`${errorMessage} item ${j}`, array1[j], array2[j]);
}

19
tests/unit/insertSorted.js
View File

@ -2,7 +2,7 @@
// Test cases for Util.insertSorted // Test cases for Util.insertSorted
const JsUnit = imports.jsUnit; const Assertions = imports.common.assertions;
// Needed so that Util can bring some UI stuff // Needed so that Util can bring some UI stuff
// we don't actually use // we don't actually use
@ -10,15 +10,6 @@ const Environment = imports.ui.environment;
Environment.init(); Environment.init();
const Util = imports.misc.util; const Util = imports.misc.util;
function assertArrayEquals(errorMessage, array1, array2) {
JsUnit.assertEquals(errorMessage + ' length',
array1.length, array2.length);
for (let j = 0; j < array1.length; j++) {
JsUnit.assertEquals(errorMessage + ' item ' + j,
array1[j], array2[j]);
}
}
function cmp(one, two) { function cmp(one, two) {
return one-two; return one-two;
} }
@ -26,12 +17,12 @@ function cmp(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, cmp);
assertArrayEquals('first test', [1,2,3,4,5,6], arrayInt); Assertions.assertArrayEquals('first test', [1, 2, 3, 4, 5, 6], arrayInt);
// no comparator, integer sorting is implied // no comparator, integer sorting is implied
Util.insertSorted(arrayInt, 3); Util.insertSorted(arrayInt, 3);
assertArrayEquals('second test', [1,2,3,3,4,5,6], arrayInt); Assertions.assertArrayEquals('second test', [1, 2, 3, 3, 4, 5, 6], arrayInt);
let obj1 = { a: 1 }; let obj1 = { a: 1 };
let obj2 = { a: 2, b: 0 }; let obj2 = { a: 2, b: 0 };
@ -48,7 +39,7 @@ let arrayObj = [obj1, obj3, obj4];
// inserted before // inserted before
Util.insertSorted(arrayObj, obj2, objCmp); Util.insertSorted(arrayObj, obj2, objCmp);
assertArrayEquals('object test', [obj1, obj2, obj3, obj4], arrayObj); Assertions.assertArrayEquals('object test', [obj1, obj2, obj3, obj4], arrayObj);
function checkedCmp(one, two) { function checkedCmp(one, two) {
if (typeof one != 'number' || if (typeof one != 'number' ||
@ -73,4 +64,4 @@ Util.insertSorted(arrayEmpty, 5, checkedCmp);
Util.insertSorted(arrayEmpty, 2, checkedCmp); Util.insertSorted(arrayEmpty, 2, checkedCmp);
Util.insertSorted(arrayEmpty, 1, checkedCmp); Util.insertSorted(arrayEmpty, 1, checkedCmp);
assertArrayEquals('checkedCmp test', [1, 2, 3, 4, 5], arrayEmpty); Assertions.assertArrayEquals('checkedCmp test', [1, 2, 3, 4, 5], arrayEmpty);

15
tests/unit/jsParse.js
View File

@ -4,6 +4,7 @@
const JsUnit = imports.jsUnit; const JsUnit = imports.jsUnit;
const Assertions = imports.common.assertions;
const Environment = imports.ui.environment; const Environment = imports.ui.environment;
Environment.init(); Environment.init();
@ -95,18 +96,6 @@ const testsModifyScope = [
"Main[Main.foo+=-1]." "Main[Main.foo+=-1]."
]; ];
// Utility function for comparing arrays
function assertArrayEquals(errorMessage, array1, array2) {
JsUnit.assertEquals(errorMessage + ' length',
array1.length, array2.length);
for (let j = 0; j < array1.length; j++) {
JsUnit.assertEquals(errorMessage + ' item ' + j,
array1[j], array2[j]);
}
}
// //
// Test javascript parsing // Test javascript parsing
// //
@ -147,7 +136,7 @@ for (let i = 0; i < testsGetDeclaredConstants.length; i++) {
let text = testsGetDeclaredConstants[i].input; let text = testsGetDeclaredConstants[i].input;
let match = JsParse.getDeclaredConstants(text); let match = JsParse.getDeclaredConstants(text);
assertArrayEquals('Test testsGetDeclaredConstants ' + i, Assertions.assertArrayEquals('Test testsGetDeclaredConstants ' + i,
match, testsGetDeclaredConstants[i].output); match, testsGetDeclaredConstants[i].output);
} }