inline completion test done

Author: laura-codess

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

@@ -5,12 +5,7 @@
 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)
-}
+import { sleep, expect, pressKey, createNewTextFile } from '../utils/generalUtils'
 
 describe('Amazon Q Inline Completion / Chat Functionality', function () {
     // this timeout is the general timeout for the entire test suite
@@ -25,48 +20,33 @@ describe('Amazon Q Inline Completion / Chat Functionality', function () {
         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()
+        textEditor = await createNewTextFile(workbench, editorView)
     })
 
-    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')
+    // after(async function () {
+    //     await editorView.closeAllEditors()
+    // })
 
-        // now we can check if the text is correct
+    it('Inline Test', async () => {
+        await textEditor.typeTextAt(1, 1, 'Select Me')
         const text = await textEditor.getText()
-        expect(text).equals('hello')
+        expect(text).equals('Select Me')
+        await textEditor.clearText()
 
+        await workbench.executeCommand('Amazon Q: Inline Chat')
+        const input = new InputBox()
+        await input.sendKeys('Write a simple sentece')
+        await input.sendKeys(Key.ENTER)
+        await sleep(5000)
+        const driver = textEditor.getDriver()
+        await pressKey(driver, 'Enter')
+        await sleep(3000)
+        await pressKey(driver, 'Tab')
         // 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
+        await sleep(3000)
+        // await textEditor.clear()
     })
 })

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

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { By, WebviewView, WebElement } from 'vscode-extension-tester'
+import { By, WebviewView, WebElement, EditorView, InputBox, Workbench, TextEditor } from 'vscode-extension-tester'
 import { until, WebDriver, Key } from 'selenium-webdriver'
 
 /**
@@ -191,6 +191,19 @@ export async function clearChat(webview: WebviewView): Promise<boolean> {
     }
 }
 
+/**
+ * Creates a new text file and returns the editor
+ * @param workbench The Workbench instance
+ * @returns Promise<TextEditor> The text editor for the new file
+ */
+export async function createNewTextFile(workbench: Workbench, editorView: EditorView): Promise<TextEditor> {
+    await workbench.executeCommand('Create: New File...')
+    await (await InputBox.create()).selectQuickPick('Text File')
+    await sleep(1000)
+    const textEditor = (await editorView.openEditor('Untitled-1')) as TextEditor
+    return textEditor
+}
+
 /**
  * Finds an item based on the text
  * @param items WebElement array to search