Skip to content

Commit 4a253da

Browse files
HweinstockHweinstock
committed
use common function to reduce clutter
1 parent 71f7eef commit 4a253da

File tree

9 files changed

+57
-153
lines changed

9 files changed

+57
-153
lines changed

‎packages/core/src/shared/performance/performance.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,3 +206,11 @@ function assertPerformanceMetrics(
206206
`Expected total duration for ${name} to be less than ${expectedDuration}. Actual duration was ${foundDuration}`
207207
)
208208
}
209+
210+
export function getEqualOSTestOptions(testOptions: Partial<PerformanceMetrics>): Partial<TestOptions> {
211+
return {
212+
linux: testOptions,
213+
darwin: testOptions,
214+
win32: testOptions,
215+
}
216+
}

‎packages/core/src/testInteg/perf/collectFiles.test.ts‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import assert from 'assert'
66
import * as vscode from 'vscode'
77
import * as sinon from 'sinon'
8-
import { performanceTest } from '../../shared/performance/performance'
8+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
99
import { createTestWorkspaceFolder, toFile } from '../../test/testUtil'
1010
import path from 'path'
1111
import { fs, randomUUID } from '../../shared'
@@ -15,23 +15,11 @@ import { FileSystem } from '../../shared/fs/fs'
1515

1616
function performanceTestWrapper(totalFiles: number) {
1717
return performanceTest(
18-
{
19-
darwin: {
20-
userCpuUsage: 100,
21-
systemCpuUsage: 35,
22-
heapTotal: 2,
23-
},
24-
linux: {
25-
userCpuUsage: 100,
26-
systemCpuUsage: 35,
27-
heapTotal: 2,
28-
},
29-
win32: {
30-
userCpuUsage: 100,
31-
systemCpuUsage: 35,
32-
heapTotal: 2,
33-
},
34-
},
18+
getEqualOSTestOptions({
19+
userCpuUsage: 100,
20+
systemCpuUsage: 35,
21+
heapTotal: 2,
22+
}),
3523
'calculate cpu and memory usage',
3624
function () {
3725
return {

‎packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as sinon from 'sinon'
99
import path from 'path'
1010
import { fs, getRandomString } from '../../shared'
1111
import { createTestWorkspace } from '../../test/testUtil'
12-
import { performanceTest } from '../../shared/performance/performance'
12+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
1313
import { downloadExportResultArchive } from '../../shared/utilities/download'
1414

1515
interface SetupResult {
@@ -47,24 +47,11 @@ async function setup(pieces: number, pieceSize: number): Promise<SetupResult> {
4747

4848
function perfTest(pieces: number, pieceSize: number, label: string) {
4949
return performanceTest(
50-
{
51-
testRuns: 10,
52-
linux: {
53-
userCpuUsage: 200,
54-
systemCpuUsage: 35,
55-
heapTotal: 4,
56-
},
57-
darwin: {
58-
userCpuUsage: 200,
59-
systemCpuUsage: 35,
60-
heapTotal: 4,
61-
},
62-
win32: {
63-
userCpuUsage: 200,
64-
systemCpuUsage: 35,
65-
heapTotal: 4,
66-
},
67-
},
50+
getEqualOSTestOptions({
51+
userCpuUsage: 200,
52+
systemCpuUsage: 35,
53+
heapTotal: 4,
54+
}),
6855
label,
6956
function () {
7057
return {

‎packages/core/src/testInteg/perf/getFileSha384.test.ts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import sinon from 'sinon'
88
import { getTestWorkspaceFolder } from '../integrationTestsUtilities'
99
import { fs, getRandomString } from '../../shared'
1010
import { LspController } from '../../amazonq'
11-
import { performanceTest } from '../../shared/performance/performance'
11+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
1212
import { FileSystem } from '../../shared/fs/fs'
1313
import { getFsCallsUpperBound } from './utilities'
1414

@@ -19,24 +19,11 @@ interface SetupResult {
1919

2020
function performanceTestWrapper(label: string, fileSize: number) {
2121
return performanceTest(
22-
{
23-
testRuns: 10,
24-
linux: {
25-
userCpuUsage: 400,
26-
systemCpuUsage: 35,
27-
heapTotal: 4,
28-
},
29-
darwin: {
30-
userCpuUsage: 400,
31-
systemCpuUsage: 35,
32-
heapTotal: 4,
33-
},
34-
win32: {
35-
userCpuUsage: 400,
36-
systemCpuUsage: 35,
37-
heapTotal: 4,
38-
},
39-
},
22+
getEqualOSTestOptions({
23+
userCpuUsage: 400,
24+
systemCpuUsage: 35,
25+
heapTotal: 4,
26+
}),
4027
label,
4128
function () {
4229
return {

‎packages/core/src/testInteg/perf/prepareRepoData.test.ts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import assert from 'assert'
66
import * as sinon from 'sinon'
77
import { WorkspaceFolder } from 'vscode'
8-
import { performanceTest } from '../../shared/performance/performance'
8+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
99
import { createTestWorkspace } from '../../test/testUtil'
1010
import { prepareRepoData, TelemetryHelper } from '../../amazonqFeatureDev'
1111
import { AmazonqCreateUpload, fs, getRandomString } from '../../shared'
@@ -27,24 +27,11 @@ type setupResult = {
2727

2828
function performanceTestWrapper(numFiles: number, fileSize: number) {
2929
return performanceTest(
30-
{
31-
testRuns: 10,
32-
linux: {
33-
userCpuUsage: 150,
34-
systemCpuUsage: 35,
35-
heapTotal: 4,
36-
},
37-
darwin: {
38-
userCpuUsage: 150,
39-
systemCpuUsage: 35,
40-
heapTotal: 4,
41-
},
42-
win32: {
43-
userCpuUsage: 150,
44-
systemCpuUsage: 35,
45-
heapTotal: 4,
46-
},
47-
},
30+
getEqualOSTestOptions({
31+
userCpuUsage: 150,
32+
systemCpuUsage: 35,
33+
heapTotal: 4,
34+
}),
4835
`handles ${numFiles} files of size ${fileSize} bytes`,
4936
function () {
5037
const telemetry = new TelemetryHelper()

‎packages/core/src/testInteg/perf/registerNewFiles.test.ts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import assert from 'assert'
66
import sinon from 'sinon'
77
import * as vscode from 'vscode'
88
import { NewFileInfo, NewFileZipContents, registerNewFiles } from '../../amazonqFeatureDev'
9-
import { performanceTest } from '../../shared/performance/performance'
9+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
1010
import { getTestWorkspaceFolder } from '../integrationTestsUtilities'
1111
import { VirtualFileSystem } from '../../shared'
1212

@@ -29,24 +29,11 @@ function getFileContents(numFiles: number, fileSize: number): NewFileZipContents
2929
function performanceTestWrapper(label: string, numFiles: number, fileSize: number) {
3030
const conversationId = 'test-conversation'
3131
return performanceTest(
32-
{
33-
testRuns: 10,
34-
linux: {
35-
userCpuUsage: 200,
36-
systemCpuUsage: 35,
37-
heapTotal: 20,
38-
},
39-
darwin: {
40-
userCpuUsage: 200,
41-
systemCpuUsage: 35,
42-
heapTotal: 20,
43-
},
44-
win32: {
45-
userCpuUsage: 200,
46-
systemCpuUsage: 35,
47-
heapTotal: 20,
48-
},
49-
},
32+
getEqualOSTestOptions({
33+
userCpuUsage: 200,
34+
systemCpuUsage: 35,
35+
heapTotal: 20,
36+
}),
5037
label,
5138
function () {
5239
return {

‎packages/core/src/testInteg/perf/startSecurityScan.test.ts‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
import { getTestWindow } from '../../test/shared/vscode/window'
2323
import { SeverityLevel } from '../../test/shared/vscode/message'
2424
import { CodeAnalysisScope, ZipUtil } from '../../codewhisperer'
25-
import { performanceTest } from '../../shared/performance/performance'
25+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
2626
import { createClient } from '../../test/codewhisperer/testUtil'
2727
import { fs } from '../../shared'
2828
import { FileSystem } from '../../shared/fs/fs'
@@ -69,23 +69,11 @@ describe('startSecurityScanPerformanceTest', function () {
6969
}
7070

7171
performanceTest(
72-
{
73-
darwin: {
74-
userCpuUsage: 150,
75-
systemCpuUsage: 35,
76-
heapTotal: 2,
77-
},
78-
linux: {
79-
userCpuUsage: 150,
80-
systemCpuUsage: 35,
81-
heapTotal: 2,
82-
},
83-
win32: {
84-
userCpuUsage: 150,
85-
systemCpuUsage: 35,
86-
heapTotal: 2,
87-
},
88-
},
72+
getEqualOSTestOptions({
73+
userCpuUsage: 150,
74+
systemCpuUsage: 35,
75+
heapTotal: 2,
76+
}),
8977
'Should calculate cpu and memory usage for file scans',
9078
function () {
9179
return {

‎packages/core/src/testInteg/perf/tryInstallLsp.test.ts‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import path from 'path'
1010
import { LspController } from '../../amazonq'
1111
import { fs, getRandomString, globals } from '../../shared'
1212
import { createTestWorkspace } from '../../test/testUtil'
13-
import { performanceTest } from '../../shared/performance/performance'
13+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
1414
import { getFsCallsUpperBound } from './utilities'
1515
import { FileSystem } from '../../shared/fs/fs'
1616

@@ -73,27 +73,12 @@ const getFakeDownload = function (numberOfFiles: number, fileSize: number) {
7373

7474
function performanceTestWrapper(numFiles: number, fileSize: number, message: string) {
7575
return performanceTest(
76-
{
77-
testRuns: 10,
78-
linux: {
79-
userCpuUsage: 150,
80-
systemCpuUsage: 35,
81-
heapTotal: 6,
82-
duration: 15,
83-
},
84-
darwin: {
85-
userCpuUsage: 150,
86-
systemCpuUsage: 35,
87-
heapTotal: 6,
88-
duration: 15,
89-
},
90-
win32: {
91-
userCpuUsage: 150,
92-
systemCpuUsage: 35,
93-
heapTotal: 6,
94-
duration: 15,
95-
},
96-
},
76+
getEqualOSTestOptions({
77+
userCpuUsage: 150,
78+
systemCpuUsage: 35,
79+
heapTotal: 6,
80+
duration: 15,
81+
}),
9782
message,
9883
function () {
9984
return {

‎packages/core/src/testInteg/perf/zipcode.test.ts‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { TransformByQState, ZipManifest } from '../../codewhisperer'
88
import { fs, getRandomString, globals } from '../../shared'
99
import { createTestWorkspace } from '../../test/testUtil'
1010
import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
11-
import { performanceTest } from '../../shared/performance/performance'
11+
import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
1212
import { zipCode } from '../../codewhisperer/indexNode'
1313
import { FileSystem } from '../../shared/fs/fs'
1414
import { getFsCallsUpperBound } from './utilities'
@@ -39,24 +39,11 @@ async function setup(numberOfFiles: number, fileSize: number): Promise<SetupResu
3939

4040
function performanceTestWrapper(numberOfFiles: number, fileSize: number) {
4141
return performanceTest(
42-
{
43-
testRuns: 10,
44-
linux: {
45-
userCpuUsage: 200,
46-
systemCpuUsage: 50,
47-
heapTotal: 4,
48-
},
49-
darwin: {
50-
userCpuUsage: 200,
51-
systemCpuUsage: 50,
52-
heapTotal: 4,
53-
},
54-
win32: {
55-
userCpuUsage: 200,
56-
systemCpuUsage: 50,
57-
heapTotal: 4,
58-
},
59-
},
42+
getEqualOSTestOptions({
43+
userCpuUsage: 200,
44+
systemCpuUsage: 50,
45+
heapTotal: 4,
46+
}),
6047
'zipCode',
6148
function () {
6249
return {

0 commit comments

Comments
 (0)