Create python file with random names for testing refactoring (#966)

Fixes #964

Author: DonJayamanne

src/test/common/process/proc.observable.test.ts

@@ -5,6 +5,7 @@ import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { CancellationTokenSource } from 'vscode';
 import { PythonSettings } from '../../../client/common/configSettings';
+import { createDeferred } from '../../../client/common/helpers';
 import { BufferDecoder } from '../../../client/common/process/decoder';
 import { ProcessService } from '../../../client/common/process/proc';
 import { initialize } from './../../initialize';
@@ -85,17 +86,27 @@ suite('ProcessService', () => {
         const cancellationToken = new CancellationTokenSource();
         const result = procService.execObservable(pythonPath, ['-c', pythonCode.join(';')], { token: cancellationToken.token });
 
+        const def = createDeferred();
+        def.promise.then(done).catch(done);
         expect(result).not.to.be.an('undefined', 'result is undefined');
         result.out.subscribe(output => {
             const value = output.out.trim();
             if (value === '1') {
                 cancellationToken.cancel();
             } else {
-                done('Output received when we shouldn\'t have.');
+                if (!def.completed) {
+                    def.reject('Output received when we shouldn\'t have.');
+                }
             }
         }, done, () => {
-            const errorMsg = cancellationToken.token.isCancellationRequested ? undefined : 'Program terminated even before cancelling it.';
-            done(errorMsg);
+            if (def.completed) {
+                return;
+            }
+            if (cancellationToken.token.isCancellationRequested) {
+                def.resolve();
+            } else {
+                def.reject('Program terminated even before cancelling it.');
+            }
         });
     });
 

src/test/initialize.ts

@@ -43,13 +43,6 @@ export async function initializeTest(): Promise<any> {
     PythonSettings.dispose();
 }
 
-export async function wait(timeoutMilliseconds: number) {
-    return new Promise(resolve => {
-        // tslint:disable-next-line:no-string-based-set-timeout
-        setTimeout(resolve, timeoutMilliseconds);
-    });
-}
-
 export async function closeActiveWindows(): Promise<void> {
     return new Promise<void>((resolve, reject) => vscode.commands.executeCommand('workbench.action.closeAllEditors')
         // tslint:disable-next-line:no-unnecessary-callback-wrapper

src/test/refactor/extension.refactor.extract.method.test.ts

@@ -1,4 +1,4 @@
-// tslint:disable:interface-name no-any max-func-body-length estrict-plus-operands
+// tslint:disable:interface-name no-any max-func-body-length estrict-plus-operands no-empty
 
 import * as assert from 'assert';
 import * as fs from 'fs-extra';
@@ -10,12 +10,12 @@ import { getTextEditsFromPatch } from '../../client/common/editor';
 import { extractMethod } from '../../client/providers/simpleRefactorProvider';
 import { RefactorProxy } from '../../client/refactor/proxy';
 import { UnitTestIocContainer } from '../unittests/serviceRegistry';
-import { closeActiveWindows, initialize, initializeTest, wait } from './../initialize';
+import { closeActiveWindows, initialize, initializeTest } from './../initialize';
 import { MockOutputChannel } from './../mockClasses';
 
 const EXTENSION_DIR = path.join(__dirname, '..', '..', '..');
 const refactorSourceFile = path.join(__dirname, '..', '..', '..', 'src', 'test', 'pythonFiles', 'refactoring', 'standAlone', 'refactor.py');
-const refactorTargetFile = path.join(__dirname, '..', '..', '..', 'out', 'test', 'pythonFiles', 'refactoring', 'standAlone', 'refactor.py');
+const refactorTargetFileDir = path.join(__dirname, '..', '..', '..', 'out', 'test', 'pythonFiles', 'refactoring', 'standAlone');
 
 interface RenameResponse {
     results: [{ diff: string }];
@@ -25,31 +25,27 @@ suite('Method Extraction', () => {
     // Hack hac hack
     const oldExecuteCommand = vscode.commands.executeCommand;
     const options: vscode.TextEditorOptions = { cursorStyle: vscode.TextEditorCursorStyle.Line, insertSpaces: true, lineNumbers: vscode.TextEditorLineNumbersStyle.Off, tabSize: 4 };
-
+    let refactorTargetFile = '';
     let ioc: UnitTestIocContainer;
-    suiteSetup(async () => {
-        fs.copySync(refactorSourceFile, refactorTargetFile, { overwrite: true });
-        await initialize();
-        initializeDI();
-    });
+    suiteSetup(initialize);
     suiteTeardown(() => {
         vscode.commands.executeCommand = oldExecuteCommand;
         return closeActiveWindows();
     });
     setup(async () => {
-        if (fs.existsSync(refactorTargetFile)) {
-            await wait(500);
-            fs.unlinkSync(refactorTargetFile);
-        }
+        initializeDI();
+        refactorTargetFile = path.join(refactorTargetFileDir, `refactor${new Date().getTime()}.py`);
         fs.copySync(refactorSourceFile, refactorTargetFile, { overwrite: true });
         await initializeTest();
         (<any>vscode).commands.executeCommand = (cmd) => Promise.resolve();
     });
-    teardown(() => {
+    teardown(async () => {
         vscode.commands.executeCommand = oldExecuteCommand;
-        return closeActiveWindows();
+        try {
+            await fs.unlink(refactorTargetFile);
+        } catch { }
+        await closeActiveWindows();
     });
-
     function initializeDI() {
         ioc = new UnitTestIocContainer();
         ioc.registerCommonTypes();

src/test/refactor/extension.refactor.extract.var.test.ts

@@ -1,4 +1,4 @@
-// tslint:disable:interface-name no-any max-func-body-length estrict-plus-operands
+// tslint:disable:interface-name no-any max-func-body-length estrict-plus-operands no-empty
 
 import * as assert from 'assert';
 import * as fs from 'fs-extra';
@@ -10,12 +10,12 @@ import { getTextEditsFromPatch } from '../../client/common/editor';
 import { extractVariable } from '../../client/providers/simpleRefactorProvider';
 import { RefactorProxy } from '../../client/refactor/proxy';
 import { UnitTestIocContainer } from '../unittests/serviceRegistry';
-import { closeActiveWindows, initialize, initializeTest, IS_CI_SERVER, wait } from './../initialize';
+import { closeActiveWindows, initialize, initializeTest, IS_CI_SERVER } from './../initialize';
 import { MockOutputChannel } from './../mockClasses';
 
 const EXTENSION_DIR = path.join(__dirname, '..', '..', '..');
 const refactorSourceFile = path.join(__dirname, '..', '..', '..', 'src', 'test', 'pythonFiles', 'refactoring', 'standAlone', 'refactor.py');
-const refactorTargetFile = path.join(__dirname, '..', '..', '..', 'out', 'test', 'pythonFiles', 'refactoring', 'standAlone', 'refactor.py');
+const refactorTargetFileDir = path.join(__dirname, '..', '..', '..', 'out', 'test', 'pythonFiles', 'refactoring', 'standAlone');
 
 interface RenameResponse {
     results: [{ diff: string }];
@@ -25,28 +25,26 @@ suite('Variable Extraction', () => {
     // Hack hac hack
     const oldExecuteCommand = vscode.commands.executeCommand;
     const options: vscode.TextEditorOptions = { cursorStyle: vscode.TextEditorCursorStyle.Line, insertSpaces: true, lineNumbers: vscode.TextEditorLineNumbersStyle.Off, tabSize: 4 };
+    let refactorTargetFile = '';
     let ioc: UnitTestIocContainer;
-    suiteSetup(async () => {
-        fs.copySync(refactorSourceFile, refactorTargetFile, { overwrite: true });
-        await initialize();
-    });
+    suiteSetup(initialize);
     suiteTeardown(() => {
         vscode.commands.executeCommand = oldExecuteCommand;
         return closeActiveWindows();
     });
     setup(async () => {
         initializeDI();
-        if (fs.existsSync(refactorTargetFile)) {
-            await wait(500);
-            fs.unlinkSync(refactorTargetFile);
-        }
+        refactorTargetFile = path.join(refactorTargetFileDir, `refactor${new Date().getTime()}.py`);
         fs.copySync(refactorSourceFile, refactorTargetFile, { overwrite: true });
         await initializeTest();
         (<any>vscode).commands.executeCommand = (cmd) => Promise.resolve();
     });
-    teardown(() => {
+    teardown(async () => {
         vscode.commands.executeCommand = oldExecuteCommand;
-        return closeActiveWindows();
+        try {
+            await fs.unlink(refactorTargetFile);
+        } catch { }
+        await closeActiveWindows();
     });
 
     function initializeDI() {