Revert "Switch to vscodetestcover for running extension tests (#5458)" (#5487)

This reverts commit dbac187b44.

extensions/admin-tool-ext-win/.gitignore

@@ -1,3 +1,2 @@
-coverage
 ssmsmin
 *.vsix

extensions/admin-tool-ext-win/.vscodeignore

@@ -1,7 +1,5 @@
-coverage/**
 out/test/**
 src/**
 .gitignore
-coverageConfig.json
 tsconfig.json
 InstallSsmsMin.bat

extensions/admin-tool-ext-win/coverageConfig.json

@@ -1,17 +0,0 @@
-{
-	"enabled": true,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/admin-tool-ext-win/package.json

@@ -69,6 +69,6 @@
 		"vscode-nls": "^3.2.1"
 	},
 	"devDependencies": {
-		"vscodetestcover": "^1.0.2"
+		"vscode": "1.0.1"
 	}
 }

extensions/admin-tool-ext-win/src/test/index.ts

@@ -4,23 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Database Admin Tool Extensions for Windows';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
 	timeout: 600000
 };
 
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -29,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/agent/.gitignore

@@ -1,2 +1 @@
-coverage
 *.vsix

extensions/agent/.vscodeignore

@@ -1,5 +1,3 @@
-coverage/**
 src/**
 out/test/**
-coverageConfig.json
 tsconfig.json

extensions/agent/coverageConfig.json

@@ -1,17 +0,0 @@
-{
-	"enabled": true,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/agent/package.json

@@ -52,7 +52,7 @@
 		"mocha": "^5.2.0",
 		"should": "^13.2.1",
 		"typemoq": "^2.1.0",
-		"vscodetestcover": "^1.0.2"
+		"vscode": "1.1.5"
 	},
 	"__metadata": {
 		"id": "10",

extensions/agent/src/test/index.ts

@@ -4,23 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Agent Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
 	timeout: 600000
 };
 
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -29,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/azurecore/.gitignore

@@ -1,2 +0,0 @@
-coverage
-*.vsix

extensions/azurecore/.vscodeignore

@@ -1,7 +1,5 @@
-coverage/**
 src/**
 out/**
-coverageConfig.json
 tsconfig.json
 extension.webpack.config.js
 yarn.lock

extensions/azurecore/coverageConfig.json

@@ -1,17 +0,0 @@
-{
-	"enabled": false,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/azurecore/package.json

@@ -170,6 +170,6 @@
 		"mocha": "^5.2.0",
 		"should": "^13.2.1",
 		"typemoq": "^2.1.0",
-		"vscodetestcover": "^1.0.2"
+		"vscode": "1.1.26"
 	}
 }

extensions/azurecore/src/test/index.ts

@@ -4,24 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Integration Azure Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
 	timeout: 60000
 };
 
-// Coverage is currently disabled - the coverage runner isn't currently able to correctly parse es2018 javascript
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -30,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/cms/.gitignore

@@ -1,2 +1 @@
-coverage
 *.vsix

extensions/cms/.vscodeignore

@@ -1,5 +1,3 @@
-coverage/**
 out/test/**
 src/**
-coverageConfig.json
 tsconfig.json

extensions/cms/coverageConfig.json

@@ -1,17 +0,0 @@
-{
-	"enabled": true,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/cms/package.json

@@ -640,7 +640,7 @@
 		"@types/node": "^8.0.24",
 		"mocha": "^5.2.0",
 		"should": "^13.2.1",
-		"vscodetestcover": "^1.0.2",
+		"vscode": "^1.1.26",
 		"typemoq": "^2.1.0"
 	}
 }

extensions/cms/src/test/index.ts

@@ -4,23 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'CMS Unit Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
 	timeout: 60000
 };
 
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -29,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/integration-tests/coverageConfig.json

@@ -1,17 +0,0 @@
-{
-	"enabled": true,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/integration-tests/package.json

@@ -52,9 +52,8 @@
     "@types/node": "7.0.43",
     "@types/chai": "3.4.34",
     "mocha-junit-reporter": "^1.17.0",
-	"mocha-multi-reporters": "^1.1.7",
+    "mocha-multi-reporters": "^1.1.7",
-	"vscode":"^1.1.5",
+    "vscode": "1.1.5",
-	"vscodetestcover": "^1.0.2",
     "chai": "3.5.0"
   },
   "dependencies": {

extensions/integration-tests/src/index.ts

@@ -6,23 +6,19 @@ import * as vscode from 'vscode';
 import { context } from './testContext';
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Integration Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'tdd',
 	useColors: true,
 	timeout: 600000
 };
 
-const coverageConfig: any = {
-	coverConfig: '../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -35,6 +31,6 @@ if (!vscode.workspace.getConfiguration('test')['testSetupCompleted']) {
 	context.RunTest = false;
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/notebook/.gitignore

@@ -1,2 +1 @@
-coverage/**
 jupyter_config/**

extensions/notebook/.vscodeignore

@@ -1,8 +1,6 @@
-coverage/**
 jupyter_config/**
 src/**
 out/**
-coverageConfig.json
 tsconfig.json
 extension.webpack.config.js
 yarn.lock

extensions/notebook/coverageConfig.json

@@ -1,18 +0,0 @@
-{
-	"enabled": false,
-	"relativeSourcePath": "..",
-	"relativeCoverageDir": "../../coverage",
-	"ignorePatterns": [
-		"**/node_modules/**",
-		"**/test/**"
-	],
-	"includePid": false,
-	"reports": [
-		"cobertura"
-	],
-	"verbose": false,
-	"remapOptions": {
-		"basePath": ".",
-		"useAbsolutePaths": true
-	}
-}

extensions/notebook/package.json

@@ -349,7 +349,7 @@
 		"mocha-junit-reporter": "^1.17.0",
 		"mocha-multi-reporters": "^1.1.7",
 		"typemoq": "^2.1.0",
-		"vscodetestcover": "^1.0.2"
+		"vscode": "1.1.5"
 	},
 	"enableProposedApi": true
 }

extensions/notebook/src/integrationTest/index.ts

@@ -4,23 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Notebook Extension Integration Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
 	timeout: 600000
 };
 
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
-};
-
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -29,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/notebook/src/test/index.ts

@@ -4,24 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 const path = require('path');
-import * as testRunner from 'vscodetestcover';
+const testRunner = require('vscode/lib/testrunner');
 
 const suite = 'Notebook Tests';
 
-const testOptions: any = {
+const options: any = {
 	ui: 'bdd',
 	useColors: true,
-	timeout: 600000,
+	timeout: 600000
-};
-
-// Coverage is currently disabled - the coverage runner isn't currently able to correctly parse es2018 javascript
-const coverageConfig: any = {
-	coverConfig: '../../coverageConfig.json'
 };
 
 if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
-	testOptions.reporter = 'mocha-multi-reporters';
+	options.reporter = 'mocha-multi-reporters';
-	testOptions.reporterOptions = {
+	options.reporterOptions = {
 		reporterEnabled: 'spec, mocha-junit-reporter',
 		mochaJunitReporterReporterOptions: {
 			testsuitesTitle: `${suite} ${process.platform}`,
@@ -30,6 +25,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
 	};
 }
 
-testRunner.configure(testOptions, coverageConfig);
+testRunner.configure(options);
 
 export = testRunner;

extensions/profiler/package.json

@@ -79,6 +79,7 @@
 		"vscode-nls": "^3.2.1"
 	},
 	"devDependencies": {
+		"vscode": "1.0.1"
 	},
 	"__metadata": {
 		"id": "18",

scripts/test-extensions-unit.bat

@@ -12,7 +12,6 @@ echo %VSCODEEXTENSIONSDIR%
 
 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\admin-tool-ext-win --extensionTestsPath=%~dp0\..\extensions\admin-tool-ext-win\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --disableExtensions --remote-debugging-port=9222
 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\agent --extensionTestsPath=%~dp0\..\extensions\agent\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222
-call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\azurecore --extensionTestsPath=%~dp0\..\extensions\azurecore\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --disableExtensions --remote-debugging-port=9222
 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\cms --extensionTestsPath=%~dp0\..\extensions\cms\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222
 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\dacpac --extensionTestsPath=%~dp0\..\extensions\dacpac\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222
 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\notebook --extensionTestsPath=%~dp0\..\extensions\notebook\out\test --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222

scripts/test-extensions-unit.sh

@@ -20,7 +20,6 @@ echo $VSCODEEXTDIR
 
 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/admin-tool-ext-win --extensionTestsPath=$ROOT/extensions/admin-tool-ext-win/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR
 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/agent --extensionTestsPath=$ROOT/extensions/agent/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR
-./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/azurecore --extensionTestsPath=$ROOT/extensions/azurecore/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR
 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/cms --extensionTestsPath=$ROOT/extensions/cms/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR
 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/dacpac --extensionTestsPath=$ROOT/extensions/dacpac/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR
 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/test --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR