From 6cb1643f5a15e40f7a21348299877cc10eed0c06 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 8 Sep 2016 11:54:25 +0200 Subject: [PATCH] tests cleanup --- src/vs/base/test/browser/builder.test.ts | 4 ++-- .../files/test/browser/fileEditorTracker.test.ts | 12 ++++++++---- .../test/browser/parts/editor/baseEditor.test.ts | 10 +++++----- .../workbench/test/common/editor/editorModel.test.ts | 10 +++++----- .../test/common/editor/stringEditorInput.test.ts | 10 +++++----- .../test/common/editor/stringEditorModel.test.ts | 6 +++--- .../test/common/editor/untitledEditor.test.ts | 6 ++++++ 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts index 3402c34a054..5330a21ae9b 100644 --- a/src/vs/base/test/browser/builder.test.ts +++ b/src/vs/base/test/browser/builder.test.ts @@ -810,7 +810,7 @@ suite('Builder', () => { b.showDelayed(20); assert(b.hasClass('hidden')); - TPromise.timeout(30).then(function () { + TPromise.timeout(30).then(() => { assert(!b.hasClass('hidden')); done(); }); @@ -825,7 +825,7 @@ suite('Builder', () => { b.hide(); // Should cancel the visibility promise - TPromise.timeout(30).then(function () { + TPromise.timeout(30).then(() => { assert(b.hasClass('hidden')); done(); }); diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts index f51da3aec22..723463812fd 100644 --- a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts +++ b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts @@ -37,8 +37,8 @@ suite('Files - FileEditorTracker', () => { const inputToResolve = instantiationService.createInstance(FileEditorInput, toResource('/fooss5/bar/file2.js'), 'text/javascript', void 0); const sameOtherInput = instantiationService.createInstance(FileEditorInput, toResource('/fooss5/bar/file2.js'), 'text/javascript', void 0); - return accessor.editorService.resolveEditorModel(inputToResolve).then(function (resolved) { - return accessor.editorService.resolveEditorModel(sameOtherInput).then(function (resolved) { + return accessor.editorService.resolveEditorModel(inputToResolve).then((resolved) => { + return accessor.editorService.resolveEditorModel(sameOtherInput).then(resolved => { tracker.handleDeleteOrMove(toResource('/bar')); assert(!inputToResolve.isDisposed()); assert(!sameOtherInput.isDisposed()); @@ -48,6 +48,8 @@ suite('Files - FileEditorTracker', () => { assert(inputToResolve.isDisposed()); assert(sameOtherInput.isDisposed()); + resolved.dispose(); + done(); }); }); @@ -58,8 +60,8 @@ suite('Files - FileEditorTracker', () => { const inputToResolve = instantiationService.createInstance(FileEditorInput, toResource('/foo6/bar/file.js'), 'text/javascript', void 0); const sameOtherInput = instantiationService.createInstance(FileEditorInput, toResource('/foo6/bar/file.js'), 'text/javascript', void 0); - return accessor.editorService.resolveEditorModel(inputToResolve, true).then(function (resolved) { - return accessor.editorService.resolveEditorModel(sameOtherInput, true).then(function (resolved) { + return accessor.editorService.resolveEditorModel(inputToResolve, true).then(resolved => { + return accessor.editorService.resolveEditorModel(sameOtherInput, true).then(resolved => { tracker.handleDeleteOrMove(toResource('/bar')); assert(!inputToResolve.isDisposed()); assert(!sameOtherInput.isDisposed()); @@ -69,6 +71,8 @@ suite('Files - FileEditorTracker', () => { assert(inputToResolve.isDisposed()); assert(sameOtherInput.isDisposed()); + resolved.dispose(); + done(); }); }); diff --git a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts index d97d2ca2622..684f26ce0fb 100644 --- a/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts +++ b/src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts @@ -134,13 +134,13 @@ suite('Workbench BaseEditor', () => { assert(!e.isVisible()); assert(!e.getInput()); assert(!e.getOptions()); - e.setInput(input, options).then(function () { + e.setInput(input, options).then(() => { assert.strictEqual(input, e.getInput()); assert.strictEqual(options, e.getOptions()); e.setVisible(true); assert(e.isVisible()); - input.addListener2('dispose', function () { + input.addListener2('dispose', () => { assert(false); }); e.dispose(); @@ -192,10 +192,10 @@ suite('Workbench BaseEditor', () => { let inst = new TestInstantiationService(); - inst.createInstance(EditorRegistry.getEditor(inst.createInstance(MyStringInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(function (editor) { + inst.createInstance(EditorRegistry.getEditor(inst.createInstance(MyStringInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(editor => { assert.strictEqual(editor.getId(), 'myEditor'); - return inst.createInstance(EditorRegistry.getEditor(inst.createInstance(StringEditorInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(function (editor) { + return inst.createInstance(EditorRegistry.getEditor(inst.createInstance(StringEditorInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(editor => { assert.strictEqual(editor.getId(), 'myOtherEditor'); (EditorRegistry).setEditors(oldEditors); @@ -213,7 +213,7 @@ suite('Workbench BaseEditor', () => { let inst = new TestInstantiationService(); - inst.createInstance(EditorRegistry.getEditor(inst.createInstance(MyStringInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(function (editor) { + inst.createInstance(EditorRegistry.getEditor(inst.createInstance(MyStringInput, 'fake', '', '', mime.MIME_TEXT, false)), 'id').then(editor => { assert.strictEqual('myOtherEditor', editor.getId()); (EditorRegistry).setEditors(oldEditors); diff --git a/src/vs/workbench/test/common/editor/editorModel.test.ts b/src/vs/workbench/test/common/editor/editorModel.test.ts index bd69729cd87..f29f19f4262 100644 --- a/src/vs/workbench/test/common/editor/editorModel.test.ts +++ b/src/vs/workbench/test/common/editor/editorModel.test.ts @@ -31,7 +31,7 @@ suite('Workbench - EditorModel', () => { test('EditorModel', function (done) { let m = new MyEditorModel(); - m.load().then(function (model) { + m.load().then(model => { assert(model === m); assert.strictEqual(m.isResolved(), true); }).done(() => done()); @@ -41,9 +41,9 @@ suite('Workbench - EditorModel', () => { let modelService = createMockModelService(instantiationService); let m = new MyTextEditorModel(modelService, modeService); - m.load().then(function (model: any) { + m.load().then((model:any) => { assert(model === m); - return model.createTextEditorModel('foo', null, 'text/plain').then(function () { + return model.createTextEditorModel('foo', null, 'text/plain').then(() => { assert.strictEqual(m.isResolved(), true); }); }).done(() => { @@ -58,7 +58,7 @@ suite('Workbench - EditorModel', () => { let otherInput = instantiationService.createInstance(StringEditorInput, 'name2', 'description', 'value2', 'text/plain', false); let diffInput = new DiffEditorInput('name', 'description', input, otherInput); - diffInput.resolve(true).then(function (model: any) { + diffInput.resolve(true).then((model: any) => { assert(model); assert(model instanceof TextDiffEditorModel); @@ -66,7 +66,7 @@ suite('Workbench - EditorModel', () => { assert(diffEditorModel.original); assert(diffEditorModel.modified); - return diffInput.resolve(true).then(function (model: any) { + return diffInput.resolve(true).then((model: any) => { assert(model.isResolved()); assert(diffEditorModel !== model.textDiffEditorModel); diff --git a/src/vs/workbench/test/common/editor/stringEditorInput.test.ts b/src/vs/workbench/test/common/editor/stringEditorInput.test.ts index 723b5d4fd1a..57158059545 100644 --- a/src/vs/workbench/test/common/editor/stringEditorInput.test.ts +++ b/src/vs/workbench/test/common/editor/stringEditorInput.test.ts @@ -51,22 +51,22 @@ suite('Workbench - StringEditorInput', () => { input = instantiationService.createInstance(StringEditorInput, 'name', 'description', 'value', 'mime', false); input = instantiationService.createInstance(StringEditorInput, 'name', 'description', 'value', 'mime', false); - editorService.resolveEditorModel(input, true).then(function (resolved) { + editorService.resolveEditorModel(input, true).then(resolved => { let resolvedModelA = resolved; - return editorService.resolveEditorModel(input, true).then(function (resolved) { + return editorService.resolveEditorModel(input, true).then(resolved => { assert(resolvedModelA === resolved); // assert: Resolved Model cached per instance let otherInput = instantiationService.createInstance(StringEditorInput, 'name', 'description', 'value', 'mime', false); - return editorService.resolveEditorModel(otherInput, true).then(function (resolved) { + return editorService.resolveEditorModel(otherInput, true).then(resolved => { assert(resolvedModelA !== resolved); // NOT assert: Different instance, different model input.dispose(); - return editorService.resolveEditorModel(input, true).then(function (resolved) { + return editorService.resolveEditorModel(input, true).then(resolved => { assert(resolvedModelA !== resolved); // Different instance, because input got disposed let model = (resolved).textEditorModel; - return editorService.resolveEditorModel(input, true).then(function (againResolved) { + return editorService.resolveEditorModel(input, true).then(againResolved => { assert(model === (againResolved).textEditorModel); // Models should not differ because string input is constant input.dispose(); diff --git a/src/vs/workbench/test/common/editor/stringEditorModel.test.ts b/src/vs/workbench/test/common/editor/stringEditorModel.test.ts index e2909991dcf..dab7dae73ac 100644 --- a/src/vs/workbench/test/common/editor/stringEditorModel.test.ts +++ b/src/vs/workbench/test/common/editor/stringEditorModel.test.ts @@ -24,7 +24,7 @@ suite('Workbench - StringEditorModel', () => { test('StringEditorModel', function (done) { instantiationService.stub(IModelService, createMockModelService(instantiationService)); let m = instantiationService.createInstance(StringEditorModel, 'value', 'mime', null); - m.load().then(function (model) { + m.load().then(model => { assert(model === m); let textEditorModel = m.textEditorModel; @@ -33,7 +33,7 @@ suite('Workbench - StringEditorModel', () => { assert.strictEqual(m.isResolved(), true); (m).value = 'something'; - return m.load().then(function (model) { + return m.load().then(model => { assert(textEditorModel === m.textEditorModel); assert.strictEqual(m.getValue(), 'something'); }); @@ -46,7 +46,7 @@ suite('Workbench - StringEditorModel', () => { test('StringEditorModel - setValue, clearValue, append, trim', function (done) { instantiationService.stub(IModelService, createMockModelService(instantiationService)); let m = instantiationService.createInstance(StringEditorModel, 'value', 'mime', null); - m.load().then(function (model) { + m.load().then(model => { assert(model === m); let textEditorModel = m.textEditorModel; diff --git a/src/vs/workbench/test/common/editor/untitledEditor.test.ts b/src/vs/workbench/test/common/editor/untitledEditor.test.ts index 508e65ef7af..858a3da17b8 100644 --- a/src/vs/workbench/test/common/editor/untitledEditor.test.ts +++ b/src/vs/workbench/test/common/editor/untitledEditor.test.ts @@ -67,6 +67,8 @@ suite('Workbench - Untitled Editor', () => { assert.ok(!input2.isDirty()); assert.ok(!model.isDirty()); + input2.dispose(); + done(); }); @@ -96,6 +98,8 @@ suite('Workbench - Untitled Editor', () => { model.textEditorModel.setValue(''); assert.ok(!model.isDirty()); + input.dispose(); + done(); }); }); @@ -113,6 +117,8 @@ suite('Workbench - Untitled Editor', () => { model.textEditorModel.setValue(''); assert.ok(model.isDirty()); + input.dispose(); + done(); }); }); -- GitLab