Add command test

rmccue · Jan 12, 2019 · ecdf581 · ecdf581
1 parent 985e65f
commit ecdf581
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -39,11 +39,16 @@ export function activate(context: vscode.ExtensionContext)
         vscode.languages.registerCompletionItemProvider(lang, new Completions(), '*', '@');
     });
 
-    vscode.commands.registerTextEditorCommand('php-docblocker.trigger', (textEditor:vscode.TextEditor) => {
+    vscode.commands.registerTextEditorCommand('php-docblocker.trigger', (textEditor:vscode.TextEditor, edit:vscode.TextEditorEdit, callback:any) => {
         textEditor.selection = new vscode.Selection(textEditor.selection.start, textEditor.selection.start);
         let range = new vscode.Range(textEditor.selection.start, textEditor.selection.end);
         let documenter = new Documenter(range, textEditor);
-        textEditor.insertSnippet(documenter.autoDocument());
+        let snippet = documenter.autoDocument();
+        textEditor.insertSnippet(snippet);
+
+        if (callback) {
+            callback(snippet);
+        }
     });
 }
 

diff --git a/test/class.test.ts b/test/class.test.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import {TextEditor, TextDocument} from 'vscode';
 import Helper from './helpers';
-import Function from '../src/block/class';
+import Class from '../src/block/class';
 import {Doc, Param} from '../src/doc';
 
 suite("Class tests", () => {
@@ -22,12 +22,12 @@ suite("Class tests", () => {
 
     map.forEach(testData => {
         test("Match Test: "+ testData.name, () => {
-            let func = new Function(testPositions[testData.key], editor);
+            let func = new Class(testPositions[testData.key], editor);
             assert.equal(func.test(), true, test.name);
         });
 
         test("Parse Test: "+ testData.name, () => {
-            let func = new Function(testPositions[testData.key], editor);
+            let func = new Class(testPositions[testData.key], editor);
             assert.ok(func.parse(), test.name);
         });
     });

diff --git a/test/commands.test.ts b/test/commands.test.ts
@@ -0,0 +1,23 @@
+import * as assert from 'assert';
+import {TextEditor, TextDocument, commands, Selection} from 'vscode';
+import Helper from './helpers';
+
+suite("Command tests", () => {
+    let editor:TextEditor;
+    let document:TextDocument;
+
+    suiteSetup(function(done) {
+        Helper.loadFixture('commands.php', (edit:TextEditor, doc:TextDocument) => {
+            editor = edit;
+            document = doc;
+            done();
+        });
+    });
+
+    test("Command: trigger", () => {
+        editor.selection = new Selection(3, 0, 3, 0);
+        assert.doesNotThrow(async () => {
+            await commands.executeCommand('php-docblocker.trigger', editor)
+        });
+    });
+});
diff --git a/test/fixtures/commands.php b/test/fixtures/commands.php
@@ -0,0 +1,6 @@
+<?php
+
+
+class Trigger
+{
+}