Add test coverage for Format Document

Author: xeger

src/test/suite/index.test.ts

@@ -2,7 +2,6 @@ import * as assert from 'assert';
 import { before, beforeEach } from 'mocha';
 
 import * as auto from './automation';
-import { TIMEOUT_MS } from './setup';
 
 // can directly import extension if needed
 // import * as myExtension from '../../extension';
@@ -17,9 +16,9 @@ end
 `;
 
 suite('Syntax Tree', () => {
-  suite('commands', () => {
-    beforeEach(auto.reset);
+  beforeEach(auto.reset);
 
+  suite('lifecycle commands', () => {
     test('start', async () => {
       await auto.start();
       const text = await auto.showOutputChannel();
@@ -37,13 +36,18 @@ suite('Syntax Tree', () => {
       await auto.restart();
       const text = await auto.showOutputChannel();
       assert.match(text, /^Restarting language server/m);
+      assert.match(text, /^Stopping language server/m);
+      assert.match(text, /^Starting language server/);
     })
   });
 
-  // TODO: figure out re-entrancy issue in CI (prolly two LanguageClient instances at once?)
-  test.skip('Format Document', async () => {
-    const editor = await auto.createEditor(UNFORMATTED);
-    await auto.formatDocument();
-    assert.equal(editor.document.getText(), FORMATTED);
-  });
+  suite('functional commands', () => {
+    before(auto.start);
+
+    test('Format Document', async () => {
+      const editor = await auto.createEditor(UNFORMATTED);
+      await auto.formatDocument();
+      assert.equal(editor.document.getText(), FORMATTED);
+    });
+  })
 });