chore: run tests from toolkit/ instead of core/

Author: hayemaxi

packages/core/package.json

@@ -5,5 +5,11 @@
 
 import { runToolkitTests } from './launchTestUtilities'
 void (async () => {
-    await runToolkitTests('integration', 'dist/src/testInteg/index.js')
+    const relativeEntrypoint = process.argv[2]
+    if (!relativeEntrypoint) {
+        throw new Error('A path relative to core is required')
+    }
+
+    const relativeWorkspaceFolder = process.argv[3]
+    await runToolkitTests('integration', relativeEntrypoint, relativeWorkspaceFolder)
 })()

packages/core/scripts/test/testInteg.ts

@@ -5,5 +5,8 @@
 
 import { runToolkitTests } from './launchTestUtilities'
 void (async () => {
-    await runToolkitTests('web', 'dist/src/testWeb/testRunnerWebCore.js')
+    const relativeWorkspaceFolder = process.argv[2]
+
+    // Should be executed from a subproject/extension
+    await runToolkitTests('web', '../core/dist/src/testWeb/testRunnerWebCore.js', relativeWorkspaceFolder)
 })()

packages/core/scripts/test/testWeb.ts

@@ -26,7 +26,7 @@ const notInitialized = 'notInitialized'
 
 function _isAmazonQ() {
     const id = globals.context.extension.id
-    const isToolkit = id === VSCODE_EXTENSION_ID.awstoolkit || id === VSCODE_EXTENSION_ID.awstoolkitcore
+    const isToolkit = id === VSCODE_EXTENSION_ID.awstoolkit
     const isQ = id === VSCODE_EXTENSION_ID.amazonq
     if (!isToolkit && !isQ) {
         throw Error(`unexpected extension id: ${id}`) // sanity check

packages/core/src/shared/extensionUtilities.ts

@@ -15,7 +15,6 @@ import { UriHandler } from './vscode/uriHandler'
 export const VSCODE_EXTENSION_ID = {
     awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
     amazonq: 'amazonwebservices.amazon-q-vscode',
-    awstoolkitcore: 'amazonwebservices.aws-core-vscode', // Core "extension" for tests - not a real extension.
     python: 'ms-python.python',
     // python depends on jupyter plugin
     jupyter: 'ms-toolsai.jupyter',

packages/core/src/shared/extensions.ts

@@ -18,8 +18,8 @@ describe('vscodeUtils', async function () {
 
         assert.deepStrictEqual(vscodeUtil.isExtensionActive('invalid.extension'), false)
 
-        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID.awstoolkitcore, false)
-        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID.awstoolkitcore), true)
+        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false)
+        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit), true)
     })
 
     it('globDirPatterns()', async function () {

packages/core/src/test/shared/utilities/vscodeUtils.test.ts

@@ -22,7 +22,7 @@ process.env.TZ = 'US/Pacific'
 export async function runTests(
     testFolder: string,
     initTests: string[] = [],
-    extensionId: string = VSCODE_EXTENSION_ID.awstoolkitcore,
+    extensionId: string = VSCODE_EXTENSION_ID.awstoolkit,
     testFiles?: string[]
 ): Promise<void> {
     if (!process.env['AWS_TOOLKIT_AUTOMATION']) {
@@ -36,6 +36,9 @@ export async function runTests(
         }
 
         /**
+         * Retaining this because it may be relevant in the future for lib-only tests. For now,
+         * all tests are ran from a subproject/extension.
+         *
          * Node's `require` caches modules by case-sensitive paths, regardless of the underlying
          * file system. This is normally not a problem, but VS Code also happens to normalize paths
          * on Windows to use lowercase drive letters when using its bootstrap loader. This means
@@ -59,12 +62,7 @@ export async function runTests(
          * lower case module ids (since the tests live inside of core itself)
          */
         const [drive, ...rest] = abs.split(':')
-        return rest.length === 0
-            ? abs
-            : [
-                  extensionId === VSCODE_EXTENSION_ID.awstoolkitcore ? drive.toLowerCase() : drive.toUpperCase(),
-                  ...rest,
-              ].join(':')
+        return rest.length === 0 ? abs : [drive.toUpperCase(), ...rest].join(':')
     }
 
     const root = getRoot()
@@ -115,7 +113,7 @@ export async function runTests(
     })
 
     function runMocha(files: string[]): Promise<void> {
-        files.forEach((f) => mocha.addFile(path.resolve(dist, f)))
+        files.forEach((f) => mocha.addFile(path.resolve(process.cwd(), f)))
         return new Promise<void>((resolve, reject) => {
             mocha.run((failures) => {
                 if (failures > 0) {
@@ -139,7 +137,8 @@ export async function runTests(
             console.log('No test coverage found')
         }
     }
-    const files = testFiles ?? (await glob(testFilePath ?? `**/${testFolder}/**/**.test.js`, { cwd: dist }))
+    const files = testFiles ?? (await glob(testFilePath ?? `**/${testFolder}/**/**.test.js`))
+    console.log(`@@@ files: ${files}`)
 
     await runMocha(files)
     await writeCoverage()

packages/core/src/test/testRunner.ts

@@ -373,7 +373,7 @@ export async function closeAllEditors(): Promise<void> {
     //  - `vscode.OutputChannel` name prefixed with "extension-output". https://github.com/microsoft/vscode/issues/148993#issuecomment-1167654358
     //  - `vscode.LogOutputChannel` name (created with `vscode.window.createOutputChannel(…,{log:true})`
     // Maybe we can close these with a command?
-    const ignorePatterns = [/extension-output/, /tasks/, /amazonwebservices\.aws-core-vscode\./]
+    const ignorePatterns = [/extension-output/, /tasks/, /nullExtensionDescription\./] // TODO: nullExtensionDescription may have side effects?
     const editors: vscode.TextEditor[] = []
 
     const noVisibleEditor: boolean | undefined = await waitUntil(

packages/core/src/test/testUtil.ts

@@ -46,7 +46,7 @@ function gatherTestFiles() {
  * So this function ensures the extension has fully activated.
  */
 async function activateToolkitExtension() {
-    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkitcore)?.activate()
+    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)?.activate()
 }
 
 function runMochaTests(resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) {

packages/core/src/testWeb/testRunner.ts

@@ -63,6 +63,14 @@
         "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
         "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE quickStart*",
         "compile": "npm run clean && npm run buildScripts && webpack",
+        "compileOnly": "tsc -p ./",
+        "compileDev": "npm run compile -- --mode development",
+        "testCompile": "npm run compileCore && npm run clean && npm run buildScripts && npm run compileOnly",
+        "compileCore": "cd ../core && npm run compile",
+        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/test.ts dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testInteg": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/testInteg.ts dist/test/integ/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/testE2E.ts dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/testWeb.ts ../core/dist/src/testFixtures/workspaceFolder",
         "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",
         "webCompile": "npm run clean && npm run buildScripts && webpack --config-name web",
         "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",