Merge #3460 rename integrationTest/ => testInteg/

Author: justinmk3

.nycrc.json

@@ -1,5 +1,5 @@
 {
     "all": true,
     "include": ["src/**", "dist/src/**"],
-    "exclude": ["test/**", "integrationTest/**", "testFixtures/**"]
+    "exclude": ["test/**", "testE2E/**", "testLint/**", "testInteg/**", "testFixtures/**"]
 }

.vscode/launch.json

@@ -93,7 +93,7 @@
             "args": [
                 "${workspaceFolder}/dist/src/testFixtures/workspaceFolder",
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/integrationTest/index.js"
+                "--extensionTestsPath=${workspaceFolder}/dist/src/testInteg/index.js"
             ],
             "env": {
                 "DEVELOPMENT_PATH": "${workspaceFolder}",
@@ -110,7 +110,7 @@
             "args": [
                 "${workspaceFolder}/dist/src/testFixtures/workspaceFolder",
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/integrationTest/index.js"
+                "--extensionTestsPath=${workspaceFolder}/dist/src/testInteg/index.js"
             ],
             "env": {
                 "TEST_FILE": "${relativeFile}",

CONTRIBUTING.md

@@ -127,7 +127,7 @@ You can run tests directly from Visual Studio Code:
 You can also run tests from the command line:
 
     npm run test
-    npm run integrationTest
+    npm run testInteg
 
 Tests will write logs to `./.test-reports/testLog.log`.
 

buildspec/linuxIntegrationTests.yml

@@ -68,7 +68,7 @@ phases:
     build:
         commands:
             - npm ci --unsafe-perm
-            - xvfb-run npm run integrationTest
+            - xvfb-run npm run testInteg
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

docs/TESTPLAN.md

@@ -33,7 +33,7 @@ The test suite has the following categories of tests:
     -   Any type of test related to the format/quality/content of the code
     -   Does not have context of the `vscode` api
 -   Integration Tests: **slow** tests
-    -   Live in `src/integrationTest/`
+    -   Live in `src/testInteg/`
     -   Use a full instance of VSCode with an activated instance of the extension.
     -   Global state is shared across tests, thus there is a risk that later tests are polluted by earlier tests.
     -   Trigger VSCode commands and UI elements to test codepaths as from an actual user session, instead of invoking functions directly.
@@ -48,7 +48,7 @@ The test suite has the following categories of tests:
     -   `src/test/globalSetup.test.ts` :
         -   defines global setup functions run before and after each test
         -   defines global utility functions such as `getTestLogger()`
--   `src/integrationTest/` : integration tests
+-   `src/testInteg/` : integration tests
 -   `src/test/testRunner.ts` : used by _both_ the unit tests and integration
     tests to discover tests, setup the test framework, and run tests.
 -   `src/testFixtures/` : test data (sample projects, SAM templates, ...)

package.json

@@ -3443,7 +3443,7 @@
         "testCompile": "npm run buildScripts && tsc -p ./ && npm run instrument",
         "test": "npm run testCompile && ts-node ./scripts/test/test.ts && npm run report",
         "testE2E": "npm run testCompile && ts-node ./scripts/test/testE2E.ts && npm run report",
-        "integrationTest": "npm run testCompile && ts-node ./scripts/test/integrationTest.ts && npm run report",
+        "testInteg": "npm run testCompile && ts-node ./scripts/test/testInteg.ts && npm run report",
         "lint": "ts-node ./scripts/lint/testLint.ts",
         "lintfix": "eslint -c .eslintrc.js --fix --ext .ts .",
         "package": "ts-node ./scripts/build/package.ts",

scripts/test/integrationTest.ts renamed to scripts/test/testInteg.ts

@@ -6,5 +6,5 @@
 import { resolve } from 'path'
 import { integrationSuite, runToolkitTests } from './launchTestUtilities'
 ;(async () => {
-    await runToolkitTests(integrationSuite, resolve('dist', 'src', 'integrationTest', 'index.js'))
+    await runToolkitTests(integrationSuite, resolve('dist', 'src', 'testInteg', 'index.js'))
 })()

src/test/cdk/explorer/appNode.test.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode'
 import * as app from '../../../cdk/explorer/cdkProject'
 import * as appNode from '../../../cdk/explorer/nodes/appNode'
 import { ConstructNode } from '../../../cdk/explorer/nodes/constructNode'
-import { getTestWorkspaceFolder } from '../../../integrationTest/integrationTestsUtilities'
+import { getTestWorkspaceFolder } from '../../../testInteg/integrationTestsUtilities'
 import { getIcon } from '../../../shared/icons'
 import * as treeUtils from '../treeTestUtils'
 import { getLabel } from '../../../shared/treeview/utils'

src/test/codewhisperer/commands/startSecurityScan.test.ts

@@ -12,7 +12,7 @@ import * as startSecurityScan from '../../../codewhisperer/commands/startSecurit
 import { SecurityPanelViewProvider } from '../../../codewhisperer/views/securityPanelViewProvider'
 import { FakeExtensionContext } from '../../fakeExtensionContext'
 import * as diagnosticsProvider from '../../../codewhisperer/service/diagnosticsProvider'
-import { getTestWorkspaceFolder } from '../../../integrationTest/integrationTestsUtilities'
+import { getTestWorkspaceFolder } from '../../../testInteg/integrationTestsUtilities'
 import { join } from 'path'
 import { closeAllEditors } from '../../testUtil'
 import { stub } from '../../utilities/stubber'

src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import * as fs from 'fs'
 import { JavaDependencyGraph } from '../../../../codewhisperer/util/dependencyGraph/javaDependencyGraph'
-import { getTestWorkspaceFolder } from '../../../../integrationTest/integrationTestsUtilities'
+import { getTestWorkspaceFolder } from '../../../../testInteg/integrationTestsUtilities'
 import { join } from 'path'
 import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'