Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add api tests for env var collections

Browse Source 
This does not cover the persisted case
This commit is contained in:
Daniel Imms
2020-03-27 09:30:32 -07:00
parent 3cfb4f064b
commit fc0712520f
2 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
View File

@@ -533,5 +533,91 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
}
});
});
suite('getEnvironmentVariableCollection', () => {
test('should have collection variables apply to terminals immediately after setting', (done) => {
// Text to match on before passing the test
const expectedText = [
'~a2~',
'b1~b2~',
'~c2~c1'
];
disposables.push(window.onDidWriteTerminalData(e => {
try {
equal(terminal, e.terminal);
} catch (e) {
done(e);
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
expectedText.shift();
// Check if all string are found, if so finish the test
if (expectedText.length === 0) {
disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose();
}
}
}));
const collection = window.getEnvironmentVariableCollection();
disposables.push(collection);
collection.replace('A', '~a2~');
collection.append('B', '~b2~');
collection.prepend('C', '~c2~');
const isWindows = process.platform === 'win32';
const terminal = window.createTerminal({
shellPath: isWindows ? 'powershell.exe' : 'sh',
env: {
A: 'a1',
B: 'b1',
C: 'c1'
}
});
terminal.sendText(isWindows ? '$env:A' : 'echo $A');
terminal.sendText(isWindows ? '$env:B' : 'echo $B');
terminal.sendText(isWindows ? '$env:C' : 'echo $C');
});
test('should have collection variables apply to environment variables that don\'t exist', (done) => {
// Text to match on before passing the test
const expectedText = [
'~a2~',
'~b2~',
'~c2~'
];
disposables.push(window.onDidWriteTerminalData(e => {
try {
equal(terminal, e.terminal);
} catch (e) {
done(e);
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
expectedText.shift();
// Check if all string are found, if so finish the test
if (expectedText.length === 0) {
disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose();
}
}
}));
const collection = window.getEnvironmentVariableCollection();
disposables.push(collection);
collection.replace('A', '~a2~');
collection.append('B', '~b2~');
collection.prepend('C', '~c2~');
const isWindows = process.platform === 'win32';
const terminal = window.createTerminal({
shellPath: isWindows ? 'powershell.exe' : 'sh',
env: {
A: null,
B: null,
C: null
}
});
terminal.sendText(isWindows ? '$env:A' : 'echo $A');
terminal.sendText(isWindows ? '$env:B' : 'echo $B');
terminal.sendText(isWindows ? '$env:C' : 'echo $C');
});
});
});
});

11
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -48,17 +48,6 @@ export class ExtHostTerminalService extends BaseExtHostTerminalService {
this._updateLastActiveWorkspace();
this._updateVariableResolver();
this._registerListeners();
setTimeout(() => {
const c = this.getEnvironmentVariableCollection({ identifier: { value: 'test' } } as any, true);
c.prepend('a', 'b');
c.replace('c', 'd');
c.append('e', 'f');
}, 2000);
setTimeout(() => {
const c = this.getEnvironmentVariableCollection({ identifier: { value: 'test' } } as any, true);
c.prepend('a', 'late addition');
}, 4000);
}
public createTerminal(name?: string, shellPath?: string, shellArgs?: string[] | string): vscode.Terminal {