unit test for formatters microsoft#163, microsoft#178, microsoft#160

DonJayamanne · DonJayamanne · commit 57dba88b0d70 · 2016-06-21T19:46:29.000+10:00
diff --git a/src/test/extension.format.test.ts b/src/test/extension.format.test.ts
@@ -1,7 +1,7 @@
-//
+
 // Note: This example test is leveraging the Mocha test framework.
 // Please refer to their documentation on https://mochajs.org/ for help.
-//
+
 
 // The module 'assert' provides assertion methods from node
 import * as assert from "assert";
@@ -14,18 +14,15 @@ import {YapfFormatter} from "../client/formatters/yapfFormatter";
 import * as path from "path";
 import * as settings from "../client/common/configSettings";
 import * as fs from "fs-extra";
+import {initialize} from "./initialize";
 
 let pythonSettings = settings.PythonSettings.getInstance();
 let ch = vscode.window.createOutputChannel("Tests");
 let pythoFilesPath = path.join(__dirname, "..", "..", "src", "test", "pythonFiles", "formatting");
 
 suite("Formatting", () => {
-    setup(() => {
-        return new Promise<any>(resolve => {
-            setTimeout(function () {
-                resolve();
-            }, 1000);
-        });
+    setup(done => {
+        initialize().then(() => done(), done);
     });
     teardown(() => {
         if (vscode.window.activeTextEditor) {
@@ -56,10 +53,7 @@ suite("Formatting", () => {
                 }
                 assert.equal(textEditor.document.getText(), data, "Formatted text is not the same");
             });
-        }).then(done, error => {
-            done();
-            assert.ok(false, error);
-        });
+        }).then(done, done);
     });
 
     test("Yapf", done => {
@@ -85,10 +79,7 @@ suite("Formatting", () => {
                 }
                 assert.equal(textEditor.document.getText(), data, "Formatted text is not the same");
             });
-        }).then(done, error => {
-            done();
-            assert.ok(false, error);
-        });
+        }).then(done, done);
     });
 
     test("Yapf autoformat on save", done => {
@@ -120,9 +111,6 @@ suite("Formatting", () => {
             });
         }).then(() => {
             assert.equal(textDocument.getText(), formattedFileContents, "Formatted contents are not the same");
-        }).then(done, error => {
-            done();
-            assert.ok(false, error);
-        });
+        }).then(done, done);
     });
 });
diff --git a/src/test/index.ts b/src/test/index.ts
@@ -16,7 +16,8 @@ let testRunner = require("vscode/lib/testrunner");
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
 testRunner.configure({
     ui: "tdd", 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-    useColors: true // colored output from test results
+    useColors: true, // colored output from test results
+    timeout: 5000
 });
 
 module.exports = testRunner;
diff --git a/src/test/initialize.ts b/src/test/initialize.ts
@@ -0,0 +1,17 @@
+//
+// Note: This example test is leveraging the Mocha test framework.
+// Please refer to their documentation on https://mochajs.org/ for help.
+//
+
+// The module 'assert' provides assertion methods from node
+import * as assert from "assert";
+
+// You can import and use all API from the 'vscode' module
+// as well as import your extension to test it
+import * as vscode from "vscode";
+import * as path from "path";
+let dummyPythonFile = path.join(__dirname, "..", "..", "src", "test", "pythonFiles", "dummy.py");
+
+export function initialize(): Thenable<any> {
+    return vscode.workspace.openTextDocument(dummyPythonFile);
+}
diff --git a/src/test/pythonFiles/dummy.py b/src/test/pythonFiles/dummy.py
@@ -0,0 +1 @@
+#dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+#dummy file to be opened by Test VS Code instance, so that Python Configuration (workspace configuration will be initialized)`