implemented the pressShortcut and switching to editor

Author: laura-codess

package-lock.json

@@ -30,7 +30,7 @@
         "testE2E": "npm run testE2E -w packages/ --if-present",
         "test:ui:prepare": "./node_modules/.bin/extest get-vscode -s ~/.vscode-test-resources -n && extest get-chromedriver -s ~/.vscode-test-resources -n",
         "test:ui:install": "cd packages/amazonq && npm run package 2>&1 | grep -o 'VSIX Version: [^ ]*' | cut -d' ' -f3 | xargs -I{} bash -c 'cd ../../ && ./node_modules/.bin/extest install-vsix -f amazon-q-vscode-{}.vsix -e packages/amazonq/test/e2e/amazonq/resources -s ~/.vscode-test-resources'",
-        "test:ui:run": "npm run testCompile && ./node_modules/.bin/extest run-tests -s ~/.vscode-test-resources -e packages/amazonq/test/e2e/amazonq/resources packages/amazonq/dist/test/e2e/amazonq/VET.test.js",
+        "test:ui:run": "npm run testCompile && ./node_modules/.bin/extest run-tests -s ~/.vscode-test-resources -e packages/amazonq/test/e2e/amazonq/resources packages/amazonq/dist/test/e2e_new/amazonq/tests/chat.test.js packages/amazonq/dist/test/e2e_new/amazonq/tests/pinContext.test.js packages/amazonq/dist/test/e2e_new/amazonq/tests/quickActions.test.js",
         "test:ui": "npm run test:ui:prepare && npm run test:ui:install && npm run test:ui:run",
         "testInteg": "npm run testInteg -w packages/ --if-present",
         "package": "npm run package -w packages/toolkit -w packages/amazonq",
@@ -83,6 +83,7 @@
     },
     "dependencies": {
         "@types/node": "^22.7.5",
+        "@types/selenium-webdriver": "^4.1.28",
         "buffer": "^6.0.3",
         "jaro-winkler": "^0.2.8",
         "mocha": "^11.7.1",

package.json

@@ -1420,5 +1420,8 @@
     "engines": {
         "npm": "^10.1.0",
         "vscode": "^1.83.0"
+    },
+    "devDependencies": {
+        "@types/chai": "^5.2.2"
     }
 }

packages/amazonq/package.json

@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import '../utils/setup'
+import { Workbench, EditorView, InputBox, TextEditor, WebviewView, Key } from 'vscode-extension-tester'
+import { testContext } from '../utils/testContext'
+import { sleep, expect } from '../utils/generalUtils'
+
+function pressShortcut(element: any, key: string, platform: 'mac' | 'windows', modifier: 'cmd' | 'alt' = 'cmd') {
+    const modifierKey = modifier === 'cmd' ? (platform === 'mac' ? Key.META : Key.CONTROL) : Key.ALT
+    return element.sendKeys(modifierKey, key)
+}
+
+describe('Amazon Q Inline Completion / Chat Functionality', function () {
+    // this timeout is the general timeout for the entire test suite
+    this.timeout(150000)
+    let workbench: Workbench
+    let editorView: EditorView
+    let textEditor: TextEditor
+    let webviewView: WebviewView
+
+    before(async function () {
+        webviewView = testContext.webviewView
+        await webviewView.switchBack()
+        workbench = testContext.workbench
+
+        await workbench.executeCommand('Create: New File...')
+        await (await InputBox.create()).selectQuickPick('Text File')
+        await sleep(1000)
+        editorView = new EditorView()
+        testContext.editorView = editorView
+        textEditor = (await editorView.openEditor('Untitled-1')) as TextEditor
+        // or if the file we want is currently opened we can simply do
+        // editor = new TextEditor();
+    })
+
+    after(async function () {
+        // cleanup, delete the file contents and close the editor
+        await textEditor.clearText()
+        await editorView.closeAllEditors()
+
+        // after, in order to not affect the other tests, we must switch back to the webview
+        await webviewView.switchToFrame()
+    })
+
+    it('Inline Test', async () => {
+        // the file is currently empty, lets write something in it
+        // note the coordinates are (1, 1) for the beginning of the file
+        await textEditor.typeTextAt(1, 1, 'hello')
+
+        // now we can check if the text is correct
+        const text = await textEditor.getText()
+        expect(text).equals('hello')
+
+        // we can also replace all the text with whatever we want
+        await textEditor.setText(`line1\nline2\nline3`)
+        // assert how many lines there are now
+        expect(await textEditor.getNumberOfLines()).equals(3)
+
+        // get text at the line with given number
+        const line = await textEditor.getTextAtLine(2)
+        expect(line).include('line2')
+
+        // get the line number of a search string
+        const lineNum = await textEditor.getLineOfText('3')
+        expect(lineNum).equals(3)
+
+        // the editor should be dirty since we haven't saved yet
+        expect(await textEditor.isDirty()).is.true
+    })
+})

packages/amazonq/test/e2e_new/amazonq/tests/inline.test.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { By, WebviewView, WebElement } from 'vscode-extension-tester'
-import { until } from 'selenium-webdriver'
+import { until, WebDriver, Key } from 'selenium-webdriver'
 
 /**
  * General sleep function to wait for a specified amount of time
@@ -13,6 +13,30 @@ export async function sleep(timeout: number) {
     await new Promise((resolve) => setTimeout(resolve, timeout))
 }
 
+/**
+ * Expect
+ * @param timeout Time in miliseconds
+ */
+export const expect = (actual: any) => ({
+    equals: (expected: any) => {
+        if (actual !== expected) {
+            throw new Error(`Expected ${expected}, got ${actual}`)
+        }
+    },
+    include: (expected: any) => {
+        if (!actual.includes(expected)) {
+            throw new Error(`Expected "${actual}" to include "${expected}"`)
+        }
+    },
+    is: {
+        true: () => {
+            if (actual !== true) {
+                throw new Error(`Expected true, got ${actual}`)
+            }
+        },
+    },
+})
+
 /**
  * Waits for an element to be located, if there are multiple elements with the same locator it will just return the first one
  * @param webview The WebviewView instance
@@ -39,6 +63,69 @@ export async function waitForElements(webview: WebviewView, locator: By, timeout
     return await webview.findWebElements(locator)
 }
 
+/**
+ * Presses a single key globally
+ * @param driver The WebDriver instance
+ * @param key The key to press
+ */
+export async function pressKey(driver: WebDriver, key: string): Promise<void> {
+    await driver.actions().sendKeys(key).perform()
+}
+
+type OSType = 'windows' | 'mac'
+type modifierKey = 'alt' | 'ctrl' | 'shift' | 'option' | 'command'
+
+const MODIFIERKEYS: Record<OSType, Record<modifierKey, string>> = {
+    windows: {
+        alt: Key.ALT,
+        ctrl: Key.CONTROL,
+        shift: Key.SHIFT,
+        option: Key.ALT,
+        command: Key.COMMAND,
+    },
+    mac: {
+        alt: Key.ALT,
+        ctrl: Key.CONTROL,
+        shift: Key.SHIFT,
+        option: Key.ALT,
+        command: Key.COMMAND,
+    },
+}
+
+/**
+ * Presses a keyboard shortcut with modifier keys
+ * @param driver The WebDriver instance
+ * @param key The key to press
+ * @param modifier The modifier key(s)
+ * @param osType The operating system type
+ */
+export async function pressShortcut(
+    driver: WebDriver,
+    key: string,
+    modifier: modifierKey | modifierKey[],
+    osType: OSType = 'windows'
+): Promise<void> {
+    const actions = driver.actions({ bridge: true })
+
+    try {
+        const modifiers = Array.isArray(modifier) ? modifier : modifier ? [modifier] : []
+        for (const mod of modifiers) {
+            if (!(mod in MODIFIERKEYS[osType])) {
+                throw new Error(`Invalid modifier key '${mod}' for ${osType}`)
+            }
+            actions.keyDown(MODIFIERKEYS[osType][mod])
+        }
+        actions.sendKeys(key)
+        for (const mod of modifiers.reverse()) {
+            actions.keyUp(MODIFIERKEYS[osType][mod])
+        }
+        await actions.perform()
+    } catch (error) {
+        console.error(`Error performing keyboard shortcut: ${error}`)
+        throw error
+    }
+}
+
 /**
  * Writes text to the chat input and optionally sends it
  * @param prompt The text to write in the chat input

packages/amazonq/test/e2e_new/amazonq/utils/generalUtils.ts

@@ -2,11 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Workbench, WebviewView } from 'vscode-extension-tester'
+import { Workbench, WebviewView, EditorView } from 'vscode-extension-tester'
 
 export interface TestContext {
     workbench: Workbench
     webviewView: WebviewView
+    editorView: EditorView
 }
 
 export const testContext = new Proxy<TestContext>({} as TestContext, {
@@ -24,7 +25,8 @@ export const testContext = new Proxy<TestContext>({} as TestContext, {
     },
 })
 
-export function initializeTestContext(workbench: Workbench, webviewView: WebviewView): void {
+export function initializeTestContext(workbench: Workbench, webviewView: WebviewView, editorView: EditorView): void {
     testContext.workbench = workbench
     testContext.webviewView = webviewView
+    testContext.editorView = editorView
 }