Skip to content

Commit 5a5fdd6

Browse files
Lightning00BladeDevtools-frontend LUCI CQ
authored andcommitted
[cleanup] Prefer assert.exist
Verify likely this was done as back in the day chai assert did not have good typing for this. Bug: none Change-Id: I22ce025dc9c56313560db3eade87687be8fe7ad4 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7079394 Commit-Queue: Benedikt Meurer <[email protected]> Auto-Submit: Nikolay Vitkov <[email protected]> Reviewed-by: Benedikt Meurer <[email protected]>
1 parent e1ec444 commit 5a5fdd6

31 files changed

+85
-239
lines changed

front_end/core/common/ColorUtils.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ describe('ColorUtils', () => {
8888
const bg = Common.Color.parse(test.bgColor)?.asLegacyColor();
8989
if (!fg || !bg) {
9090
assert.fail(`Failed to parse foreground and/or background color: ${test.fgColor}, ${test.bgColor}`);
91-
return;
9291
}
9392
assert.closeTo(Common.ColorUtils.contrastRatioAPCA(fg.rgba(), bg.rgba()), test.expectedContrast, 0.1);
9493
}

front_end/core/common/SettingRegistration.test.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,10 @@ describe('SettingRegistration', () => {
4949
});
5050

5151
it('retrieves a registered setting', () => {
52-
try {
53-
const preRegisteredSetting = Common.Settings.Settings.instance().moduleSetting(settingName);
54-
assert.strictEqual(preRegisteredSetting.title(), settingTitle, 'Setting title is not returned correctly');
55-
assert.strictEqual(
56-
preRegisteredSetting.category(), settingCategory, 'Setting category is not returned correctly');
57-
assert.isNotTrue(preRegisteredSetting.get(), 'Setting value is not returned correctly');
58-
} catch {
59-
assert.fail('Failed to find setting registration');
60-
}
52+
const preRegisteredSetting = Common.Settings.Settings.instance().moduleSetting(settingName);
53+
assert.strictEqual(preRegisteredSetting.title(), settingTitle, 'Setting title is not returned correctly');
54+
assert.strictEqual(preRegisteredSetting.category(), settingCategory, 'Setting category is not returned correctly');
55+
assert.isNotTrue(preRegisteredSetting.get(), 'Setting value is not returned correctly');
6156
});
6257

6358
it('triggers a setting\'s change listener when a setting is set', () => {

front_end/core/sdk/CookieParser.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import {type CookieExpectation, expectCookie} from '../../testing/Cookies.js';
88
import * as SDK from './sdk.js';
99

1010
function ensureCookiesExistOrFailTest(cookies: SDK.Cookie.Cookie[]|null): cookies is SDK.Cookie.Cookie[] {
11-
if (!cookies) {
12-
assert.fail('expected cookies to exist');
13-
return false;
14-
}
11+
assert.exists(cookies, 'expected cookies to exist');
1512
return true;
1613
}
1714

front_end/models/source_map_scopes/NamesResolver.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,7 @@ describeWithMockConnection('NameResolver', () => {
415415
const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel);
416416
const script = debuggerModel?.scripts()[0];
417417
const scriptId = script?.scriptId;
418-
if (scriptId === undefined) {
419-
assert.fail('Script id not found');
420-
return;
421-
}
418+
assert.exists(scriptId, 'Script id not found');
422419
const {lineNumber, columnNumber} = scopeLocation;
423420
await script?.requestContentData();
424421
const functionName = await SourceMapScopes.NamesResolver.resolveProfileFrameFunctionName(

front_end/models/trace/handlers/LayoutShiftsHandler.test.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ async function processTrace(context: Mocha.Suite|Mocha.Context|null, url: string
1010

1111
Trace.Handlers.ModelHandlers.LayoutShifts.reset();
1212

13-
try {
14-
const events = await TraceLoader.rawEvents(context, url);
15-
for (const event of events) {
16-
Trace.Handlers.ModelHandlers.Meta.handleEvent(event);
17-
Trace.Handlers.ModelHandlers.Screenshots.handleEvent(event);
18-
Trace.Handlers.ModelHandlers.LayoutShifts.handleEvent(event);
19-
}
20-
} catch (error) {
21-
assert.fail(error);
13+
const events = await TraceLoader.rawEvents(context, url);
14+
for (const event of events) {
15+
Trace.Handlers.ModelHandlers.Meta.handleEvent(event);
16+
Trace.Handlers.ModelHandlers.Screenshots.handleEvent(event);
17+
Trace.Handlers.ModelHandlers.LayoutShifts.handleEvent(event);
2218
}
19+
2320
await Trace.Handlers.ModelHandlers.Meta.finalize();
2421
await Trace.Handlers.ModelHandlers.Screenshots.finalize();
2522
await Trace.Handlers.ModelHandlers.LayoutShifts.finalize();

front_end/models/trace/handlers/MetaHandler.test.ts

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@ import * as Trace from '../trace.js';
99
describe('MetaHandler', function() {
1010
let baseEvents: Trace.Types.Events.Event[];
1111
beforeEach(async function() {
12-
let defaultTraceEvents: readonly Trace.Types.Events.Event[];
13-
try {
14-
defaultTraceEvents = await TraceLoader.rawEvents(this, 'basic.json.gz');
15-
} catch (error) {
16-
assert.fail(error);
17-
return;
18-
}
12+
const defaultTraceEvents = await TraceLoader.rawEvents(this, 'basic.json.gz');
1913

2014
baseEvents = [
2115
...defaultTraceEvents,
@@ -123,10 +117,8 @@ describe('MetaHandler', function() {
123117
assert.strictEqual(data.navigationsByNavigationId.size, 1);
124118

125119
const firstNavigation = data.navigationsByNavigationId.get('navigation-1');
126-
if (!firstNavigation?.args.data) {
127-
assert.fail('Navigation data was expected in trace events');
128-
return;
129-
}
120+
121+
assert.exists(firstNavigation?.args.data, 'Navigation data was expected in trace events');
130122

131123
assert.strictEqual(firstNavigation.args.data.documentLoaderURL, 'test1');
132124
});
@@ -235,10 +227,8 @@ describe('MetaHandler', function() {
235227
assert.deepEqual([...data.topLevelRendererIds], [3601132]);
236228

237229
const rendererProcesses = data.rendererProcessesByFrame.get(data.mainFrameId);
238-
if (!rendererProcesses) {
239-
assert.fail('No renderer processes found');
240-
return;
241-
}
230+
assert.exists(rendererProcesses, 'No renderer processes found');
231+
242232
assert.deepEqual([...rendererProcesses?.keys()], [3601132]);
243233
const windowMinTime = 1143381875846;
244234
assert.deepEqual(
@@ -272,10 +262,7 @@ describe('MetaHandler', function() {
272262
assert.deepEqual([...data.topLevelRendererIds], [78450, 78473, 79194]);
273263

274264
const rendererProcesses = data.rendererProcessesByFrame.get(data.mainFrameId);
275-
if (!rendererProcesses) {
276-
assert.fail('No renderer processes found');
277-
return;
278-
}
265+
assert.exists(rendererProcesses, 'No renderer processes found');
279266

280267
const windowMinTime = 3550807444741;
281268
assert.deepEqual([...rendererProcesses?.keys()], [78450, 78473, 79194]);
@@ -329,10 +316,7 @@ describe('MetaHandler', function() {
329316
assert.deepEqual([...data.topLevelRendererIds], [2080]);
330317

331318
const rendererProcesses = data.rendererProcessesByFrame.get(data.mainFrameId);
332-
if (!rendererProcesses) {
333-
assert.fail('No renderer processes found');
334-
return;
335-
}
319+
assert.exists(rendererProcesses, 'No renderer processes found');
336320

337321
assert.deepEqual([...rendererProcesses?.keys()], [2080]);
338322
assert.deepEqual([...rendererProcesses?.values()], [
@@ -423,7 +407,6 @@ describe('MetaHandler', function() {
423407
traceEvents = await TraceLoader.rawEvents(this, 'web-dev.json.gz');
424408
} catch (error) {
425409
assert.fail(error);
426-
return;
427410
}
428411

429412
Trace.Handlers.ModelHandlers.Meta.reset();

front_end/models/trace/handlers/NetworkRequestsHandler.test.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,7 @@ describe('NetworkRequestsHandler', function() {
476476
function assertDataArgsStats<D extends keyof DataArgs>(
477477
requests: Trace.Types.Events.SyntheticNetworkRequest[], url: string, stats: Map<D, DataArgs[D]>): void {
478478
const request = requests.find(request => request.args.data.url === url);
479-
if (!request) {
480-
assert.fail(`Unable to find request for URL ${url}`);
481-
return;
482-
}
479+
assert.exists(request, `Unable to find request for URL ${url}`);
483480

484481
for (const [name, value] of stats.entries()) {
485482
if (typeof request.args.data[name] === 'number') {
@@ -496,10 +493,7 @@ function assertDataArgsProcessedDataStats<D extends keyof DataArgsProcessedData>
496493
requests: Trace.Types.Events.SyntheticNetworkRequest[], url: string,
497494
stats: Map<D, DataArgsProcessedData[D]>): void {
498495
const request = requests.find(request => request.args.data.url === url);
499-
if (!request) {
500-
assert.fail(`Unable to find request for URL ${url}`);
501-
return;
502-
}
496+
assert.exists(request, `Unable to find request for URL ${url}`);
503497

504498
for (const [name, value] of stats.entries()) {
505499
if (typeof request.args.data.syntheticData[name] === 'number') {

front_end/models/trace/helpers/TreeHelpers.test.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,37 +230,27 @@ describe('TreeHelpers', () => {
230230
const taskC = nodeC.entry;
231231

232232
const taskCTotalTime = taskC.dur;
233-
if (taskCTotalTime === undefined) {
234-
assert.fail('Total time for task was not found');
235-
}
233+
assert.exists(taskCTotalTime, 'Total time for task was not found');
236234
assert.strictEqual(taskCTotalTime, Trace.Types.Timing.Micro(1));
237235
assert.strictEqual(nodeC.selfTime, taskCTotalTime);
238236

239237
const taskBTotalTime = taskB.dur;
240-
if (taskBTotalTime === undefined) {
241-
assert.fail('Total time for task was not found');
242-
}
238+
assert.exists(taskBTotalTime, 'Total time for task was not found');
243239
assert.strictEqual(taskBTotalTime, Trace.Types.Timing.Micro(3));
244240
assert.strictEqual(nodeB.selfTime, Trace.Types.Timing.Micro(taskBTotalTime - taskCTotalTime));
245241

246242
const taskDTotalTime = taskD.dur;
247-
if (taskDTotalTime === undefined) {
248-
assert.fail('Total time for task was not found');
249-
}
243+
assert.exists(taskDTotalTime, 'Total time for task was not found');
250244
assert.strictEqual(taskDTotalTime, Trace.Types.Timing.Micro(3));
251245
assert.strictEqual(nodeD.selfTime, taskDTotalTime);
252246

253247
const taskATotalTime = taskA.dur;
254-
if (taskATotalTime === undefined) {
255-
assert.fail('Total time for task was not found');
256-
}
248+
assert.exists(taskATotalTime, 'Total time for task was not found');
257249
assert.strictEqual(taskATotalTime, Trace.Types.Timing.Micro(10));
258250
assert.strictEqual(nodeA.selfTime, Trace.Types.Timing.Micro(taskATotalTime - taskBTotalTime - taskDTotalTime));
259251

260252
const taskETotalTime = taskE.dur;
261-
if (taskETotalTime === undefined) {
262-
assert.fail('Total time for task was not found');
263-
}
253+
assert.exists(taskETotalTime, 'Total time for task was not found');
264254
assert.strictEqual(taskETotalTime, Trace.Types.Timing.Micro(3));
265255
assert.strictEqual(nodeD.selfTime, taskETotalTime);
266256
});

front_end/panels/elements/StylePropertyTreeElement.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,7 @@ describeWithMockConnection('StylePropertyTreeElement', () => {
476476
const {valueElement} = stylePropertyTreeElement;
477477
assert.exists(valueElement);
478478

479-
const swatch = valueElement.querySelector<InlineEditor.ColorSwatch.ColorSwatch>('devtools-color-swatch');
480-
479+
const swatch = valueElement.querySelector('devtools-color-swatch');
481480
assert.exists(swatch);
482481

483482
const expectedColorString = swatch.getColor()?.asString(Common.Color.Format.LAB);

front_end/panels/elements/components/ComputedStyleProperty.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ describe('ComputedStyleProperty', () => {
2727
getEventPromise(component, ElementsComponents.ComputedStyleProperty.NavigateToSourceEvent.eventName);
2828

2929
const goto = component.shadowRoot!.querySelector<HTMLElement>('.goto');
30-
if (!goto) {
31-
assert.fail('goto icon should exist');
32-
return;
33-
}
30+
assert.exists(goto, 'goto icon should exist');
31+
3432
goto.click();
3533
const event = await navigateEvent;
3634
assert.exists(event);

0 commit comments

Comments
 (0)