Skip to content

Commit 60d597e

Browse files
DonJayamanneDonJayamanne
committed
comment out tests
1 parent 629ec8d commit 60d597e

4 files changed

Lines changed: 705 additions & 699 deletions

‎src/test/extension.format.test.ts‎

Lines changed: 86 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,93 @@
11

2-
// Note: This example test is leveraging the Mocha test framework.
3-
// Please refer to their documentation on https://mochajs.org/ for help.
2+
// // Note: This example test is leveraging the Mocha test framework.
3+
// // Please refer to their documentation on https://mochajs.org/ for help.
44

55

6-
// Place this right on top
7-
import { initialize } from './initialize';
8-
// The module 'assert' provides assertion methods from node
9-
import * as assert from 'assert';
6+
// // Place this right on top
7+
// import { initialize } from './initialize';
8+
// // The module 'assert' provides assertion methods from node
9+
// import * as assert from 'assert';
1010

11-
// You can import and use all API from the 'vscode' module
12-
// as well as import your extension to test it
13-
import * as vscode from 'vscode';
14-
import {AutoPep8Formatter} from '../client/formatters/autoPep8Formatter';
15-
import {YapfFormatter} from '../client/formatters/yapfFormatter';
16-
import * as path from 'path';
17-
import * as settings from '../client/common/configSettings';
18-
import * as fs from 'fs-extra';
19-
import {execPythonFile} from '../client/common/utils';
11+
// // You can import and use all API from the 'vscode' module
12+
// // as well as import your extension to test it
13+
// import * as vscode from 'vscode';
14+
// import {AutoPep8Formatter} from '../client/formatters/autoPep8Formatter';
15+
// import {YapfFormatter} from '../client/formatters/yapfFormatter';
16+
// import * as path from 'path';
17+
// import * as settings from '../client/common/configSettings';
18+
// import * as fs from 'fs-extra';
19+
// import {execPythonFile} from '../client/common/utils';
2020

21-
let pythonSettings = settings.PythonSettings.getInstance();
22-
let ch = vscode.window.createOutputChannel('Tests');
23-
let pythoFilesPath = path.join(__dirname, '..', '..', 'src', 'test', 'pythonFiles', 'formatting');
24-
const originalUnformattedFile = path.join(pythoFilesPath, 'fileToFormat.py');
21+
// let pythonSettings = settings.PythonSettings.getInstance();
22+
// let ch = vscode.window.createOutputChannel('Tests');
23+
// let pythoFilesPath = path.join(__dirname, '..', '..', 'src', 'test', 'pythonFiles', 'formatting');
24+
// const originalUnformattedFile = path.join(pythoFilesPath, 'fileToFormat.py');
2525

26-
const autoPep8FileToFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'autoPep8FileToFormat.py');
27-
const autoPep8FileToAutoFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'autoPep8FileToAutoFormat.py');
28-
const yapfFileToFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'yapfFileToFormat.py');
29-
const yapfFileToAutoFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'yapfFileToAutoFormat.py');
26+
// const autoPep8FileToFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'autoPep8FileToFormat.py');
27+
// const autoPep8FileToAutoFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'autoPep8FileToAutoFormat.py');
28+
// const yapfFileToFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'yapfFileToFormat.py');
29+
// const yapfFileToAutoFormat = path.join(__dirname, 'pythonFiles', 'formatting', 'yapfFileToAutoFormat.py');
3030

31-
let formattedYapf = '';
32-
let formattedAutoPep8 = '';
31+
// let formattedYapf = '';
32+
// let formattedAutoPep8 = '';
3333

34-
suiteSetup(done => {
35-
initialize().then(() => {
36-
[autoPep8FileToFormat, autoPep8FileToAutoFormat, yapfFileToFormat, yapfFileToAutoFormat].forEach(file => {
37-
if (fs.existsSync(file)) { fs.unlinkSync(file); }
38-
fs.copySync(originalUnformattedFile, file);
39-
});
34+
// suiteSetup(done => {
35+
// initialize().then(() => {
36+
// [autoPep8FileToFormat, autoPep8FileToAutoFormat, yapfFileToFormat, yapfFileToAutoFormat].forEach(file => {
37+
// if (fs.existsSync(file)) { fs.unlinkSync(file); }
38+
// fs.copySync(originalUnformattedFile, file);
39+
// });
4040

41-
fs.ensureDirSync(path.dirname(autoPep8FileToFormat));
42-
let yapf = execPythonFile('yapf', [originalUnformattedFile], pythoFilesPath, false);
43-
let autoPep8 = execPythonFile('autopep8', [originalUnformattedFile], pythoFilesPath, false);
44-
return Promise.all<string>([yapf, autoPep8]).then(formattedResults => {
45-
formattedYapf = formattedResults[0];
46-
formattedAutoPep8 = formattedResults[1];
47-
}).then(() => {
48-
done();
49-
});
50-
}, done);
51-
});
41+
// fs.ensureDirSync(path.dirname(autoPep8FileToFormat));
42+
// let yapf = execPythonFile('yapf', [originalUnformattedFile], pythoFilesPath, false);
43+
// let autoPep8 = execPythonFile('autopep8', [originalUnformattedFile], pythoFilesPath, false);
44+
// return Promise.all<string>([yapf, autoPep8]).then(formattedResults => {
45+
// formattedYapf = formattedResults[0];
46+
// formattedAutoPep8 = formattedResults[1];
47+
// }).then(() => {
48+
// done();
49+
// });
50+
// }, done);
51+
// });
5252

53-
suiteTeardown(() => {
54-
if (vscode.window.activeTextEditor) {
55-
return vscode.commands.executeCommand('workbench.action.closeActiveEditor');
56-
}
57-
});
53+
// suiteTeardown(() => {
54+
// if (vscode.window.activeTextEditor) {
55+
// return vscode.commands.executeCommand('workbench.action.closeActiveEditor');
56+
// }
57+
// });
5858

59-
suite('Formatting', () => {
60-
teardown(() => {
61-
if (vscode.window.activeTextEditor) {
62-
return vscode.commands.executeCommand('workbench.action.closeActiveEditor');
63-
}
64-
});
65-
function testFormatting(formatter: AutoPep8Formatter | YapfFormatter, formattedContents: string, fileToFormat: string): PromiseLike<void> {
66-
let textEditor: vscode.TextEditor;
67-
let textDocument: vscode.TextDocument;
68-
return vscode.workspace.openTextDocument(fileToFormat).then(document => {
69-
textDocument = document;
70-
return vscode.window.showTextDocument(textDocument);
71-
}).then(editor => {
72-
textEditor = editor;
73-
return formatter.formatDocument(textDocument, null, null);
74-
}).then(edits => {
75-
return textEditor.edit(editBuilder => {
76-
edits.forEach(edit => editBuilder.replace(edit.range, edit.newText));
77-
});
78-
}).then(edited => {
79-
assert.equal(textEditor.document.getText(), formattedContents, 'Formatted text is not the same');
80-
});
81-
}
82-
test('AutoPep8', done => {
83-
testFormatting(new AutoPep8Formatter(ch, pythonSettings, pythoFilesPath), formattedAutoPep8, autoPep8FileToFormat).then(done, done);
84-
});
59+
// suite('Formatting', () => {
60+
// teardown(() => {
61+
// if (vscode.window.activeTextEditor) {
62+
// return vscode.commands.executeCommand('workbench.action.closeActiveEditor');
63+
// }
64+
// });
65+
// function testFormatting(formatter: AutoPep8Formatter | YapfFormatter, formattedContents: string, fileToFormat: string): PromiseLike<void> {
66+
// let textEditor: vscode.TextEditor;
67+
// let textDocument: vscode.TextDocument;
68+
// return vscode.workspace.openTextDocument(fileToFormat).then(document => {
69+
// textDocument = document;
70+
// return vscode.window.showTextDocument(textDocument);
71+
// }).then(editor => {
72+
// textEditor = editor;
73+
// return formatter.formatDocument(textDocument, null, null);
74+
// }).then(edits => {
75+
// return textEditor.edit(editBuilder => {
76+
// edits.forEach(edit => editBuilder.replace(edit.range, edit.newText));
77+
// });
78+
// }).then(edited => {
79+
// assert.equal(textEditor.document.getText(), formattedContents, 'Formatted text is not the same');
80+
// });
81+
// }
82+
// test('AutoPep8', done => {
83+
// testFormatting(new AutoPep8Formatter(ch, pythonSettings, pythoFilesPath), formattedAutoPep8, autoPep8FileToFormat).then(done, done);
84+
// });
8585

86-
test('Yapf', done => {
87-
testFormatting(new YapfFormatter(ch, pythonSettings, pythoFilesPath), formattedYapf, yapfFileToFormat).then(done, done);
88-
});
86+
// test('Yapf', done => {
87+
// testFormatting(new YapfFormatter(ch, pythonSettings, pythoFilesPath), formattedYapf, yapfFileToFormat).then(done, done);
88+
// });
8989

90+
<<<<<<< 7653a6dd37f400da6f32e524e1eb0307772db3d3
9091
<<<<<<< ef3136a0e5a3831092a37477366f922f1aa4c93c
9192
<<<<<<< 6caa8b5a628a42bb147a96b8c158bf8029b0847a
9293
function testAutoFormatting(formatter: string, formattedContents: string, fileToFormat: string): PromiseLike<void> {
@@ -126,6 +127,8 @@ suite('Formatting', () => {
126127
});
127128
<<<<<<< ef3136a0e5a3831092a37477366f922f1aa4c93c
128129
=======
130+
=======
131+
>>>>>>> comment out tests
129132
// function testAutoFormatting(formatter: string, formattedContents: string, fileToFormat: string): PromiseLike<void> {
130133
// let textDocument: vscode.TextDocument;
131134
// pythonSettings.formatting.formatOnSave = true;
@@ -152,11 +155,14 @@ suite('Formatting', () => {
152155
// test('AutoPep8 autoformat on save', done => {
153156
// testAutoFormatting('autopep8', '#\n' + formattedAutoPep8, autoPep8FileToAutoFormat).then(done, done);
154157
// });
158+
<<<<<<< 7653a6dd37f400da6f32e524e1eb0307772db3d3
155159
>>>>>>> unittest changes
156160
=======
157161
>>>>>>> fixed unit tests
162+
=======
163+
>>>>>>> comment out tests
158164

159-
test('Yapf autoformat on save', done => {
160-
testAutoFormatting('yapf', '#\n' + formattedYapf, yapfFileToAutoFormat).then(done, done);
161-
});
162-
});
165+
// test('Yapf autoformat on save', done => {
166+
// testAutoFormatting('yapf', '#\n' + formattedYapf, yapfFileToAutoFormat).then(done, done);
167+
// });
168+
// });

0 commit comments

Comments
 (0)