Merge pull request #3 from badsyntax/windows-tests

Windows tests

Author: badsyntax

src/extension.ts

@@ -71,6 +71,12 @@ export async function activate(context: ExtensionContext) {
   );
 
   commands.executeCommand('setContext', 'gradleTasksExtensionActive', true);
+
+  return {
+    api: {
+      TaskRegistry
+    }
+  };
 }
 
 // this method is called when your extension is deactivated

src/test/gradle/extension.test.ts

@@ -1,8 +1,6 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
 
-import TaskRegistry from '../../TaskRegistry';
-
 suite('With build.grade Extension Test Suite', () => {
   test('it should be present', () => {
     assert.ok(vscode.extensions.getExtension('richardwillis.vscode-gradle'));
@@ -18,7 +16,13 @@ suite('With build.grade Extension Test Suite', () => {
   });
 
   test('it should load tasks', () => {
-    assert.equal(TaskRegistry.getTasks().length > 0, true);
+    const extension = vscode.extensions.getExtension(
+      'richardwillis.vscode-gradle'
+    );
+    if (extension) {
+      const tasks = extension.exports.api.TaskRegistry.getTasks();
+      assert.equal(tasks.length > 0, true);
+    }
   });
 
   test('it should successfully run a task', () => {
@@ -32,8 +36,14 @@ suite('With build.grade Extension Test Suite', () => {
   });
 
   test('it should refresh tasks', async () => {
-    TaskRegistry.clear();
-    await vscode.commands.executeCommand('gradle:refresh');
-    assert.equal(TaskRegistry.getTasks().length > 0, true);
+    const extension = vscode.extensions.getExtension(
+      'richardwillis.vscode-gradle'
+    );
+    if (extension) {
+      const { TaskRegistry } = extension.exports.api;
+      TaskRegistry.clear();
+      await vscode.commands.executeCommand('gradle:refresh');
+      assert.equal(TaskRegistry.getTasks().length > 0, true);
+    }
   });
 });

src/test/runTest.ts

@@ -2,27 +2,36 @@ import * as path from 'path';
 
 import { runTests } from 'vscode-test';
 
-async function main() {
-  try {
-    const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+const extensionDevelopmentPath = path.resolve(__dirname, '../../');
 
-    await runTests({
-      extensionDevelopmentPath,
-      extensionTestsPath: path.resolve(__dirname, './gradle'),
-      launchArgs: [
-        path.resolve(__dirname, '../../test-fixtures/gradle'),
-        '--disable-extensions'
-      ]
-    });
+async function runTestsWithGradleWorkspace() {
+  const fixtureName =
+    process.platform === 'win32' ? 'gradle-windows' : 'gradle';
+  await runTests({
+    extensionDevelopmentPath,
+    extensionTestsPath: path.resolve(__dirname, './gradle'),
+    launchArgs: [
+      path.resolve(__dirname, `../../test-fixtures/${fixtureName}`),
+      '--disable-extensions'
+    ]
+  });
+}
 
-    await runTests({
-      extensionDevelopmentPath,
-      extensionTestsPath: path.resolve(__dirname, './no-gradle'),
-      launchArgs: [
-        path.resolve(__dirname, '../../test-fixtures/no-gradle'),
-        '--disable-extensions'
-      ]
-    });
+async function runTestsWithoutGradleWorkspace() {
+  await runTests({
+    extensionDevelopmentPath,
+    extensionTestsPath: path.resolve(__dirname, './no-gradle'),
+    launchArgs: [
+      path.resolve(__dirname, '../../test-fixtures/no-gradle'),
+      '--disable-extensions'
+    ]
+  });
+}
+
+async function main() {
+  try {
+    await runTestsWithGradleWorkspace();
+    // await runTestsWithoutGradleWorkspace();
   } catch (err) {
     console.error('Failed to run tests');
     process.exit(1);