Added commands tests

Author: edgardmessias

src/commands.ts

@@ -176,8 +176,8 @@ export class SvnCommands implements IDisposable {
   }
 
   @command("svn.fileOpen")
-  fileOpen(resourceUri: Uri) {
-    commands.executeCommand("vscode.open", resourceUri);
+  async fileOpen(resourceUri: Uri) {
+    await commands.executeCommand("vscode.open", resourceUri);
   }
 
   @command("svn.commitWithMessage", { repository: true })

src/test/commands.test.ts

@@ -0,0 +1,194 @@
+//
+// 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 fs from "fs";
+import * as path from "path";
+import * as vscode from "vscode";
+import * as testUtil from "./testUtil";
+import {
+  Uri,
+  commands,
+  workspace,
+  window,
+  InputBoxOptions,
+  CancellationToken,
+  QuickPickOptions,
+  QuickPickItem
+} from "vscode";
+import { Svn } from "../svn";
+import { Model } from "../model";
+import { SvnFinder, ISvn } from "../svnFinder";
+import { Repository } from "../repository";
+import { timeout } from "../util";
+import { SvnResourceGroup } from "../resource";
+
+// Defines a Mocha test suite to group tests of similar kind together
+suite("Commands Tests", () => {
+  let repoUri: Uri;
+  let checkoutDir: Uri;
+  let model: Model;
+
+  suiteSetup(async () => {
+    await testUtil.activeExtension();
+
+    repoUri = await testUtil.createRepoServer();
+    await testUtil.createStandardLayout(testUtil.getSvnUrl(repoUri));
+    checkoutDir = await testUtil.createRepoCheckout(
+      testUtil.getSvnUrl(repoUri) + "/trunk"
+    );
+
+    model = (await commands.executeCommand(
+      "svn._getModel",
+      checkoutDir
+    )) as Model;
+
+    await model.tryOpenRepository(checkoutDir.fsPath);
+  });
+
+  suiteTeardown(() => {
+    model.openRepositories.forEach(repository => repository.dispose());
+    testUtil.destroyAllTempPaths();
+  });
+
+  test("File Open", async function() {
+    const file = path.join(checkoutDir.fsPath, "new.txt");
+    fs.writeFileSync(file, "test");
+
+    await commands.executeCommand("svn.fileOpen", Uri.file(file));
+  });
+
+  test("Add File", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+
+    await commands.executeCommand("svn.refresh");
+    assert.equal(repository.unversioned.resourceStates.length, 1);
+    assert.equal(repository.changes.resourceStates.length, 0);
+
+    const resource = repository.unversioned.resourceStates[0];
+
+    await commands.executeCommand("svn.add", resource);
+
+    assert.equal(repository.unversioned.resourceStates.length, 0);
+    assert.equal(repository.changes.resourceStates.length, 1);
+  });
+
+  test("Commit File", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+    repository.inputBox.value = "First Commit";
+
+    await commands.executeCommand("svn.commitWithMessage");
+  });
+
+  test("Update", async function() {
+    await commands.executeCommand("svn.update");
+  });
+
+  test("Show Log", async function() {
+    await commands.executeCommand("svn.log");
+  });
+
+  test("Open Changes", async function() {
+    const file = path.join(checkoutDir.fsPath, "new.txt");
+    fs.writeFileSync(file, "test 2");
+    const uri = Uri.file(file);
+
+    await commands.executeCommand("svn.refresh");
+    await commands.executeCommand("svn.openChangeBase", uri);
+    await commands.executeCommand("svn.openChangeHead", uri);
+  });
+
+  test("Open File", async function() {
+    const file = path.join(checkoutDir.fsPath, "new.txt");
+    const uri = Uri.file(file);
+
+    await commands.executeCommand("svn.openFile", uri);
+    await commands.executeCommand("svn.openHEADFile", uri);
+  });
+
+  test("Open Diff (Double click o source control)", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+
+    await commands.executeCommand("svn.refresh");
+    assert.equal(repository.changes.resourceStates.length, 1);
+
+    const resource = repository.changes.resourceStates[0];
+
+    await commands.executeCommand("svn.openResourceBase", resource);
+    await commands.executeCommand("svn.openResourceHead", resource);
+  });
+
+  test("Add Changelist", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+
+    await commands.executeCommand("svn.refresh");
+    assert.equal(repository.changes.resourceStates.length, 1);
+
+    const resource = repository.changes.resourceStates[0];
+
+    testUtil.overrideNextShowQuickPick(0);
+    testUtil.overrideNextShowInputBox("changelist-test");
+
+    await commands.executeCommand("svn.addChangelist", resource);
+    assert.ok(repository.changelists.has("changelist-test"));
+  });
+
+  test("Remove Changelist", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+
+    const group = repository.changelists.get(
+      "changelist-test"
+    ) as SvnResourceGroup;
+    const resource = group.resourceStates[0];
+
+    await commands.executeCommand("svn.removeChangelist", resource);
+    assert.equal(group.resourceStates.length, 0);
+  });
+
+  test("Show Patch", async function() {
+    await commands.executeCommand("svn.patch");
+  });
+
+  test("Commit Selected File", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+
+    await commands.executeCommand("svn.refresh");
+    assert.equal(repository.changes.resourceStates.length, 1);
+
+    const resource = repository.changes.resourceStates[0];
+
+    testUtil.overrideNextShowInputBox("Second Commit");
+    await commands.executeCommand("svn.commit", resource);
+
+    assert.equal(repository.changes.resourceStates.length, 0);
+  });
+
+  test("Commit File", async function() {
+    const repository = model.getRepository(checkoutDir) as Repository;
+    repository.inputBox.value = "First Commit";
+
+    await commands.executeCommand("svn.commitWithMessage");
+  });
+
+  test("New Branch", async function() {
+    testUtil.overrideNextShowInputBox("test");
+    await commands.executeCommand("svn.branch");
+
+    const repository = model.getRepository(checkoutDir) as Repository;
+    assert.equal(await repository.getCurrentBranch(), "test");
+  });
+
+  test("Switch Branch", async function() {
+    testUtil.overrideNextShowQuickPick(1);
+    await commands.executeCommand("svn.switchBranch");
+
+    const repository = model.getRepository(checkoutDir) as Repository;
+    assert.equal(await repository.getCurrentBranch(), "trunk");
+  });
+});

src/test/index.ts

@@ -24,7 +24,7 @@ if (!tty.getWindowSize) {
 
 let mocha = new Mocha({
   ui: "tdd",
-  timeout: 10000
+  timeout: 30000
 });
 
 mocha.useColors(true);

src/test/testUtil.ts

@@ -2,9 +2,10 @@ import * as cp from "child_process";
 import * as path from "path";
 import * as fs from "fs";
 import * as os from "os";
-import { Uri, extensions } from "vscode";
+import { Uri, extensions, window } from "vscode";
 import { SpawnOptions, ChildProcess } from "child_process";
 import { timeout } from "../util";
+import { type } from "os";
 
 const tempDir = os.tmpdir();
 let tempDirList: string[] = [];
@@ -177,3 +178,48 @@ export function activeExtension() {
     }
   });
 }
+
+const overridesShowInputBox: any[] = [];
+
+export function overrideNextShowInputBox(value: any) {
+  overridesShowInputBox.push(value);
+}
+
+const originalShowInputBox = window.showInputBox;
+
+window.showInputBox = (options?: any, token?: any) => {
+  const next = overridesShowInputBox.shift();
+  if (typeof next === "undefined") {
+    return originalShowInputBox.call(null, arguments);
+  }
+  return new Promise((resolve, reject) => {
+    resolve(next);
+  });
+};
+
+const overridesShowQuickPick: any[] = [];
+
+export function overrideNextShowQuickPick(value: any) {
+  overridesShowQuickPick.push(value);
+}
+
+const originalShowQuickPick = window.showQuickPick;
+
+window.showQuickPick = (
+  items: any[] | Thenable<any[]>,
+  options?: any,
+  token?: any
+): Thenable<any | undefined> => {
+  let next = overridesShowQuickPick.shift();
+  if (typeof next === "undefined") {
+    return originalShowQuickPick.call(null, arguments);
+  }
+
+  if (typeof next === "number" && Array.isArray(items)) {
+    next = items[next];
+  }
+
+  return new Promise((resolve, reject) => {
+    resolve(next);
+  });
+};