consolidate test scripts

Author: hayemaxi

packages/amazonq/package.json

@@ -57,8 +57,8 @@
         "lint": "true",
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
         "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
-        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/test.ts dist/test/unit/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",
+        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
         "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
         "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",
         "serve": "webpack serve --config-name mainServe --mode development",

packages/core/package.json

@@ -2,12 +2,30 @@
     "name": "aws-core-vscode",
     "description": "Core library used AWS IDE extensions for VSCode.",
     "version": "1.0.0",
+    "extensionKind": [
+        "workspace"
+    ],
     "publisher": "amazonwebservices",
     "license": "Apache-2.0",
     "engines": {
         "npm": "^10.1.0",
         "vscode": "^1.68.0"
     },
+    "activationEvents": [
+        "onStartupFinished",
+        "onUri",
+        "onDebugResolve:aws-sam",
+        "onDebugInitialConfigurations",
+        "onLanguage:javascript",
+        "onLanguage:java",
+        "onLanguage:python",
+        "onLanguage:csharp",
+        "onLanguage:yaml",
+        "onFileSystem:s3",
+        "onFileSystem:s3-readonly"
+    ],
+    "main": "./dist/src/extensionNode.js",
+    "browser": "./dist/src/extensionWebCore.js",
     "exports": {
         ".": "./dist/src/extension.js",
         "./node": "./dist/src/extensionNode.js",

packages/core/scripts/test/launchTest.ts

@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This script is used to run unit tests from an npm script defined in package.json.
+ * TODO: Generalize and use named args system from root/scripts/package.ts
+ *
+ * Usage:
+ * node ./test/runToolkitTests.js <suite_name> <relative path to entrypoint> <relative path to workspace folder>
+ *
+ * where:
+ * - suite_name, e.g. 'unit', 'integration', 'e2e'
+ * - relative path to entrypoint: test entry point file built in .js, e.g. 'amazonq/dist/test/unit/index.js'
+ * - relative path to workspace folder: folder to open the test VSC instance in (optional)
+ *
+ * See examples in any subproject's package.json `test` scripts.
+ */
+
+import 'source-map-support/register'
+
+import { runToolkitTests, SuiteName } from './launchTestUtilities'
+void (async () => {
+    const suiteName = process.argv[2] as SuiteName
+    if (!suiteName) {
+        throw new Error('A test suite name is required.')
+    }
+
+    const relativeEntrypoint = process.argv[3]
+    if (!relativeEntrypoint) {
+        throw new Error('A path relative to core is required.')
+    }
+
+    const relativeWorkspaceFolder = process.argv[4]
+    await runToolkitTests(suiteName, relativeEntrypoint, relativeWorkspaceFolder)
+})()

packages/core/scripts/test/launchTestUtilities.ts

@@ -18,7 +18,8 @@ const minimum = 'minimum'
 
 const disableWorkspaceTrust = '--disable-workspace-trust'
 
-type SuiteName = 'integration' | 'e2e' | 'unit' | 'web'
+const suiteNames = ['integration', 'e2e', 'unit', 'web'] as const
+export type SuiteName = (typeof suiteNames)[number]
 
 /**
  * This is the generalized method that is used by different test suites (unit, integration, ...) in CI to
@@ -35,6 +36,10 @@ export async function runToolkitTests(
     env?: Record<string, string>
 ) {
     try {
+        if (!suiteNames.includes(suite)) {
+            throw new Error(`Invalid suite name: '${suite}'. Must be one of: ${suiteNames.join(',')}`)
+        }
+
         console.log(`Running ${suite} test suite...`)
 
         const args = await getVSCodeCliArgs({

packages/core/scripts/test/test.ts

@@ -69,10 +69,10 @@
         "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=. .",
         "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
-        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/test.ts dist/test/unit/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",
-        "testInteg": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/testInteg.ts dist/test/integ/index.js ../core/dist/src/testFixtures/workspaceFolder",
-        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/testWeb.ts dist/test/web/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testInteg": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts integration dist/test/integ/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts web dist/test/web/index.js ../core/dist/src/testFixtures/workspaceFolder",
         "package": "ts-node ../../scripts/package.ts",
         "install-plugin": "vsce package --ignoreFile '../.vscodeignore.packages' -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
         "lint": "true",