ckaczor/azuredatastudio
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

Browse Source 
This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/configuration/test/node/configurationService.test.ts
+2 -13
View File
@@ -21,7 +21,6 @@ suite('ConfigurationService - Node', () => {
fs.writeFileSync(res.testFile, '{ "foo": "bar" }');
const service = new ConfigurationService(res.testFile);
await service.initialize();
const config = service.getValue<{
foo: string;
}>();
@@ -39,7 +38,6 @@ suite('ConfigurationService - Node', () => {
fs.writeFileSync(res.testFile, '{ "testworkbench.editor.tabs": true }');
const service = new ConfigurationService(res.testFile);
await service.initialize();
const config = service.getValue<{
testworkbench: {
editor: {
@@ -62,7 +60,6 @@ suite('ConfigurationService - Node', () => {
fs.writeFileSync(res.testFile, ',,,,');
const service = new ConfigurationService(res.testFile);
await service.initialize();
const config = service.getValue<{
foo: string;
}>();
@@ -72,14 +69,13 @@ suite('ConfigurationService - Node', () => {
return res.cleanUp();
});
test('missing file does not explode', async () => {
test('missing file does not explode', () => {
const id = uuid.generateUuid();
const parentDir = path.join(os.tmpdir(), 'vsctests', id);
const newDir = path.join(parentDir, 'config', id);
const testFile = path.join(newDir, 'config.json');
const service = new ConfigurationService(testFile);
await service.initialize();
const config = service.getValue<{ foo: string }>();
assert.ok(config);
@@ -91,7 +87,6 @@ suite('ConfigurationService - Node', () => {
const res = await testFile('config', 'config.json');
const service = new ConfigurationService(res.testFile);
await service.initialize();
return new Promise((c, e) => {
service.onDidChangeConfiguration(() => {
assert.equal(service.getValue('foo'), 'bar');
@@ -109,7 +104,6 @@ suite('ConfigurationService - Node', () => {
fs.writeFileSync(res.testFile, '{ "foo": "bar" }');
const service = new ConfigurationService(res.testFile);
await service.initialize();
let config = service.getValue<{
foo: string;
}>();
@@ -136,7 +130,7 @@ suite('ConfigurationService - Node', () => {
return res.cleanUp();
});
test('model defaults', async () => {
test('model defaults', () => {
interface ITestSetting {
configuration: {
service: {
@@ -158,7 +152,6 @@ suite('ConfigurationService - Node', () => {
});
let serviceWithoutFile = new ConfigurationService('__testFile');
await serviceWithoutFile.initialize();
let setting = serviceWithoutFile.getValue<ITestSetting>();
assert.ok(setting);
@@ -201,8 +194,6 @@ suite('ConfigurationService - Node', () => {
const r = await testFile('config', 'config.json');
const service = new ConfigurationService(r.testFile);
service.initialize();
let res = service.inspect('something.missing');
assert.strictEqual(res.value, undefined);
assert.strictEqual(res.default, undefined);
@@ -239,8 +230,6 @@ suite('ConfigurationService - Node', () => {
const r = await testFile('config', 'config.json');
const service = new ConfigurationService(r.testFile);
service.initialize();
let res = service.inspect('lookup.service.testNullSetting');
assert.strictEqual(res.default, null);
assert.strictEqual(res.value, null);