Add integration-test code coverage (#10632)

* wip

* Update to latest vscodetestcover and add tests back in

* Update to latest version of vscodetestcover

* updates

* another yarn.lock

* update version

* Revert import path change

extensions/integration-tests/src/test/index.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as testRunner from 'vscodetestcover';
+
+const suite = 'Extension Integration Tests';
+
+const mochaOptions: any = {
+	ui: 'tdd',
+	useColors: true,
+	timeout: 60000
+};
+
+// set relevant mocha options from the environment
+if (process.env.ADS_TEST_GREP) {
+	mochaOptions.grep = process.env.ADS_TEST_GREP;
+	console.log(`setting options.grep to: ${mochaOptions.grep}`);
+}
+if (process.env.ADS_TEST_INVERT_GREP) {
+	mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
+	console.log(`setting options.invert to: ${mochaOptions.invert}`);
+}
+if (process.env.ADS_TEST_TIMEOUT) {
+	mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
+	console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
+}
+if (process.env.ADS_TEST_RETRIES) {
+	mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
+	console.log(`setting options.retries to: ${mochaOptions.retries}`);
+}
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	mochaOptions.reporter = 'mocha-multi-reporters';
+	mochaOptions.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
+
+export = testRunner;

extensions/integration-tests/src/tests/index.ts

@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as testRunner from 'vscode/lib/testrunner';
-import * as path from 'path';
-
-const suite = 'Extension Integration Tests';
-
-const options: any = {
-	ui: 'tdd',
-	useColors: true,
-	timeout: 600000
-};
-
-// set relevant mocha options from the environment
-if (process.env.ADS_TEST_GREP) {
-	options.grep = process.env.ADS_TEST_GREP;
-	console.log(`setting options.grep to: ${options.grep}`);
-}
-if (process.env.ADS_TEST_INVERT_GREP) {
-	const value = parseInt(process.env.ADS_TEST_INVERT_GREP);
-	options.invert = Boolean(value);
-	console.log(`setting options.invert to: ${options.invert}`);
-}
-if (process.env.ADS_TEST_TIMEOUT) {
-	options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
-	console.log(`setting options.timeout to: ${options.timeout}`);
-}
-if (process.env.ADS_TEST_RETRIES) {
-	options.retries = parseInt(process.env.ADS_TEST_RETRIES);
-	console.log(`setting options.retries to: ${options.retries}`);
-}
-
-if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	console.log(`environment variable BUILD_ARTIFACTSTAGINGDIRECTORY is set to ${process.env.BUILD_ARTIFACTSTAGINGDIRECTORY} so configuring multiple reporters for test results.\n For this to work the ${process.env.BUILD_ARTIFACTSTAGINGDIRECTORY} must be fully qualified directory and must exist`);
-	options.reporter = 'mocha-multi-reporters';
-	options.reporterOptions = {
-		reporterEnabled: 'spec, mocha-junit-reporter',
-		mochaJunitReporterReporterOptions: {
-			testsuitesTitle: `${suite} Tests ${process.platform}`,
-			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
-		}
-	};
-}
-
-testRunner.configure(options);
-
-export = testRunner;

extensions/integration-tests/src/typings/ref.d.ts

@@ -5,4 +5,5 @@
 /// <reference path='../../../../src/sql/azdata.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference path='../../../../src/sql/azdata.test.d.ts'/>
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference types='@types/node'/>