Skip to content

Commit f1f751c

Browse files
szuendDevtools-frontend LUCI CQ
authored andcommitted
[testing] Remove 'describeWithLocale' in favor of 'setupLocaleHooks'
Having various setup*Hooks functions is much more composable then our current describe* approach. [email protected] Bug: 458180550 Change-Id: I0299b36872594bb40249418b3a15924137d3bb58 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/7201547 Reviewed-by: Alex Rudenko <[email protected]> Commit-Queue: Alex Rudenko <[email protected]> Auto-Submit: Simon Zünd <[email protected]>
1 parent 5793da5 commit f1f751c

File tree

75 files changed

+293
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+293
-219
lines changed

front_end/core/common/ResourceType.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66
import * as Platform from '../platform/platform.js';
77

88
import * as Common from './common.js';
@@ -25,7 +25,8 @@ describe('ResourceCategory class', () => {
2525
});
2626
});
2727

28-
describeWithLocale('ResourceType class', () => {
28+
describe('ResourceType class', () => {
29+
setupLocaleHooks();
2930
it('is able to be instantiated successfully', () => {
3031
const testResourceCategory = new ResourceCategory('category name', categoryTestTitle, categoryTestShortTitle);
3132
const resourceType = new ResourceType('Type Test Name', typeTestTitle, testResourceCategory, true);

front_end/core/i18n/ByteUtilities.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66

77
import * as i18n from './i18n.js';
88

9-
describeWithLocale('ByteUtilities', () => {
9+
describe('ByteUtilities', () => {
10+
setupLocaleHooks();
1011
describe('bytesToString', () => {
1112
it('formats for < 1000 bytes', () => {
1213
assert.deepEqual(i18n.ByteUtilities.bytesToString(50), '50\xA0B');

front_end/core/i18n/NumberFormatter.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66

77
import * as i18n from './i18n.js';
88

9-
describeWithLocale('NumberFormatter', () => {
9+
describe('NumberFormatter', () => {
10+
setupLocaleHooks();
1011
const identity = (locale: string) => locale;
1112
after(() => {
1213
// Reset the singleton after the test suite for other tests.

front_end/core/i18n/time-utilities.test.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66
import type * as Platform from '../platform/platform.js';
77

88
import * as i18n from './i18n.js';
99

10-
describeWithLocale('preciseMillisToString', () => {
10+
describe('preciseMillisToString', () => {
11+
setupLocaleHooks();
1112
it('formats without a given precision', () => {
1213
const inputNumber = 7.84;
1314
const outputString = i18n.TimeUtilities.preciseMillisToString(inputNumber);
@@ -40,7 +41,8 @@ describeWithLocale('preciseMillisToString', () => {
4041
});
4142
});
4243

43-
describeWithLocale('formatMicroSecondsTime', () => {
44+
describe('formatMicroSecondsTime', () => {
45+
setupLocaleHooks();
4446
const {formatMicroSecondsTime} = i18n.TimeUtilities;
4547

4648
it('formats small microsecond values', async () => {
@@ -70,7 +72,8 @@ describeWithLocale('formatMicroSecondsTime', () => {
7072
});
7173
});
7274

73-
describeWithLocale('formatMicroSecondsAsSeconds', () => {
75+
describe('formatMicroSecondsAsSeconds', () => {
76+
setupLocaleHooks();
7477
const {formatMicroSecondsAsSeconds} = i18n.TimeUtilities;
7578
it('formats smaller second values', async () => {
7679
const time = 0.03 * 1_000 * 1_000 as Platform.Timing.MicroSeconds;
@@ -83,7 +86,8 @@ describeWithLocale('formatMicroSecondsAsSeconds', () => {
8386
});
8487
});
8588

86-
describeWithLocale('millisToString', () => {
89+
describe('millisToString', () => {
90+
setupLocaleHooks();
8791
it('formats when number is infinite', () => {
8892
const inputNumber = Infinity;
8993
const outputString = i18n.TimeUtilities.millisToString(inputNumber);
@@ -149,7 +153,8 @@ describeWithLocale('millisToString', () => {
149153
});
150154
});
151155

152-
describeWithLocale('secondsToString', () => {
156+
describe('secondsToString', () => {
157+
setupLocaleHooks();
153158
it('formats infinte numbers correctly', () => {
154159
const inputNumber = Infinity;
155160
const outputString = i18n.TimeUtilities.secondsToString(inputNumber);

front_end/core/platform/NumberUtilities.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66

77
import * as Platform from './platform.js';
88

9-
describeWithLocale('NumberUtilities', () => {
9+
describe('NumberUtilities', () => {
10+
setupLocaleHooks();
1011
describe('clamp', () => {
1112
it('takes the lower bound if the number is smaller', () => {
1213
assert.strictEqual(5, Platform.NumberUtilities.clamp(1, 5, 10));

front_end/core/sdk/DebuggerModel.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as Protocol from '../../generated/protocol.js';
66
import * as Bindings from '../../models/bindings/bindings.js';
77
import * as Workspace from '../../models/workspace/workspace.js';
88
import {createTarget} from '../../testing/EnvironmentHelpers.js';
9-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
9+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
1010
import {MockCDPConnection} from '../../testing/MockCDPConnection.js';
1111
import {setupRuntimeHooks} from '../../testing/RuntimeHelpers.js';
1212
import {setupSettingsHooks} from '../../testing/SettingsHelpers.js';
@@ -218,7 +218,9 @@ describe('DebuggerModel', () => {
218218
});
219219
});
220220

221-
describeWithLocale('Scope', () => {
221+
describe('Scope', () => {
222+
setupLocaleHooks();
223+
222224
it('Scope.typeName covers every enum value', async () => {
223225
const target = createTarget();
224226
const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel) as SDK.DebuggerModel.DebuggerModel;

front_end/core/sdk/PageResourceLoader.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type * as Protocol from '../../generated/protocol.js';
66
import {
77
createTarget,
88
} from '../../testing/EnvironmentHelpers.js';
9-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
9+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
1010
import {MockCDPConnection} from '../../testing/MockCDPConnection.js';
1111
import {mockResourceTree} from '../../testing/ResourceTreeHelpers.js';
1212
import {setupRuntimeHooks} from '../../testing/RuntimeHelpers.js';
@@ -32,7 +32,7 @@ const initiator = {
3232
initiatorUrl: Platform.DevToolsPath.EmptyUrlString,
3333
};
3434

35-
describeWithLocale('PageResourceLoader', () => {
35+
describe('PageResourceLoader', () => {
3636
const foo1Url = urlString`foo1`;
3737
const foo2Url = urlString`foo2`;
3838
const foo3Url = urlString`foo3`;
@@ -51,6 +51,7 @@ describeWithLocale('PageResourceLoader', () => {
5151
loads.length = 0;
5252
});
5353

54+
setupLocaleHooks();
5455
setupSettingsHooks();
5556

5657
it('registers extension loads', async () => {
@@ -280,12 +281,13 @@ describe('PageResourceLoader', () => {
280281
});
281282
});
282283

283-
describeWithLocale('PageResourceLoader', () => {
284+
describe('PageResourceLoader', () => {
284285
const initiatorUrl = urlString`htp://example.com`;
285286
const foo1Url = urlString`foo1`;
286287
const foo2Url = urlString`foo2`;
287288
const foo3Url = urlString`foo3`;
288289

290+
setupLocaleHooks();
289291
setupSettingsHooks();
290292
setupRuntimeHooks();
291293

front_end/core/sdk/ServerTiming.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import {describeWithLocale} from '../../testing/LocaleHelpers.js';
5+
import {setupLocaleHooks} from '../../testing/LocaleHelpers.js';
66

77
import * as SDK from './sdk.js';
88

@@ -15,7 +15,8 @@ describe('ServerTiming', () => {
1515
});
1616
});
1717

18-
describeWithLocale('SDK.ServerTiming.ServerTiming.createFromHeaderValue', () => {
18+
describe('SDK.ServerTiming.ServerTiming.createFromHeaderValue', () => {
19+
setupLocaleHooks();
1920
it('parses headers correctly', () => {
2021
// A real-world-like example with some edge cases.
2122
const actual = SDK.ServerTiming.ServerTiming.createFromHeaderValue(

front_end/models/ai_assistance/data_formatters/PerformanceInsightFormatter.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
// found in the LICENSE file.
44

55
import {getFirstOrError, getInsightOrError} from '../../../testing/InsightHelpers.js';
6-
import {describeWithLocale} from '../../../testing/LocaleHelpers.js';
6+
import {setupLocaleHooks} from '../../../testing/LocaleHelpers.js';
77
import {setupRuntimeHooks} from '../../../testing/RuntimeHelpers.js';
88
import {setupSettingsHooks} from '../../../testing/SettingsHelpers.js';
99
import {SnapshotTester} from '../../../testing/SnapshotTester.js';
1010
import {TraceLoader} from '../../../testing/TraceLoader.js';
1111
import type * as Trace from '../../trace/trace.js';
1212
import {AIContext, PerformanceInsightFormatter} from '../ai_assistance.js';
1313

14-
describeWithLocale('PerformanceInsightFormatter', function() {
14+
describe('PerformanceInsightFormatter', function() {
15+
setupLocaleHooks();
1516
const snapshotTester = new SnapshotTester(this, import.meta);
1617

1718
setupRuntimeHooks();

front_end/models/ai_assistance/data_formatters/PerformanceTraceFormatter.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import * as CrUXManager from '../../../models/crux-manager/crux-manager.js';
66
import * as Trace from '../../../models/trace/trace.js';
7-
import {describeWithLocale} from '../../../testing/LocaleHelpers.js';
7+
import {setupLocaleHooks} from '../../../testing/LocaleHelpers.js';
88
import {setupRuntimeHooks} from '../../../testing/RuntimeHelpers.js';
99
import {setupSettingsHooks} from '../../../testing/SettingsHelpers.js';
1010
import {SnapshotTester} from '../../../testing/SnapshotTester.js';
@@ -22,7 +22,8 @@ async function createFormatter(context: Mocha.Context|Mocha.Suite|null, name: st
2222
return {formatter, parsedTrace};
2323
}
2424

25-
describeWithLocale('PerformanceTraceFormatter', function() {
25+
describe('PerformanceTraceFormatter', function() {
26+
setupLocaleHooks();
2627
const snapshotTester = new SnapshotTester(this, import.meta);
2728

2829
setupRuntimeHooks();

0 commit comments

Comments
 (0)