Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tyriar/integration_test

Browse Source
This commit is contained in:
Daniel Imms
2019-10-31 11:28:31 -07:00
parent fe2e842fee 001d39229f
commit 82c348326c
351 changed files with 4828 additions and 3682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
extensions/vscode-api-tests/src/singlefolder-tests/env.test.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { env, extensions, ExtensionKind, UIKind } from 'vscode';
import { env, extensions, ExtensionKind, UIKind, Uri } from 'vscode';
suite('env-namespace', () => {
@@ -45,8 +45,29 @@ suite('env-namespace', () => {
}
});
test('env.uiKind', function () {
test('env.uiKind', async function () {
const uri = Uri.parse(`${env.uriScheme}:://vscode.vscode-api-tests/path?key=value&other=false`);
const result = await env.asExternalUri(uri);
const kind = env.uiKind;
assert.equal(kind, UIKind.Desktop);
if (result.scheme === 'http' || result.scheme === 'https') {
assert.equal(kind, UIKind.Web);
} else {
assert.equal(kind, UIKind.Desktop);
}
});
test('env.asExternalUri - with env.uriScheme', async function () {
const uri = Uri.parse(`${env.uriScheme}:://vscode.vscode-api-tests/path?key=value&other=false`);
const result = await env.asExternalUri(uri);
assert.ok(result);
if (env.uiKind === UIKind.Desktop) {
assert.equal(uri.scheme, result.scheme);
assert.equal(uri.authority, result.authority);
assert.equal(uri.path, result.path);
} else {
assert.ok(result.scheme === 'http' || result.scheme === 'https');
}
});
});

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

@@ -194,6 +194,7 @@ suite('window namespace tests', () => {
disposables.push(window.onDidOpenTerminal(e => openEvents.push(e.name)));
let resolveOnceDataWritten: (() => void) | undefined;
let resolveOnceClosed: (() => void) | undefined;
disposables.push(window.onDidWriteTerminalData(e => {
dataEvents.push({ name: e.terminal.name, data: e.data });
@@ -203,7 +204,6 @@ suite('window namespace tests', () => {
disposables.push(window.onDidCloseTerminal(e => {
closeEvents.push(e.name);
try {
if (closeEvents.length === 1) {
deepEqual(openEvents, ['test1']);
@@ -213,8 +213,8 @@ suite('window namespace tests', () => {
deepEqual(openEvents, ['test1', 'test2']);
deepEqual(dataEvents, [{ name: 'test1', data: 'write1' }, { name: 'test2', data: 'write2' }]);
deepEqual(closeEvents, ['test1', 'test2']);
done();
}
resolveOnceClosed!();
} catch (e) {
done(e);
}
@@ -222,34 +222,47 @@ suite('window namespace tests', () => {
const term1Write = new EventEmitter<string>();
const term1Close = new EventEmitter<void>();
window.createTerminal({ name: 'test1', pty: {
onDidWrite: term1Write.event,
onDidClose: term1Close.event,
open: async () => {
term1Write.fire('write1');
window.createTerminal({
name: 'test1', pty: {
onDidWrite: term1Write.event,
onDidClose: term1Close.event,
open: async () => {
term1Write.fire('write1');
// Wait until the data is written
await new Promise(resolve => { resolveOnceDataWritten = resolve; });
term1Close.fire();
// Wait until the data is written
await new Promise(resolve => { resolveOnceDataWritten = resolve; });
const term2Write = new EventEmitter<string>();
const term2Close = new EventEmitter<void>();
window.createTerminal({ name: 'test2', pty: {
onDidWrite: term2Write.event,
onDidClose: term2Close.event,
open: async () => {
term2Write.fire('write2');
term1Close.fire();
// Wait until the data is written
await new Promise<void>(resolve => { resolveOnceDataWritten = resolve; });
// Wait until the terminal is closed
await new Promise<void>(resolve => { resolveOnceClosed = resolve; });
term2Close.fire();
},
close: () => { }
}});
},
close: () => { }
}});
const term2Write = new EventEmitter<string>();
const term2Close = new EventEmitter<void>();
window.createTerminal({
name: 'test2', pty: {
onDidWrite: term2Write.event,
onDidClose: term2Close.event,
open: async () => {
term2Write.fire('write2');
// Wait until the data is written
await new Promise<void>(resolve => { resolveOnceDataWritten = resolve; });
term2Close.fire();
// Wait until the terminal is closed
await new Promise<void>(resolve => { resolveOnceClosed = resolve; });
done();
},
close: () => { }
}
});
},
close: () => { }
}
});
});
});