microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 12:32:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Try sorting and deduplicating events before comparing. (#58242)

Browse Source 
Co-authored-by: Ron Buckton <ron.buckton@microsoft.com>
This commit is contained in:
Sheetal Nandi 2024-04-18 11:59:53 -07:00 committed by GitHub
parent 5b3060d5c6
commit 05f4dbab10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/testRunner/unittests/sys/symlinkWatching.ts
View File

@ -71,12 +71,12 @@ describe("unittests:: sys:: symlinkWatching::", () => {
}
interface EventAndFileName {
event: string;
event: "rename" | "change";
// eslint-disable-next-line no-restricted-syntax
fileName: string | null | undefined;
}
interface ExpectedEventAndFileName {
event: string | readonly string[]; // Its expected event name or any of the event names
event: "rename" | "change" | readonly ["rename", "change"]; // Its expected event name or any of the event names
// eslint-disable-next-line no-restricted-syntax
fileName: string | null | undefined;
}
@ -126,23 +126,32 @@ describe("unittests:: sys:: symlinkWatching::", () => {
return deferred.promise;
}
function compareEventFileName(a: EventAndFileName["fileName"], b: EventAndFileName["fileName"]) {
return ts.compareStringsCaseSensitive(a ?? undefined, b ?? undefined);
}
function compareEventAndFileName(a: EventAndFileName, b: EventAndFileName): ts.Comparison {
return compareEventFileName(b.fileName, a.fileName) || // Also longer string to be before shorter string
ts.compareStringsCaseSensitive(b.event, a.event); // We want rename to be before change
}
function verifyEventAndFileNames(
prefix: string,
actual: readonly EventAndFileName[],
expected: readonly ExpectedEventAndFileName[] | undefined,
) {
assert(actual.length >= (expected?.length ?? 0), `${prefix}:: Expected ${JSON.stringify(expected)} events, got ${JSON.stringify(actual)}`);
const sortedActual = ts.sortAndDeduplicate(actual, compareEventAndFileName);
let expectedIndex = 0;
for (const a of actual) {
for (const a of sortedActual) {
if (isExpectedEventAndFileName(a, expected![expectedIndex])) {
expectedIndex++;
continue;
}
// Previous event repeated?
if (isExpectedEventAndFileName(a, expected![expectedIndex - 1])) continue;
ts.Debug.fail(`${prefix}:: Expected ${JSON.stringify(expected)} events, got ${JSON.stringify(actual)}`);
ts.Debug.fail(`${prefix}:: Expected ${JSON.stringify(expected)} events, got ${JSON.stringify(actual)} Sorted: ${JSON.stringify(sortedActual)}`);
}
assert(expectedIndex >= (expected?.length ?? 0), `${prefix}:: Should get all events: Expected ${JSON.stringify(expected)} events, got ${JSON.stringify(actual)}`);
assert(expectedIndex >= (expected?.length ?? 0), `${prefix}:: Should get all events: Expected ${JSON.stringify(expected)} events, got ${JSON.stringify(actual)} Sorted: ${JSON.stringify(sortedActual)}`);
}
function isExpectedEventAndFileName(actual: EventAndFileName, expected: ExpectedEventAndFileName | undefined) {