Merge pull request #150 from edgardmessias/optimize_tests

Optimize tests

Author: JohnstonCode

.travis.yml

@@ -33,11 +33,11 @@ install:
   - npm install
 #- npm run prettier
   - npm run vscode:prepublish
+  # For coverage
+  - sed -i.bak 's/"\*"//g' package.json
 
 script:
   - npm test --silent
 
 after_success:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$CODE_VERSION" == "" ]; then
-      bash <(curl -s https://codecov.io/bash);
-    fi
+  - bash <(curl -s https://codecov.io/bash)

appveyor.yml

@@ -1,16 +1,34 @@
 environment:
-  ELECTRON_RUN_AS_NODE: 1
+  ELECTRON_NO_ATTACH_CONSOLE: 1
   VSCODE_BUILD_VERBOSE: true
 
+# platform:
+#   - x86
+#   - x64
+
 cache:
+  - node_modules
   - '%LOCALAPPDATA%\Yarn\cache'
+  - '%APPDATA%\npm-cache'
 
 install:
-  - ps: Install-Product node 8.9.1 x64
-
-build_script:
+  - ps: Install-Product node 8.9.1
+  - npm install -g npm
+  - node --version
+  - npm --version
   - npm install
+  
+build_script:
   - npm run vscode:prepublish
+  # For coverage
+  - ps: (get-content package.json) | %{$_ -replace '"\*"',''} | set-content package.json
+
 
 test_script:
-  - npm run test --silent
+  - npm test --silent
+
+after_test:
+  - ps: |
+      $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
+      Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+      bash codecov.sh

src/commands.ts

@@ -170,9 +170,14 @@ export class SvnCommands implements IDisposable {
     return result;
   }
 
+  @command("svn._getModel")
+  getModel() {
+    return this.model;
+  }
+
   @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/extension.ts

@@ -19,6 +19,7 @@ import {
 async function init(context: ExtensionContext, disposables: Disposable[]) {
   const outputChannel = window.createOutputChannel("Svn");
   disposables.push(outputChannel);
+  outputChannel.show();
 
   const config = workspace.getConfiguration("svn");
   const enabled = config.get<boolean>("enabled") === true;
@@ -71,17 +72,15 @@ async function init(context: ExtensionContext, disposables: Disposable[]) {
   );
 }
 
-function activate(context: ExtensionContext): any {
+export async function activate(context: ExtensionContext) {
   const disposables: Disposable[] = [];
   context.subscriptions.push(
     new Disposable(() => Disposable.from(...disposables).dispose())
   );
 
-  init(context, disposables).catch(err => console.error(err));
+  await init(context, disposables).catch(err => console.error(err));
 }
 
-exports.activate = activate;
-
 // this method is called when your extension is deactivated
 function deactivate() {}
 exports.deactivate = deactivate;

src/model.ts

@@ -237,7 +237,9 @@ export class Model implements IDisposable {
 
   getRepository(hint: any) {
     const liveRepository = this.getOpenRepository(hint);
-    return liveRepository && liveRepository.repository;
+    if (liveRepository && liveRepository.repository) {
+      return liveRepository.repository;
+    }
   }
 
   getOpenRepository(hint: any): OpenRepository | undefined {

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/repository.test.ts

@@ -12,7 +12,7 @@ import * as fs from "fs";
 import * as path from "path";
 import * as vscode from "vscode";
 import * as testUtil from "./testUtil";
-import { Uri } from "vscode";
+import { Uri, commands, workspace, window } from "vscode";
 import { Svn } from "../svn";
 import { Model } from "../model";
 import { SvnFinder, ISvn } from "../svnFinder";
@@ -22,9 +22,6 @@ import { Repository } from "../repository";
 suite("Repository Tests", () => {
   let repoUri: Uri;
   let checkoutDir: Uri;
-  let svnFinder: SvnFinder;
-  let info: ISvn;
-  let svn: Svn;
   let model: Model;
 
   suiteSetup(async () => {
@@ -36,24 +33,23 @@ suite("Repository Tests", () => {
       testUtil.getSvnUrl(repoUri) + "/trunk"
     );
 
-    svnFinder = new SvnFinder();
-    info = await svnFinder.findSvn();
-    svn = new Svn({ svnPath: info.path, version: info.version });
-    model = new Model(svn);
-    await model.tryOpenRepository(checkoutDir.fsPath);
+    model = (await commands.executeCommand(
+      "svn._getModel",
+      checkoutDir
+    )) as Model;
   });
 
   suiteTeardown(() => {
+    model.openRepositories.forEach(repository => repository.dispose());
     testUtil.destroyAllTempPaths();
   });
 
-  test("Find Repository", async () => {
-    assert.ok(info);
-    assert.ok(info.path);
-    assert.ok(info.version);
+  test("Empty Open Repository", async function() {
+    assert.equal(model.repositories.length, 0);
   });
 
   test("Try Open Repository", async function() {
+    await model.tryOpenRepository(checkoutDir.fsPath);
     assert.equal(model.repositories.length, 1);
   });
 
@@ -102,13 +98,14 @@ suite("Repository Tests", () => {
 
     fs.writeFileSync(file, "test");
 
+    const document = await workspace.openTextDocument(file);
+    await window.showTextDocument(document);
+
     await repository.addFiles([file]);
 
     assert.equal(repository.changes.resourceStates.length, 1);
 
-    const message = await repository.commitFiles("First Commit", [
-      file
-    ]);
+    const message = await repository.commitFiles("First Commit", [file]);
     assert.ok(/Committed revision (.*)\./i.test(message));
 
     assert.equal(repository.changes.resourceStates.length, 0);