ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add coverage for extension tests (#8961)

Browse Source 
* wip

* Add code coverage files to all extensions

* Update vscodetestcover

* Update yarn.lock

* Update CMS yarn.lock

* Update vscodetestcover version
This commit is contained in:
Charles Gagnon
2020-01-28 07:23:45 -08:00
committed by GitHub
parent 136a1d8cee
commit 2dfd75352f
44 changed files with 27989 additions and 4618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/admin-tool-ext-win/.vscodeignore
View File

@@ -1,6 +1,8 @@
out/test/** coverage
src/** out/test
src
.gitignore .gitignore
coverConfig.json
tsconfig.json tsconfig.json
InstallSsmsMin.bat InstallSsmsMin.bat
cgmanifest.json cgmanifest.json

19
extensions/admin-tool-ext-win/coverConfig.json Normal file
View File

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

7
extensions/admin-tool-ext-win/package.json
View File

@@ -75,11 +75,16 @@
"vscode-nls": "^3.2.1" "vscode-nls": "^3.2.1"
}, },
"devDependencies": { "devDependencies": {
"@types/mocha": "^5.2.5",
"@types/node": "^12.11.7", "@types/node": "^12.11.7",
"mocha": "^5.2.0",
"mocha-junit-reporter": "^1.17.0", "mocha-junit-reporter": "^1.17.0",
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.3", "should": "^13.2.3",
"vscode": "^1.1.36" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}, },
"__metadata": { "__metadata": {
"id": "41", "id": "41",

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

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'admin-tool-ext-win Extension Tests'; const suite = 'admin-tool-ext-win Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3682
extensions/admin-tool-ext-win/yarn.lock
View File

File diff suppressed because it is too large Load Diff

6
extensions/agent/.vscodeignore
View File

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

19
extensions/agent/coverConfig.json Normal file
View File

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

5
extensions/agent/package.json
View File

@@ -88,7 +88,10 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.1", "should": "^13.2.1",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"vscode": "^1.1.36" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}, },
"__metadata": { "__metadata": {
"id": "10", "id": "10",

28
extensions/agent/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'agent Extension Tests'; const suite = 'agent Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3665
extensions/agent/yarn.lock
View File

File diff suppressed because it is too large Load Diff

6
extensions/azurecore/.vscodeignore
View File

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

19
extensions/azurecore/coverConfig.json Normal file
View File

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

5
extensions/azurecore/package.json
View File

@@ -193,6 +193,9 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.1", "should": "^13.2.1",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"vscode": "1.1.26" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
} }
} }

28
extensions/azurecore/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'azurecore Extension Tests'; const suite = 'azurecore Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3092
extensions/azurecore/yarn.lock
View File

File diff suppressed because it is too large Load Diff

6
extensions/cms/.vscodeignore
View File

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

19
extensions/cms/coverConfig.json Normal file
View File

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

5
extensions/cms/package.json
View File

@@ -638,9 +638,12 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"should": "^13.2.1", "should": "^13.2.1",
"vscode": "^1.1.26", "vscodetestcover": "github:corivera/vscodetestcover#1.0.4",
"typemoq": "^2.1.0" "typemoq": "^2.1.0"
}, },
"resolutions": {
"esprima": "^4.0.0"
},
"__metadata": { "__metadata": {
"id": "40", "id": "40",
"publisherDisplayName": "Microsoft", "publisherDisplayName": "Microsoft",

28
extensions/cms/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'cms Extension Tests'; const suite = 'cms Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3309
extensions/cms/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5
extensions/dacpac/.vscodeignore
View File

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

19
extensions/dacpac/coverConfig.json Normal file
View File

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

5
extensions/dacpac/package.json
View File

@@ -62,7 +62,10 @@
"mocha-junit-reporter": "^1.17.0", "mocha-junit-reporter": "^1.17.0",
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.1", "should": "^13.2.1",
"vscode": "^1.1.36" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}, },
"__metadata": { "__metadata": {
"id": "33", "id": "33",

28
extensions/dacpac/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'dacpac Extension Tests'; const suite = 'dacpac Extension Tests';
const testOptions: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const testOptions: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
testOptions.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${testOptions.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
testOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${testOptions.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
testOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${testOptions.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
testOptions.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${testOptions.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
testOptions.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
testOptions.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(testOptions); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3656
extensions/dacpac/yarn.lock
View File

File diff suppressed because it is too large Load Diff

10
extensions/machine-learning-services/.vscodeignore
View File

@@ -1,5 +1,7 @@
src/** src
tsconfig.json tsconfig.json
python/** python
r_packages/** r_packages
out/test/** out/test
coverage
coverConfig.json

19
extensions/machine-learning-services/coverConfig.json Normal file
View File

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

5
extensions/machine-learning-services/package.json
View File

@@ -110,6 +110,9 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.1", "should": "^13.2.1",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"vscode": "1.1.26" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
} }
} }

28
extensions/machine-learning-services/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'machine learning Extension Tests'; const suite = 'machine learning Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3196
extensions/machine-learning-services/yarn.lock
View File

File diff suppressed because it is too large Load Diff

8
extensions/notebook/.vscodeignore
View File

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

19
extensions/notebook/coverConfig.json Normal file
View File

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

5
extensions/notebook/package.json
View File

@@ -484,7 +484,10 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.3", "should": "^13.2.3",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"vscode": "1.1.5" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}, },
"enableProposedApi": true "enableProposedApi": true
} }

28
extensions/notebook/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'notebook Extension Tests'; const suite = 'notebook Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3647
extensions/notebook/yarn.lock
View File

File diff suppressed because it is too large Load Diff

19
extensions/resource-deployment/coverConfig.json Normal file
View File

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

725
extensions/resource-deployment/package.json
View File

@@ -1,365 +1,370 @@
{ {
"name": "resource-deployment", "name": "resource-deployment",
"displayName": "%extension-displayName%", "displayName": "%extension-displayName%",
"description": "%extension-description%", "description": "%extension-description%",
"version": "0.0.1", "version": "0.0.1",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
"icon": "images/sqlserver.png", "icon": "images/sqlserver.png",
"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
"engines": { "engines": {
"vscode": "*", "vscode": "*",
"azdata": ">=1.6.0" "azdata": ">=1.6.0"
}, },
"activationEvents": [ "activationEvents": [
"onCommand:azdata.resource.deploy", "onCommand:azdata.resource.deploy",
"onCommand:azdata.openNotebookInputDialog" "onCommand:azdata.openNotebookInputDialog"
], ],
"main": "./out/main", "main": "./out/main",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/Microsoft/azuredatastudio.git" "url": "https://github.com/Microsoft/azuredatastudio.git"
}, },
"extensionDependencies": [ "extensionDependencies": [
"microsoft.mssql", "microsoft.mssql",
"microsoft.notebook" "microsoft.notebook"
], ],
"contributes": { "contributes": {
"configuration": [ "configuration": [
{ {
"title": "%deployment.configuration.title%", "title": "%deployment.configuration.title%",
"properties": { "properties": {
"deployment.azdataInstallLocation": { "deployment.azdataInstallLocation": {
"type": "string", "type": "string",
"description": "%azdata-install-location-description%" "description": "%azdata-install-location-description%"
} }
} }
} }
], ],
"commands": [ "commands": [
{ {
"command": "azdata.resource.deploy", "command": "azdata.resource.deploy",
"title": "%deploy-resource-command-name%", "title": "%deploy-resource-command-name%",
"category": "%deploy-resource-command-category%" "category": "%deploy-resource-command-category%"
}, },
{ {
"command": "azdata.openNotebookInputDialog", "command": "azdata.openNotebookInputDialog",
"title": "Open notebook input dialog", "title": "Open notebook input dialog",
"category": "Notebook" "category": "Notebook"
} }
], ],
"menus": { "menus": {
"commandPalette": [ "commandPalette": [
{ {
"command": "azdata.openNotebookInputDialog", "command": "azdata.openNotebookInputDialog",
"when": "false" "when": "false"
} }
], ],
"dataExplorer/action": [ "dataExplorer/action": [
{ {
"command": "azdata.resource.deploy", "command": "azdata.resource.deploy",
"group": "secondary" "group": "secondary"
} }
] ]
}, },
"resourceDeploymentTypes": [ "resourceDeploymentTypes": [
{ {
"name": "sql-image", "name": "sql-image",
"displayIndex": 2, "displayIndex": 2,
"displayName": "%resource-type-sql-image-display-name%", "displayName": "%resource-type-sql-image-display-name%",
"description": "%resource-type-sql-image-description%", "description": "%resource-type-sql-image-description%",
"platforms": "*", "platforms": "*",
"icon": { "icon": {
"light": "./images/sql_server_container.svg", "light": "./images/sql_server_container.svg",
"dark": "./images/sql_server_container_inverse.svg" "dark": "./images/sql_server_container_inverse.svg"
}, },
"options": [ "options": [
{ {
"name": "version", "name": "version",
"displayName": "%version-display-name%", "displayName": "%version-display-name%",
"values": [ "values": [
{ {
"name": "sql2017", "name": "sql2017",
"displayName": "%sql-2017-display-name%" "displayName": "%sql-2017-display-name%"
}, },
{ {
"name": "sql2019", "name": "sql2019",
"displayName": "%sql-2019-display-name%" "displayName": "%sql-2019-display-name%"
} }
] ]
} }
], ],
"providers": [ "providers": [
{ {
"dialog": { "dialog": {
"notebook": "%sql-2017-docker-notebook%", "notebook": "%sql-2017-docker-notebook%",
"title": "%docker-sql-2017-title%", "title": "%docker-sql-2017-title%",
"name": "docker-sql-2017-dialog", "name": "docker-sql-2017-dialog",
"tabs": [ "tabs": [
{ {
"title": "", "title": "",
"sections": [ "sections": [
{ {
"title": "", "title": "",
"fields": [ "fields": [
{ {
"label": "%docker-container-name-field%", "label": "%docker-container-name-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_CONTAINER_NAME", "variableName": "AZDATA_NB_VAR_DOCKER_CONTAINER_NAME",
"type": "datetime_text", "type": "datetime_text",
"defaultValue": "SQL2017-", "defaultValue": "SQL2017-",
"required": true "required": true
}, },
{ {
"label": "%docker-sql-password-field%", "label": "%docker-sql-password-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_PASSWORD", "variableName": "AZDATA_NB_VAR_DOCKER_PASSWORD",
"type": "sql_password", "type": "sql_password",
"userName": "sa", "userName": "sa",
"confirmationRequired": true, "confirmationRequired": true,
"confirmationLabel": "%docker-confirm-sql-password-field%", "confirmationLabel": "%docker-confirm-sql-password-field%",
"defaultValue": "", "defaultValue": "",
"required": true "required": true
}, },
{ {
"label": "%docker-sql-port-field%", "label": "%docker-sql-port-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_PORT", "variableName": "AZDATA_NB_VAR_DOCKER_PORT",
"type": "number", "type": "number",
"defaultValue": "1433", "defaultValue": "1433",
"required": true, "required": true,
"min": 1, "min": 1,
"max": 65535 "max": 65535
} }
] ]
} }
] ]
} }
] ]
}, },
"requiredTools": [ "requiredTools": [
{ {
"name": "docker" "name": "docker"
} }
], ],
"when": "version=sql2017" "when": "version=sql2017"
}, },
{ {
"dialog": { "dialog": {
"notebook": "%sql-2019-docker-notebook%", "notebook": "%sql-2019-docker-notebook%",
"title": "%docker-sql-2019-title%", "title": "%docker-sql-2019-title%",
"name": "docker-sql-2019-dialog", "name": "docker-sql-2019-dialog",
"tabs": [ "tabs": [
{ {
"title": "", "title": "",
"sections": [ "sections": [
{ {
"title": "", "title": "",
"fields": [ "fields": [
{ {
"label": "%docker-container-name-field%", "label": "%docker-container-name-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_CONTAINER_NAME", "variableName": "AZDATA_NB_VAR_DOCKER_CONTAINER_NAME",
"type": "datetime_text", "type": "datetime_text",
"defaultValue": "SQL2019-", "defaultValue": "SQL2019-",
"required": true "required": true
}, },
{ {
"label": "%docker-sql-password-field%", "label": "%docker-sql-password-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_PASSWORD", "variableName": "AZDATA_NB_VAR_DOCKER_PASSWORD",
"type": "sql_password", "type": "sql_password",
"userName": "sa", "userName": "sa",
"confirmationRequired": true, "confirmationRequired": true,
"confirmationLabel": "%docker-confirm-sql-password-field%", "confirmationLabel": "%docker-confirm-sql-password-field%",
"defaultValue": "", "defaultValue": "",
"required": true "required": true
}, },
{ {
"label": "%docker-sql-port-field%", "label": "%docker-sql-port-field%",
"variableName": "AZDATA_NB_VAR_DOCKER_PORT", "variableName": "AZDATA_NB_VAR_DOCKER_PORT",
"type": "number", "type": "number",
"defaultValue": "1433", "defaultValue": "1433",
"required": true, "required": true,
"min": 1, "min": 1,
"max": 65535 "max": 65535
} }
] ]
} }
] ]
} }
] ]
}, },
"requiredTools": [ "requiredTools": [
{ {
"name": "docker" "name": "docker"
} }
], ],
"when": "version=sql2019" "when": "version=sql2019"
} }
] ]
}, },
{ {
"name": "sql-bdc", "name": "sql-bdc",
"displayIndex": 3, "displayIndex": 3,
"displayName": "%resource-type-sql-bdc-display-name%", "displayName": "%resource-type-sql-bdc-display-name%",
"description": "%resource-type-sql-bdc-description%", "description": "%resource-type-sql-bdc-description%",
"platforms": "*", "platforms": "*",
"icon": { "icon": {
"light": "./images/sql_bdc.svg", "light": "./images/sql_bdc.svg",
"dark": "./images/sql_bdc_inverse.svg" "dark": "./images/sql_bdc_inverse.svg"
}, },
"options": [ "options": [
{ {
"name": "version", "name": "version",
"displayName": "%version-display-name%", "displayName": "%version-display-name%",
"values": [ "values": [
{ {
"name": "bdc2019", "name": "bdc2019",
"displayName": "%bdc-2019-display-name%" "displayName": "%bdc-2019-display-name%"
} }
] ]
}, },
{ {
"name": "target", "name": "target",
"displayName": "%bdc-deployment-target%", "displayName": "%bdc-deployment-target%",
"values": [ "values": [
{ {
"name": "new-aks", "name": "new-aks",
"displayName": "%bdc-deployment-target-new-aks%" "displayName": "%bdc-deployment-target-new-aks%"
}, },
{ {
"name": "existing-aks", "name": "existing-aks",
"displayName": "%bdc-deployment-target-existing-aks%" "displayName": "%bdc-deployment-target-existing-aks%"
}, },
{ {
"name": "existing-kubeadm", "name": "existing-kubeadm",
"displayName": "%bdc-deployment-target-existing-kubeadm%" "displayName": "%bdc-deployment-target-existing-kubeadm%"
} }
] ]
} }
], ],
"providers": [ "providers": [
{ {
"wizard": { "wizard": {
"type": "new-aks", "type": "new-aks",
"notebook": "%bdc-2019-aks-notebook%" "notebook": "%bdc-2019-aks-notebook%"
}, },
"requiredTools": [ "requiredTools": [
{ {
"name": "kubectl", "name": "kubectl",
"version": "1.13.0" "version": "1.13.0"
}, },
{ {
"name": "azure-cli" "name": "azure-cli"
}, },
{ {
"name": "azdata", "name": "azdata",
"version": "15.0.2070" "version": "15.0.2070"
} }
], ],
"when": "target=new-aks&&version=bdc2019" "when": "target=new-aks&&version=bdc2019"
}, },
{ {
"wizard": { "wizard": {
"type": "existing-aks", "type": "existing-aks",
"notebook": "%bdc-2019-existing-aks-notebook%" "notebook": "%bdc-2019-existing-aks-notebook%"
}, },
"requiredTools": [ "requiredTools": [
{ {
"name": "kubectl" "name": "kubectl"
}, },
{ {
"name": "azdata" "name": "azdata"
} }
], ],
"when": "target=existing-aks&&version=bdc2019" "when": "target=existing-aks&&version=bdc2019"
}, },
{ {
"wizard": { "wizard": {
"type": "existing-kubeadm", "type": "existing-kubeadm",
"notebook": "%bdc-2019-existing-kubeadm-notebook%" "notebook": "%bdc-2019-existing-kubeadm-notebook%"
}, },
"requiredTools": [ "requiredTools": [
{ {
"name": "kubectl" "name": "kubectl"
}, },
{ {
"name": "azdata" "name": "azdata"
} }
], ],
"when": "target=existing-kubeadm&&version=bdc2019" "when": "target=existing-kubeadm&&version=bdc2019"
} }
], ],
"agreement": { "agreement": {
"template": "%bdc-agreement%", "template": "%bdc-agreement%",
"links": [ "links": [
{ {
"text": "%bdc-agreement-privacy-statement%", "text": "%bdc-agreement-privacy-statement%",
"url": "https://go.microsoft.com/fwlink/?LinkId=853010" "url": "https://go.microsoft.com/fwlink/?LinkId=853010"
}, },
{ {
"text": "%bdc-agreement-bdc-eula%", "text": "%bdc-agreement-bdc-eula%",
"url": "https://go.microsoft.com/fwlink/?LinkId=2002534" "url": "https://go.microsoft.com/fwlink/?LinkId=2002534"
}, },
{ {
"text": "%bdc-agreement-azdata-eula%", "text": "%bdc-agreement-azdata-eula%",
"url": "https://aka.ms/eula-azdata-en" "url": "https://aka.ms/eula-azdata-en"
} }
] ]
} }
}, },
{ {
"name": "sql-windows-setup", "name": "sql-windows-setup",
"displayIndex": 1, "displayIndex": 1,
"displayName": "%resource-type-sql-windows-setup-display-name%", "displayName": "%resource-type-sql-windows-setup-display-name%",
"description": "%resource-type-sql-windows-setup-description%", "description": "%resource-type-sql-windows-setup-description%",
"platforms": [ "platforms": [
"win32" "win32"
], ],
"icon": { "icon": {
"light": "./images/sql_server_on_windows.svg", "light": "./images/sql_server_on_windows.svg",
"dark": "./images/sql_server_on_windows_inverse.svg" "dark": "./images/sql_server_on_windows_inverse.svg"
}, },
"options": [ "options": [
{ {
"name": "version", "name": "version",
"displayName": "%version-display-name%", "displayName": "%version-display-name%",
"values": [ "values": [
{ {
"name": "sql2017", "name": "sql2017",
"displayName": "%sql-2017-display-name%" "displayName": "%sql-2017-display-name%"
}, },
{ {
"name": "sql2019", "name": "sql2019",
"displayName": "%sql-2019-display-name%" "displayName": "%sql-2019-display-name%"
} }
] ]
} }
], ],
"providers": [ "providers": [
{ {
"downloadUrl": "https://go.microsoft.com/fwlink/?linkid=853016", "downloadUrl": "https://go.microsoft.com/fwlink/?linkid=853016",
"requiredTools": [], "requiredTools": [],
"when": "version=sql2017" "when": "version=sql2017"
}, },
{ {
"downloadUrl": "https://go.microsoft.com/fwlink/?linkid=866662", "downloadUrl": "https://go.microsoft.com/fwlink/?linkid=866662",
"requiredTools": [], "requiredTools": [],
"when": "version=sql2019" "when": "version=sql2019"
} }
] ]
} }
] ]
}, },
"dependencies": { "dependencies": {
"linux-release-info": "^2.0.0", "linux-release-info": "^2.0.0",
"promisify-child-process": "^3.1.1", "promisify-child-process": "^3.1.1",
"sudo-prompt": "9.1.1", "sudo-prompt": "9.1.1",
"vscode-nls": "^4.0.0", "vscode-nls": "^4.0.0",
"yamljs": "^0.3.0" "yamljs": "^0.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/yamljs": "0.2.30", "@types/mocha": "^5.2.5",
"mocha-junit-reporter": "^1.17.0", "@types/yamljs": "0.2.30",
"mocha-multi-reporters": "^1.1.7", "mocha": "^5.2.0",
"typemoq": "^2.1.0", "mocha-junit-reporter": "^1.17.0",
"vscode": "^1.1.26" "mocha-multi-reporters": "^1.1.7",
} "typemoq": "^2.1.0",
"vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}
} }

28
extensions/resource-deployment/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'resource-deployment Extension Tests'; const suite = 'resource-deployment Extension Tests';
const testOptions: any = { const mochaOptions: any = {
ui: 'tdd', ui: 'tdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const testOptions: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
testOptions.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${testOptions.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
testOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${testOptions.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
testOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${testOptions.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
testOptions.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${testOptions.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
testOptions.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
testOptions.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(testOptions); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3702
extensions/resource-deployment/yarn.lock
View File

File diff suppressed because it is too large Load Diff

5
extensions/schema-compare/.vscodeignore
View File

@@ -1,2 +1,5 @@
src/** src
out/test
tsconfig.json tsconfig.json
coverage
coverConfig.json

19
extensions/schema-compare/coverConfig.json Normal file
View File

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

5
extensions/schema-compare/package.json
View File

@@ -70,7 +70,10 @@
"mocha-multi-reporters": "^1.1.7", "mocha-multi-reporters": "^1.1.7",
"should": "^13.2.1", "should": "^13.2.1",
"typemoq": "^2.1.0", "typemoq": "^2.1.0",
"vscode": "1.1.26" "vscodetestcover": "github:corivera/vscodetestcover#1.0.4"
},
"resolutions": {
"esprima": "^4.0.0"
}, },
"__metadata": { "__metadata": {
"id": "37", "id": "37",

28
extensions/schema-compare/src/test/index.ts
View File

@@ -3,12 +3,12 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
const path = require('path'); import * as path from 'path';
const testRunner = require('vscode/lib/testrunner'); const testRunner = require('vscodetestcover');
const suite = 'schema-compare Extension Tests'; const suite = 'schema-compare Extension Tests';
const options: any = { const mochaOptions: any = {
ui: 'bdd', ui: 'bdd',
useColors: true, useColors: true,
timeout: 10000 timeout: 10000
@@ -16,25 +16,25 @@ const options: any = {
// set relevant mocha options from the environment // set relevant mocha options from the environment
if (process.env.ADS_TEST_GREP) { if (process.env.ADS_TEST_GREP) {
options.grep = process.env.ADS_TEST_GREP; mochaOptions.grep = process.env.ADS_TEST_GREP;
console.log(`setting options.grep to: ${options.grep}`); console.log(`setting options.grep to: ${mochaOptions.grep}`);
} }
if (process.env.ADS_TEST_INVERT_GREP) { if (process.env.ADS_TEST_INVERT_GREP) {
options.invert = parseInt(process.env.ADS_TEST_INVERT_GREP); mochaOptions.invert = parseInt(process.env.ADS_TEST_INVERT_GREP);
console.log(`setting options.invert to: ${options.invert}`); console.log(`setting options.invert to: ${mochaOptions.invert}`);
} }
if (process.env.ADS_TEST_TIMEOUT) { if (process.env.ADS_TEST_TIMEOUT) {
options.timeout = parseInt(process.env.ADS_TEST_TIMEOUT); mochaOptions.timeout = parseInt(process.env.ADS_TEST_TIMEOUT);
console.log(`setting options.timeout to: ${options.timeout}`); console.log(`setting options.timeout to: ${mochaOptions.timeout}`);
} }
if (process.env.ADS_TEST_RETRIES) { if (process.env.ADS_TEST_RETRIES) {
options.retries = parseInt(process.env.ADS_TEST_RETRIES); mochaOptions.retries = parseInt(process.env.ADS_TEST_RETRIES);
console.log(`setting options.retries to: ${options.retries}`); console.log(`setting options.retries to: ${mochaOptions.retries}`);
} }
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) { if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
options.reporter = 'mocha-multi-reporters'; mochaOptions.reporter = 'mocha-multi-reporters';
options.reporterOptions = { mochaOptions.reporterOptions = {
reporterEnabled: 'spec, mocha-junit-reporter', reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: { mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`, testsuitesTitle: `${suite} ${process.platform}`,
@@ -43,6 +43,6 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
}; };
} }
testRunner.configure(options); testRunner.configure(mochaOptions, { coverConfig: '../../coverConfig.json' });
export = testRunner; export = testRunner;

3416
extensions/schema-compare/yarn.lock
View File

File diff suppressed because it is too large Load Diff