merge in master

Author: Hweinstock

packages/core/src/test/amazonqFeatureDev/prepareRepoData.test.ts

@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { WorkspaceFolder } from 'vscode'
+import { performanceTest } from '../../shared/performance/performance'
+import { createTestWorkspace } from '../testUtil'
+import { prepareRepoData, TelemetryHelper } from '../../amazonqFeatureDev'
+import { AmazonqCreateUpload, getRandomString } from '../../shared'
+import { Span } from '../../shared/telemetry'
+
+type resultType = {
+    zipFileBuffer: Buffer
+    zipFileChecksum: string
+}
+
+function performanceTestWrapper(numFiles: number, fileSize: number) {
+    return performanceTest(
+        {
+            testRuns: 10,
+            linux: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 4,
+            },
+            darwin: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 4,
+            },
+            win32: {
+                userCpuUsage: 100,
+                systemCpuUsage: 35,
+                heapTotal: 4,
+            },
+        },
+        `handles ${numFiles} files of size ${fileSize} bytes`,
+        function () {
+            const telemetry = new TelemetryHelper()
+            return {
+                setup: async () => {
+                    return await createTestWorkspace(numFiles, {
+                        fileNamePrefix: 'file',
+                        fileContent: getRandomString(fileSize),
+                        fileNameSuffix: '.md',
+                    })
+                },
+                execute: async (workspace: WorkspaceFolder) => {
+                    return await prepareRepoData([workspace.uri.fsPath], [workspace], telemetry, {
+                        record: () => {},
+                    } as unknown as Span<AmazonqCreateUpload>)
+                },
+                verify: async (_w: WorkspaceFolder, result: resultType) => {
+                    verifyResult(result, telemetry, numFiles * fileSize)
+                },
+            }
+        }
+    )
+}
+
+function verifyResult(result: resultType, telemetry: TelemetryHelper, expectedSize: number): void {
+    assert.ok(result)
+    assert.strictEqual(Buffer.isBuffer(result.zipFileBuffer), true)
+    assert.strictEqual(telemetry.repositorySize, expectedSize)
+    assert.strictEqual(result.zipFileChecksum.length, 44)
+}
+
+describe('prepareRepoData', function () {
+    describe('Performance Tests', function () {
+        performanceTestWrapper(250, 10)
+        performanceTestWrapper(10, 1000)
+    })
+})

packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts

@@ -49,7 +49,7 @@ describe('CodeDownloader', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -129,7 +129,7 @@ describe('CodeGenerator', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -202,7 +202,7 @@ describe('CodeGeneratorStatusPoller', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.delete(tempFolder, { force: true })
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'

packages/core/src/testInteg/buildIndex.test.ts

@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { performanceTest } from '../shared/performance/performance'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { LspClient, LspController } from '../amazonq'
+import { LanguageClient, ServerOptions } from 'vscode-languageclient'
+import { createTestWorkspace } from '../test/testUtil'
+import { GetUsageRequestType, IndexRequestType } from '../amazonq/lsp/types'
+import { getRandomString } from '../shared'
+
+interface SetupResult {
+    clientReqStub: sinon.SinonStub
+}
+
+async function verifyResult(setup: SetupResult) {
+    assert.ok(setup.clientReqStub.calledTwice)
+    assert.ok(setup.clientReqStub.firstCall.calledWith(IndexRequestType))
+    assert.ok(setup.clientReqStub.secondCall.calledWith(GetUsageRequestType))
+}
+
+async function setupWithWorkspace(numFiles: number, options: { fileContent: string }): Promise<SetupResult> {
+    // Force VSCode to find my test workspace only to keep test contained and controlled.
+    const testWorksapce = await createTestWorkspace(numFiles, options)
+    sinon.stub(vscode.workspace, 'workspaceFolders').value([testWorksapce])
+    // Avoid sending real request to lsp.
+    const clientReqStub = sinon.stub(LanguageClient.prototype, 'sendRequest').resolves(true)
+    LspClient.instance.client = new LanguageClient('amazonq', 'test-client', {} as ServerOptions, {})
+    return { clientReqStub }
+}
+
+describe('buildIndex', function () {
+    describe('performanceTests', function () {
+        afterEach(function () {
+            sinon.restore()
+        })
+        performanceTest({}, 'indexing many small files', function () {
+            return {
+                setup: async () => setupWithWorkspace(250, { fileContent: '0123456789' }),
+                execute: async () => {
+                    await LspController.instance.buildIndex()
+                },
+                verify: verifyResult,
+            }
+        })
+        performanceTest({}, 'indexing few large files', function () {
+            return {
+                setup: async () => setupWithWorkspace(10, { fileContent: getRandomString(1000) }),
+                execute: async () => {
+                    await LspController.instance.buildIndex()
+                },
+                verify: verifyResult,
+            }
+        })
+    })
+})