test(amazonq): reset state after each testgen e2e test (#6522)

## Problem
1. The /test command can occasionally create test files in directories
unrelated to the source file location (this is a known science issue
that will be addressed)
2. Unit tests generated after the "Clicks on accept" test may possibly
accumulate in the CI since testFixtures isn't reset for each build. This
can lead to bloated test environments as these tests should be isolated
and start with a clean state.

## Solution
1. Add a dedicated testgen folder within testFixtures to isolate from
other files. This prevents cross-contamination (ex: python tests
appearing in java directories)
2. Clean up generated unit tests after "Clicks on accept" test
---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Author: chungjac

packages/amazonq/test/e2e/amazonq/testGen.test.ts

@@ -9,9 +9,10 @@ import { qTestingFramework } from './framework/framework'
 import sinon from 'sinon'
 import { Messenger } from './framework/messenger'
 import { FollowUpTypes } from 'aws-core-vscode/amazonq'
-import { registerAuthHook, using, TestFolder, closeAllEditors } from 'aws-core-vscode/test'
+import { registerAuthHook, using, TestFolder, closeAllEditors, getTestWorkspaceFolder } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
 import { waitUntil, workspaceUtils } from 'aws-core-vscode/shared'
+import * as path from 'path'
 
 describe('Amazon Q Test Generation', function () {
     let framework: qTestingFramework
@@ -20,11 +21,13 @@ describe('Amazon Q Test Generation', function () {
     const testFiles = [
         {
             language: 'python',
-            filePath: 'python3.7-image-sam-app/hello_world/app.py',
+            filePath: 'testGenFolder/src/main/math.py',
+            testFilePath: 'testGenFolder/src/test/test_math.py',
         },
         {
             language: 'java',
-            filePath: 'java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java',
+            filePath: 'testGenFolder/src/main/Math.java',
+            testFilePath: 'testGenFolder/src/test/MathTest.java',
         },
     ]
 
@@ -33,14 +36,15 @@ describe('Amazon Q Test Generation', function () {
         // must be atleast one unsupported language here for testing
         {
             language: 'typescript',
-            filePath: 'ts-plain-sam-app/src/app.ts',
+            filePath: 'testGenFolder/src/main/math.ts',
         },
         {
             language: 'javascript',
-            filePath: 'js-plain-sam-app/src/app.js',
+            filePath: 'testGenFolder/src/main/math.js',
         },
     ]
 
+    // handles opening the file since /test must be called on an active file
     async function setupTestDocument(filePath: string, language: string) {
         const document = await waitUntil(async () => {
             const doc = await workspaceUtils.openTextDocument(filePath)
@@ -57,7 +61,7 @@ describe('Amazon Q Test Generation', function () {
 
         const activeEditor = vscode.window.activeTextEditor
         if (!activeEditor || activeEditor.document.uri.fsPath !== document.uri.fsPath) {
-            assert.fail(`Failed to make temp file active`)
+            assert.fail(`Failed to make ${language} file active`)
         }
     }
 
@@ -68,6 +72,15 @@ describe('Amazon Q Test Generation', function () {
         })
     }
 
+    // clears test file to a blank file
+    // not cleaning up test file may possibly cause bloat in CI since testFixtures does not get reset
+    async function cleanupTestFile(testFilePath: string) {
+        const workspaceFolder = getTestWorkspaceFolder()
+        const absoluteTestFilePath = path.join(workspaceFolder, testFilePath)
+        const testFileUri = vscode.Uri.file(absoluteTestFilePath)
+        await vscode.workspace.fs.writeFile(testFileUri, Buffer.from('', 'utf-8'))
+    }
+
     before(async function () {
         await using(registerAuthHook('amazonq-test-account'), async () => {
             await loginToIdC()
@@ -112,7 +125,7 @@ describe('Amazon Q Test Generation', function () {
     })
 
     describe('/test entry', () => {
-        describe('Unsupported language', () => {
+        describe('Unsupported language file', () => {
             const { language, filePath } = unsupportedLanguages[0]
 
             beforeEach(async () => {
@@ -134,13 +147,13 @@ describe('Amazon Q Test Generation', function () {
             })
         })
 
-        describe('External file', async () => {
+        describe('External file out of project', async () => {
             let testFolder: TestFolder
             let fileName: string
 
             beforeEach(async () => {
                 testFolder = await TestFolder.create()
-                fileName = 'test.py'
+                fileName = 'math.py'
                 const filePath = await testFolder.write(fileName, 'def add(a, b): return a + b')
 
                 const document = await vscode.workspace.openTextDocument(filePath)
@@ -162,10 +175,8 @@ describe('Amazon Q Test Generation', function () {
             })
         })
 
-        for (const { language, filePath } of testFiles) {
-            // skipping for now since this test is flaky. passes locally, but only half the time in CI
-            // have tried retries for setupTestDocument, openTextDocument, and showTextDocument
-            describe.skip(`${language} file`, () => {
+        for (const { language, filePath, testFilePath } of testFiles) {
+            describe(`/test on ${language} file`, () => {
                 beforeEach(async () => {
                     await waitUntil(async () => await setupTestDocument(filePath, language), {})
 
@@ -177,7 +188,7 @@ describe('Amazon Q Test Generation', function () {
                     await tab.waitForChatFinishesLoading()
                 })
 
-                describe('View diff', async () => {
+                describe('View diff of test file', async () => {
                     it('Clicks on view diff', async () => {
                         const chatItems = tab.getChatItems()
                         const viewDiffMessage = chatItems[5]
@@ -190,7 +201,14 @@ describe('Amazon Q Test Generation', function () {
                     })
                 })
 
-                describe('Accept code', async () => {
+                describe('Accept unit tests', async () => {
+                    afterEach(async () => {
+                        // this e2e test generates unit tests, so we want to clean them up after this test is done
+                        await waitUntil(async () => {
+                            await cleanupTestFile(testFilePath)
+                        }, {})
+                    })
+
                     it('Clicks on accept', async () => {
                         await tab.waitForButtons([FollowUpTypes.AcceptCode, FollowUpTypes.RejectCode])
                         tab.clickButton(FollowUpTypes.AcceptCode)
@@ -204,7 +222,7 @@ describe('Amazon Q Test Generation', function () {
                     })
                 })
 
-                describe('Reject code', async () => {
+                describe('Reject unit tests', async () => {
                     it('Clicks on reject', async () => {
                         await tab.waitForButtons([FollowUpTypes.AcceptCode, FollowUpTypes.RejectCode])
                         tab.clickButton(FollowUpTypes.RejectCode)

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/Math.java

@@ -0,0 +1,8 @@
+/**
+ * Math functions
+ */
+public class Math {
+    public int add(int a, int b) {
+        return a + b;
+    }
+}

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.js

@@ -0,0 +1,3 @@
+function addNum(num1, num2) {
+    return num1 + num2;
+}

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.py

@@ -0,0 +1,3 @@
+# adds two numbers
+def add(a, b):
+    return a + b

packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.ts

@@ -0,0 +1,3 @@
+function addTwoNums(a: number, b: number): number {
+    return a + b;
+}