@theia/test 1.45.0 → 1.46.0-next.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/constants.d.ts +45 -45
- package/lib/browser/constants.js +17 -17
- package/lib/browser/test-service.d.ts +154 -154
- package/lib/browser/test-service.js +247 -247
- package/lib/browser/view/test-context-key-service.d.ts +7 -7
- package/lib/browser/view/test-context-key-service.js +51 -51
- package/lib/browser/view/test-execution-state-manager.d.ts +13 -13
- package/lib/browser/view/test-execution-state-manager.js +173 -173
- package/lib/browser/view/test-output-ui-model.d.ts +47 -47
- package/lib/browser/view/test-output-ui-model.js +151 -151
- package/lib/browser/view/test-output-view-contribution.d.ts +5 -5
- package/lib/browser/view/test-output-view-contribution.js +47 -47
- package/lib/browser/view/test-output-widget.d.ts +24 -24
- package/lib/browser/view/test-output-widget.js +158 -158
- package/lib/browser/view/test-result-view-contribution.d.ts +5 -5
- package/lib/browser/view/test-result-view-contribution.js +47 -47
- package/lib/browser/view/test-result-widget.d.ts +20 -20
- package/lib/browser/view/test-result-widget.js +108 -108
- package/lib/browser/view/test-run-view-contribution.d.ts +17 -17
- package/lib/browser/view/test-run-view-contribution.js +100 -100
- package/lib/browser/view/test-run-widget.d.ts +58 -58
- package/lib/browser/view/test-run-widget.js +310 -310
- package/lib/browser/view/test-tree-widget.d.ts +67 -67
- package/lib/browser/view/test-tree-widget.js +386 -386
- package/lib/browser/view/test-view-contribution.d.ts +45 -45
- package/lib/browser/view/test-view-contribution.js +288 -288
- package/lib/browser/view/test-view-frontend-module.d.ts +6 -6
- package/lib/browser/view/test-view-frontend-module.js +121 -121
- package/lib/common/collections.d.ts +46 -46
- package/lib/common/collections.js +210 -210
- package/lib/common/tree-delta.d.ts +51 -51
- package/lib/common/tree-delta.js +240 -240
- package/lib/common/tree-delta.spec.d.ts +1 -1
- package/lib/common/tree-delta.spec.js +139 -139
- package/package.json +8 -8
- package/src/browser/constants.ts +71 -71
- package/src/browser/style/index.css +41 -41
- package/src/browser/test-service.ts +355 -355
- package/src/browser/view/test-context-key-service.ts +36 -36
- package/src/browser/view/test-execution-state-manager.ts +147 -147
- package/src/browser/view/test-output-ui-model.ts +156 -156
- package/src/browser/view/test-output-view-contribution.ts +34 -34
- package/src/browser/view/test-output-widget.ts +148 -148
- package/src/browser/view/test-result-view-contribution.ts +34 -34
- package/src/browser/view/test-result-widget.ts +92 -92
- package/src/browser/view/test-run-view-contribution.ts +89 -89
- package/src/browser/view/test-run-widget.tsx +271 -271
- package/src/browser/view/test-tree-widget.tsx +360 -360
- package/src/browser/view/test-view-contribution.ts +300 -300
- package/src/browser/view/test-view-frontend-module.ts +134 -134
- package/src/common/collections.ts +223 -223
- package/src/common/tree-delta.spec.ts +166 -166
- package/src/common/tree-delta.ts +259 -259
|
@@ -1,311 +1,311 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2023 STMicroelectronics and others.
|
|
4
|
-
//
|
|
5
|
-
// This program and the accompanying materials are made available under the
|
|
6
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
-
//
|
|
9
|
-
// This Source Code may also be made available under the following Secondary
|
|
10
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
-
// with the GNU Classpath Exception which is available at
|
|
13
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
-
//
|
|
15
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
-
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
-
};
|
|
29
|
-
var TestRunTreeWidget_1;
|
|
30
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
-
exports.TestRunTreeWidget = exports.TestRunTree = void 0;
|
|
32
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
33
|
-
const tree_1 = require("@theia/core/lib/browser/tree");
|
|
34
|
-
const browser_1 = require("@theia/core/lib/browser");
|
|
35
|
-
const icon_theme_service_1 = require("@theia/core/lib/browser/icon-theme-service");
|
|
36
|
-
const theming_1 = require("@theia/core/lib/browser/theming");
|
|
37
|
-
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
38
|
-
const test_service_1 = require("../test-service");
|
|
39
|
-
const React = require("@theia/core/shared/react");
|
|
40
|
-
const core_1 = require("@theia/core");
|
|
41
|
-
const test_execution_state_manager_1 = require("./test-execution-state-manager");
|
|
42
|
-
const test_output_ui_model_1 = require("./test-output-ui-model");
|
|
43
|
-
class TestRunNode {
|
|
44
|
-
constructor(counter, id, run, parent) {
|
|
45
|
-
this.counter = counter;
|
|
46
|
-
this.id = id;
|
|
47
|
-
this.run = run;
|
|
48
|
-
this.parent = parent;
|
|
49
|
-
this.selected = false;
|
|
50
|
-
this.children = [];
|
|
51
|
-
}
|
|
52
|
-
get name() {
|
|
53
|
-
return this.run.name || core_1.nls.localize('theia/test/testRunDefaultName', '{0} run {1}', this.run.controller.label, this.counter);
|
|
54
|
-
}
|
|
55
|
-
;
|
|
56
|
-
}
|
|
57
|
-
class TestItemNode {
|
|
58
|
-
constructor(id, item, parent) {
|
|
59
|
-
this.id = id;
|
|
60
|
-
this.item = item;
|
|
61
|
-
this.parent = parent;
|
|
62
|
-
this.selected = false;
|
|
63
|
-
}
|
|
64
|
-
get name() {
|
|
65
|
-
return this.item.label;
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
let TestRunTree = class TestRunTree extends tree_1.TreeImpl {
|
|
69
|
-
constructor() {
|
|
70
|
-
super(...arguments);
|
|
71
|
-
this.ROOT = {
|
|
72
|
-
id: 'TestResults',
|
|
73
|
-
name: 'Test Results',
|
|
74
|
-
parent: undefined,
|
|
75
|
-
children: [],
|
|
76
|
-
visible: false
|
|
77
|
-
};
|
|
78
|
-
this.controllerListeners = new Map();
|
|
79
|
-
this.runs = new Map();
|
|
80
|
-
this.nextId = 0;
|
|
81
|
-
}
|
|
82
|
-
init() {
|
|
83
|
-
this.root = this.ROOT;
|
|
84
|
-
this.testService.getControllers().forEach(controller => {
|
|
85
|
-
this.addController(controller);
|
|
86
|
-
});
|
|
87
|
-
this.testService.onControllersChanged(controllerDelta => {
|
|
88
|
-
var _a, _b;
|
|
89
|
-
(_a = controllerDelta.removed) === null || _a === void 0 ? void 0 : _a.forEach(controller => {
|
|
90
|
-
var _a;
|
|
91
|
-
(_a = this.controllerListeners.get(controller)) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
92
|
-
});
|
|
93
|
-
(_b = controllerDelta.added) === null || _b === void 0 ? void 0 : _b.forEach(controller => this.addController(controller));
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
addController(controller) {
|
|
97
|
-
controller.testRuns.forEach(run => this.addRun(run));
|
|
98
|
-
const listeners = new core_1.DisposableCollection();
|
|
99
|
-
this.controllerListeners.set(controller.id, listeners);
|
|
100
|
-
listeners.push(controller.onRunsChanged(runDelta => {
|
|
101
|
-
var _a, _b;
|
|
102
|
-
(_a = runDelta.removed) === null || _a === void 0 ? void 0 : _a.forEach(run => {
|
|
103
|
-
var _a;
|
|
104
|
-
(_a = this.runs.get(run)) === null || _a === void 0 ? void 0 : _a.disposable.dispose();
|
|
105
|
-
this.runs.delete(run);
|
|
106
|
-
this.refresh(this.ROOT);
|
|
107
|
-
});
|
|
108
|
-
(_b = runDelta.added) === null || _b === void 0 ? void 0 : _b.forEach(run => {
|
|
109
|
-
this.addRun(run);
|
|
110
|
-
this.refresh(this.ROOT);
|
|
111
|
-
});
|
|
112
|
-
}));
|
|
113
|
-
}
|
|
114
|
-
addRun(run) {
|
|
115
|
-
const newNode = this.createRunNode(run);
|
|
116
|
-
const affected = [];
|
|
117
|
-
const disposables = new core_1.DisposableCollection();
|
|
118
|
-
disposables.push(run.onDidChangeTestState(deltas => {
|
|
119
|
-
let needsRefresh = false;
|
|
120
|
-
deltas.forEach(delta => {
|
|
121
|
-
if (delta.newState) {
|
|
122
|
-
if (delta.newState.state > test_service_1.TestExecutionState.Queued) {
|
|
123
|
-
const testNode = info.tests.get(delta.test);
|
|
124
|
-
if (!testNode) {
|
|
125
|
-
if (info.tests.size === 0) {
|
|
126
|
-
newNode.expanded = true;
|
|
127
|
-
}
|
|
128
|
-
info.tests.set(delta.test, this.createTestItemNode(newNode, delta.test));
|
|
129
|
-
needsRefresh = true;
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
affected.push(testNode);
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
info.tests.delete(delta.test);
|
|
138
|
-
needsRefresh = true;
|
|
139
|
-
}
|
|
140
|
-
});
|
|
141
|
-
if (needsRefresh) {
|
|
142
|
-
this.refresh(newNode);
|
|
143
|
-
}
|
|
144
|
-
else {
|
|
145
|
-
this.onDidUpdateEmitter.fire(affected);
|
|
146
|
-
}
|
|
147
|
-
}));
|
|
148
|
-
disposables.push(run.onDidChangeProperty(() => this.onDidUpdateEmitter.fire([])));
|
|
149
|
-
const info = {
|
|
150
|
-
node: newNode,
|
|
151
|
-
disposable: disposables,
|
|
152
|
-
tests: new Map(run.items.filter(item => { var _a; return (((_a = run.getTestState(item)) === null || _a === void 0 ? void 0 : _a.state) || 0) > test_service_1.TestExecutionState.Queued; }).map(item => [item, this.createTestItemNode(newNode, item)]))
|
|
153
|
-
};
|
|
154
|
-
this.runs.set(run, info);
|
|
155
|
-
}
|
|
156
|
-
createRunNode(run) {
|
|
157
|
-
return new TestRunNode(this.nextId, `id-${this.nextId++}`, run, this.ROOT);
|
|
158
|
-
}
|
|
159
|
-
createTestItemNode(parent, item) {
|
|
160
|
-
return new TestItemNode(`testitem-${this.nextId++}`, item, parent);
|
|
161
|
-
}
|
|
162
|
-
async resolveChildren(parent) {
|
|
163
|
-
if (parent === this.ROOT) {
|
|
164
|
-
return Promise.resolve([...this.runs.values()].reverse().map(info => info.node));
|
|
165
|
-
}
|
|
166
|
-
else if (parent instanceof TestRunNode) {
|
|
167
|
-
const runInfo = this.runs.get(parent.run);
|
|
168
|
-
if (runInfo) {
|
|
169
|
-
return Promise.resolve([...runInfo.tests.values()]);
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
172
|
-
return Promise.resolve([]);
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
else {
|
|
176
|
-
return Promise.resolve([]);
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
};
|
|
180
|
-
__decorate([
|
|
181
|
-
(0, inversify_1.inject)(test_service_1.TestService),
|
|
182
|
-
__metadata("design:type", Object)
|
|
183
|
-
], TestRunTree.prototype, "testService", void 0);
|
|
184
|
-
__decorate([
|
|
185
|
-
(0, inversify_1.postConstruct)(),
|
|
186
|
-
__metadata("design:type", Function),
|
|
187
|
-
__metadata("design:paramtypes", []),
|
|
188
|
-
__metadata("design:returntype", void 0)
|
|
189
|
-
], TestRunTree.prototype, "init", null);
|
|
190
|
-
TestRunTree = __decorate([
|
|
191
|
-
(0, inversify_1.injectable)()
|
|
192
|
-
], TestRunTree);
|
|
193
|
-
exports.TestRunTree = TestRunTree;
|
|
194
|
-
let TestRunTreeWidget = TestRunTreeWidget_1 = class TestRunTreeWidget extends tree_1.TreeWidget {
|
|
195
|
-
constructor(props, model, contextMenuRenderer) {
|
|
196
|
-
super(props, model, contextMenuRenderer);
|
|
197
|
-
this.id = TestRunTreeWidget_1.ID;
|
|
198
|
-
this.title.label = core_1.nls.localize('theia/test/testRuns', 'Test Runs');
|
|
199
|
-
this.title.caption = core_1.nls.localize('theia/test/testRuns', 'Test Runs');
|
|
200
|
-
this.title.iconClass = (0, browser_1.codicon)('run');
|
|
201
|
-
this.title.closable = true;
|
|
202
|
-
}
|
|
203
|
-
init() {
|
|
204
|
-
super.init();
|
|
205
|
-
this.addClass('theia-test-result-view');
|
|
206
|
-
this.model.onSelectionChanged(() => {
|
|
207
|
-
const node = this.model.selectedNodes[0];
|
|
208
|
-
if (node instanceof TestRunNode) {
|
|
209
|
-
this.uiModel.selectedOutputSource = {
|
|
210
|
-
get output() {
|
|
211
|
-
return node.run.getOutput();
|
|
212
|
-
},
|
|
213
|
-
onDidAddTestOutput: core_1.Event.map(node.run.onDidChangeTestOutput, evt => evt.map(item => item[1]))
|
|
214
|
-
};
|
|
215
|
-
}
|
|
216
|
-
else if (node instanceof TestItemNode) {
|
|
217
|
-
this.uiModel.selectedOutputSource = {
|
|
218
|
-
get output() {
|
|
219
|
-
return node.parent.run.getOutput(node.item);
|
|
220
|
-
},
|
|
221
|
-
onDidAddTestOutput: core_1.Event.map(node.parent.run.onDidChangeTestOutput, evt => evt.filter(item => item[0] === node.item).map(item => item[1]))
|
|
222
|
-
};
|
|
223
|
-
this.uiModel.selectedTestState = node.parent.run.getTestState(node.item);
|
|
224
|
-
}
|
|
225
|
-
});
|
|
226
|
-
}
|
|
227
|
-
renderTree(model) {
|
|
228
|
-
if (tree_1.CompositeTreeNode.is(this.model.root) && this.model.root.children.length > 0) {
|
|
229
|
-
return super.renderTree(model);
|
|
230
|
-
}
|
|
231
|
-
return React.createElement("div", { className: 'theia-widget-noInfo noMarkers' }, core_1.nls.localizeByDefault('No tests have been found in this workspace yet.'));
|
|
232
|
-
}
|
|
233
|
-
getTestStateClass(state) {
|
|
234
|
-
switch (state) {
|
|
235
|
-
case test_service_1.TestExecutionState.Queued: return `${(0, browser_1.codicon)('history')} queued`;
|
|
236
|
-
case test_service_1.TestExecutionState.Running: return `${(0, browser_1.codicon)('sync')} codicon-modifier-spin running`;
|
|
237
|
-
case test_service_1.TestExecutionState.Skipped: return `${(0, browser_1.codicon)('debug-step-over')} skipped`;
|
|
238
|
-
case test_service_1.TestExecutionState.Failed: return `${(0, browser_1.codicon)('error')} failed`;
|
|
239
|
-
case test_service_1.TestExecutionState.Errored: return `${(0, browser_1.codicon)('issues')} errored`;
|
|
240
|
-
case test_service_1.TestExecutionState.Passed: return `${(0, browser_1.codicon)('pass')} passed`;
|
|
241
|
-
default: return (0, browser_1.codicon)('circle');
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
renderIcon(node, props) {
|
|
245
|
-
var _a;
|
|
246
|
-
if (node instanceof TestItemNode) {
|
|
247
|
-
const state = (_a = node.parent.run.getTestState(node.item)) === null || _a === void 0 ? void 0 : _a.state;
|
|
248
|
-
return React.createElement("div", { className: this.getTestStateClass(state) });
|
|
249
|
-
}
|
|
250
|
-
else if (node instanceof TestRunNode) {
|
|
251
|
-
const icon = node.run.isRunning ? `${(0, browser_1.codicon)('sync')} codicon-modifier-spin running` : (0, browser_1.codicon)('circle');
|
|
252
|
-
return React.createElement("div", { className: icon });
|
|
253
|
-
}
|
|
254
|
-
else {
|
|
255
|
-
return super.renderIcon(node, props);
|
|
256
|
-
}
|
|
257
|
-
}
|
|
258
|
-
toContextMenuArgs(node) {
|
|
259
|
-
if (node instanceof TestRunNode) {
|
|
260
|
-
return [node.run];
|
|
261
|
-
}
|
|
262
|
-
else if (node instanceof TestItemNode) {
|
|
263
|
-
const item = node.item;
|
|
264
|
-
const executionState = node.parent.run.getTestState(node.item);
|
|
265
|
-
if (test_service_1.TestFailure.is(executionState)) {
|
|
266
|
-
return [item, executionState.messages];
|
|
267
|
-
}
|
|
268
|
-
return [item];
|
|
269
|
-
}
|
|
270
|
-
return [];
|
|
271
|
-
}
|
|
272
|
-
storeState() {
|
|
273
|
-
return {}; // don't store any state for now
|
|
274
|
-
}
|
|
275
|
-
};
|
|
276
|
-
TestRunTreeWidget.ID = 'test-run-widget';
|
|
277
|
-
__decorate([
|
|
278
|
-
(0, inversify_1.inject)(icon_theme_service_1.IconThemeService),
|
|
279
|
-
__metadata("design:type", icon_theme_service_1.IconThemeService)
|
|
280
|
-
], TestRunTreeWidget.prototype, "iconThemeService", void 0);
|
|
281
|
-
__decorate([
|
|
282
|
-
(0, inversify_1.inject)(context_key_service_1.ContextKeyService),
|
|
283
|
-
__metadata("design:type", Object)
|
|
284
|
-
], TestRunTreeWidget.prototype, "contextKeys", void 0);
|
|
285
|
-
__decorate([
|
|
286
|
-
(0, inversify_1.inject)(theming_1.ThemeService),
|
|
287
|
-
__metadata("design:type", theming_1.ThemeService)
|
|
288
|
-
], TestRunTreeWidget.prototype, "themeService", void 0);
|
|
289
|
-
__decorate([
|
|
290
|
-
(0, inversify_1.inject)(test_execution_state_manager_1.TestExecutionStateManager),
|
|
291
|
-
__metadata("design:type", test_execution_state_manager_1.TestExecutionStateManager)
|
|
292
|
-
], TestRunTreeWidget.prototype, "stateManager", void 0);
|
|
293
|
-
__decorate([
|
|
294
|
-
(0, inversify_1.inject)(test_output_ui_model_1.TestOutputUIModel),
|
|
295
|
-
__metadata("design:type", test_output_ui_model_1.TestOutputUIModel)
|
|
296
|
-
], TestRunTreeWidget.prototype, "uiModel", void 0);
|
|
297
|
-
__decorate([
|
|
298
|
-
(0, inversify_1.postConstruct)(),
|
|
299
|
-
__metadata("design:type", Function),
|
|
300
|
-
__metadata("design:paramtypes", []),
|
|
301
|
-
__metadata("design:returntype", void 0)
|
|
302
|
-
], TestRunTreeWidget.prototype, "init", null);
|
|
303
|
-
TestRunTreeWidget = TestRunTreeWidget_1 = __decorate([
|
|
304
|
-
(0, inversify_1.injectable)(),
|
|
305
|
-
__param(0, (0, inversify_1.inject)(tree_1.TreeProps)),
|
|
306
|
-
__param(1, (0, inversify_1.inject)(tree_1.TreeModel)),
|
|
307
|
-
__param(2, (0, inversify_1.inject)(browser_1.ContextMenuRenderer)),
|
|
308
|
-
__metadata("design:paramtypes", [Object, Object, browser_1.ContextMenuRenderer])
|
|
309
|
-
], TestRunTreeWidget);
|
|
310
|
-
exports.TestRunTreeWidget = TestRunTreeWidget;
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2023 STMicroelectronics and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
+
};
|
|
23
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
+
};
|
|
26
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
+
};
|
|
29
|
+
var TestRunTreeWidget_1;
|
|
30
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
|
+
exports.TestRunTreeWidget = exports.TestRunTree = void 0;
|
|
32
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
33
|
+
const tree_1 = require("@theia/core/lib/browser/tree");
|
|
34
|
+
const browser_1 = require("@theia/core/lib/browser");
|
|
35
|
+
const icon_theme_service_1 = require("@theia/core/lib/browser/icon-theme-service");
|
|
36
|
+
const theming_1 = require("@theia/core/lib/browser/theming");
|
|
37
|
+
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
38
|
+
const test_service_1 = require("../test-service");
|
|
39
|
+
const React = require("@theia/core/shared/react");
|
|
40
|
+
const core_1 = require("@theia/core");
|
|
41
|
+
const test_execution_state_manager_1 = require("./test-execution-state-manager");
|
|
42
|
+
const test_output_ui_model_1 = require("./test-output-ui-model");
|
|
43
|
+
class TestRunNode {
|
|
44
|
+
constructor(counter, id, run, parent) {
|
|
45
|
+
this.counter = counter;
|
|
46
|
+
this.id = id;
|
|
47
|
+
this.run = run;
|
|
48
|
+
this.parent = parent;
|
|
49
|
+
this.selected = false;
|
|
50
|
+
this.children = [];
|
|
51
|
+
}
|
|
52
|
+
get name() {
|
|
53
|
+
return this.run.name || core_1.nls.localize('theia/test/testRunDefaultName', '{0} run {1}', this.run.controller.label, this.counter);
|
|
54
|
+
}
|
|
55
|
+
;
|
|
56
|
+
}
|
|
57
|
+
class TestItemNode {
|
|
58
|
+
constructor(id, item, parent) {
|
|
59
|
+
this.id = id;
|
|
60
|
+
this.item = item;
|
|
61
|
+
this.parent = parent;
|
|
62
|
+
this.selected = false;
|
|
63
|
+
}
|
|
64
|
+
get name() {
|
|
65
|
+
return this.item.label;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
let TestRunTree = class TestRunTree extends tree_1.TreeImpl {
|
|
69
|
+
constructor() {
|
|
70
|
+
super(...arguments);
|
|
71
|
+
this.ROOT = {
|
|
72
|
+
id: 'TestResults',
|
|
73
|
+
name: 'Test Results',
|
|
74
|
+
parent: undefined,
|
|
75
|
+
children: [],
|
|
76
|
+
visible: false
|
|
77
|
+
};
|
|
78
|
+
this.controllerListeners = new Map();
|
|
79
|
+
this.runs = new Map();
|
|
80
|
+
this.nextId = 0;
|
|
81
|
+
}
|
|
82
|
+
init() {
|
|
83
|
+
this.root = this.ROOT;
|
|
84
|
+
this.testService.getControllers().forEach(controller => {
|
|
85
|
+
this.addController(controller);
|
|
86
|
+
});
|
|
87
|
+
this.testService.onControllersChanged(controllerDelta => {
|
|
88
|
+
var _a, _b;
|
|
89
|
+
(_a = controllerDelta.removed) === null || _a === void 0 ? void 0 : _a.forEach(controller => {
|
|
90
|
+
var _a;
|
|
91
|
+
(_a = this.controllerListeners.get(controller)) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
92
|
+
});
|
|
93
|
+
(_b = controllerDelta.added) === null || _b === void 0 ? void 0 : _b.forEach(controller => this.addController(controller));
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
addController(controller) {
|
|
97
|
+
controller.testRuns.forEach(run => this.addRun(run));
|
|
98
|
+
const listeners = new core_1.DisposableCollection();
|
|
99
|
+
this.controllerListeners.set(controller.id, listeners);
|
|
100
|
+
listeners.push(controller.onRunsChanged(runDelta => {
|
|
101
|
+
var _a, _b;
|
|
102
|
+
(_a = runDelta.removed) === null || _a === void 0 ? void 0 : _a.forEach(run => {
|
|
103
|
+
var _a;
|
|
104
|
+
(_a = this.runs.get(run)) === null || _a === void 0 ? void 0 : _a.disposable.dispose();
|
|
105
|
+
this.runs.delete(run);
|
|
106
|
+
this.refresh(this.ROOT);
|
|
107
|
+
});
|
|
108
|
+
(_b = runDelta.added) === null || _b === void 0 ? void 0 : _b.forEach(run => {
|
|
109
|
+
this.addRun(run);
|
|
110
|
+
this.refresh(this.ROOT);
|
|
111
|
+
});
|
|
112
|
+
}));
|
|
113
|
+
}
|
|
114
|
+
addRun(run) {
|
|
115
|
+
const newNode = this.createRunNode(run);
|
|
116
|
+
const affected = [];
|
|
117
|
+
const disposables = new core_1.DisposableCollection();
|
|
118
|
+
disposables.push(run.onDidChangeTestState(deltas => {
|
|
119
|
+
let needsRefresh = false;
|
|
120
|
+
deltas.forEach(delta => {
|
|
121
|
+
if (delta.newState) {
|
|
122
|
+
if (delta.newState.state > test_service_1.TestExecutionState.Queued) {
|
|
123
|
+
const testNode = info.tests.get(delta.test);
|
|
124
|
+
if (!testNode) {
|
|
125
|
+
if (info.tests.size === 0) {
|
|
126
|
+
newNode.expanded = true;
|
|
127
|
+
}
|
|
128
|
+
info.tests.set(delta.test, this.createTestItemNode(newNode, delta.test));
|
|
129
|
+
needsRefresh = true;
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
affected.push(testNode);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
info.tests.delete(delta.test);
|
|
138
|
+
needsRefresh = true;
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
if (needsRefresh) {
|
|
142
|
+
this.refresh(newNode);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
this.onDidUpdateEmitter.fire(affected);
|
|
146
|
+
}
|
|
147
|
+
}));
|
|
148
|
+
disposables.push(run.onDidChangeProperty(() => this.onDidUpdateEmitter.fire([])));
|
|
149
|
+
const info = {
|
|
150
|
+
node: newNode,
|
|
151
|
+
disposable: disposables,
|
|
152
|
+
tests: new Map(run.items.filter(item => { var _a; return (((_a = run.getTestState(item)) === null || _a === void 0 ? void 0 : _a.state) || 0) > test_service_1.TestExecutionState.Queued; }).map(item => [item, this.createTestItemNode(newNode, item)]))
|
|
153
|
+
};
|
|
154
|
+
this.runs.set(run, info);
|
|
155
|
+
}
|
|
156
|
+
createRunNode(run) {
|
|
157
|
+
return new TestRunNode(this.nextId, `id-${this.nextId++}`, run, this.ROOT);
|
|
158
|
+
}
|
|
159
|
+
createTestItemNode(parent, item) {
|
|
160
|
+
return new TestItemNode(`testitem-${this.nextId++}`, item, parent);
|
|
161
|
+
}
|
|
162
|
+
async resolveChildren(parent) {
|
|
163
|
+
if (parent === this.ROOT) {
|
|
164
|
+
return Promise.resolve([...this.runs.values()].reverse().map(info => info.node));
|
|
165
|
+
}
|
|
166
|
+
else if (parent instanceof TestRunNode) {
|
|
167
|
+
const runInfo = this.runs.get(parent.run);
|
|
168
|
+
if (runInfo) {
|
|
169
|
+
return Promise.resolve([...runInfo.tests.values()]);
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
return Promise.resolve([]);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
return Promise.resolve([]);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
};
|
|
180
|
+
__decorate([
|
|
181
|
+
(0, inversify_1.inject)(test_service_1.TestService),
|
|
182
|
+
__metadata("design:type", Object)
|
|
183
|
+
], TestRunTree.prototype, "testService", void 0);
|
|
184
|
+
__decorate([
|
|
185
|
+
(0, inversify_1.postConstruct)(),
|
|
186
|
+
__metadata("design:type", Function),
|
|
187
|
+
__metadata("design:paramtypes", []),
|
|
188
|
+
__metadata("design:returntype", void 0)
|
|
189
|
+
], TestRunTree.prototype, "init", null);
|
|
190
|
+
TestRunTree = __decorate([
|
|
191
|
+
(0, inversify_1.injectable)()
|
|
192
|
+
], TestRunTree);
|
|
193
|
+
exports.TestRunTree = TestRunTree;
|
|
194
|
+
let TestRunTreeWidget = TestRunTreeWidget_1 = class TestRunTreeWidget extends tree_1.TreeWidget {
|
|
195
|
+
constructor(props, model, contextMenuRenderer) {
|
|
196
|
+
super(props, model, contextMenuRenderer);
|
|
197
|
+
this.id = TestRunTreeWidget_1.ID;
|
|
198
|
+
this.title.label = core_1.nls.localize('theia/test/testRuns', 'Test Runs');
|
|
199
|
+
this.title.caption = core_1.nls.localize('theia/test/testRuns', 'Test Runs');
|
|
200
|
+
this.title.iconClass = (0, browser_1.codicon)('run');
|
|
201
|
+
this.title.closable = true;
|
|
202
|
+
}
|
|
203
|
+
init() {
|
|
204
|
+
super.init();
|
|
205
|
+
this.addClass('theia-test-result-view');
|
|
206
|
+
this.model.onSelectionChanged(() => {
|
|
207
|
+
const node = this.model.selectedNodes[0];
|
|
208
|
+
if (node instanceof TestRunNode) {
|
|
209
|
+
this.uiModel.selectedOutputSource = {
|
|
210
|
+
get output() {
|
|
211
|
+
return node.run.getOutput();
|
|
212
|
+
},
|
|
213
|
+
onDidAddTestOutput: core_1.Event.map(node.run.onDidChangeTestOutput, evt => evt.map(item => item[1]))
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
else if (node instanceof TestItemNode) {
|
|
217
|
+
this.uiModel.selectedOutputSource = {
|
|
218
|
+
get output() {
|
|
219
|
+
return node.parent.run.getOutput(node.item);
|
|
220
|
+
},
|
|
221
|
+
onDidAddTestOutput: core_1.Event.map(node.parent.run.onDidChangeTestOutput, evt => evt.filter(item => item[0] === node.item).map(item => item[1]))
|
|
222
|
+
};
|
|
223
|
+
this.uiModel.selectedTestState = node.parent.run.getTestState(node.item);
|
|
224
|
+
}
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
renderTree(model) {
|
|
228
|
+
if (tree_1.CompositeTreeNode.is(this.model.root) && this.model.root.children.length > 0) {
|
|
229
|
+
return super.renderTree(model);
|
|
230
|
+
}
|
|
231
|
+
return React.createElement("div", { className: 'theia-widget-noInfo noMarkers' }, core_1.nls.localizeByDefault('No tests have been found in this workspace yet.'));
|
|
232
|
+
}
|
|
233
|
+
getTestStateClass(state) {
|
|
234
|
+
switch (state) {
|
|
235
|
+
case test_service_1.TestExecutionState.Queued: return `${(0, browser_1.codicon)('history')} queued`;
|
|
236
|
+
case test_service_1.TestExecutionState.Running: return `${(0, browser_1.codicon)('sync')} codicon-modifier-spin running`;
|
|
237
|
+
case test_service_1.TestExecutionState.Skipped: return `${(0, browser_1.codicon)('debug-step-over')} skipped`;
|
|
238
|
+
case test_service_1.TestExecutionState.Failed: return `${(0, browser_1.codicon)('error')} failed`;
|
|
239
|
+
case test_service_1.TestExecutionState.Errored: return `${(0, browser_1.codicon)('issues')} errored`;
|
|
240
|
+
case test_service_1.TestExecutionState.Passed: return `${(0, browser_1.codicon)('pass')} passed`;
|
|
241
|
+
default: return (0, browser_1.codicon)('circle');
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
renderIcon(node, props) {
|
|
245
|
+
var _a;
|
|
246
|
+
if (node instanceof TestItemNode) {
|
|
247
|
+
const state = (_a = node.parent.run.getTestState(node.item)) === null || _a === void 0 ? void 0 : _a.state;
|
|
248
|
+
return React.createElement("div", { className: this.getTestStateClass(state) });
|
|
249
|
+
}
|
|
250
|
+
else if (node instanceof TestRunNode) {
|
|
251
|
+
const icon = node.run.isRunning ? `${(0, browser_1.codicon)('sync')} codicon-modifier-spin running` : (0, browser_1.codicon)('circle');
|
|
252
|
+
return React.createElement("div", { className: icon });
|
|
253
|
+
}
|
|
254
|
+
else {
|
|
255
|
+
return super.renderIcon(node, props);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
toContextMenuArgs(node) {
|
|
259
|
+
if (node instanceof TestRunNode) {
|
|
260
|
+
return [node.run];
|
|
261
|
+
}
|
|
262
|
+
else if (node instanceof TestItemNode) {
|
|
263
|
+
const item = node.item;
|
|
264
|
+
const executionState = node.parent.run.getTestState(node.item);
|
|
265
|
+
if (test_service_1.TestFailure.is(executionState)) {
|
|
266
|
+
return [item, executionState.messages];
|
|
267
|
+
}
|
|
268
|
+
return [item];
|
|
269
|
+
}
|
|
270
|
+
return [];
|
|
271
|
+
}
|
|
272
|
+
storeState() {
|
|
273
|
+
return {}; // don't store any state for now
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
TestRunTreeWidget.ID = 'test-run-widget';
|
|
277
|
+
__decorate([
|
|
278
|
+
(0, inversify_1.inject)(icon_theme_service_1.IconThemeService),
|
|
279
|
+
__metadata("design:type", icon_theme_service_1.IconThemeService)
|
|
280
|
+
], TestRunTreeWidget.prototype, "iconThemeService", void 0);
|
|
281
|
+
__decorate([
|
|
282
|
+
(0, inversify_1.inject)(context_key_service_1.ContextKeyService),
|
|
283
|
+
__metadata("design:type", Object)
|
|
284
|
+
], TestRunTreeWidget.prototype, "contextKeys", void 0);
|
|
285
|
+
__decorate([
|
|
286
|
+
(0, inversify_1.inject)(theming_1.ThemeService),
|
|
287
|
+
__metadata("design:type", theming_1.ThemeService)
|
|
288
|
+
], TestRunTreeWidget.prototype, "themeService", void 0);
|
|
289
|
+
__decorate([
|
|
290
|
+
(0, inversify_1.inject)(test_execution_state_manager_1.TestExecutionStateManager),
|
|
291
|
+
__metadata("design:type", test_execution_state_manager_1.TestExecutionStateManager)
|
|
292
|
+
], TestRunTreeWidget.prototype, "stateManager", void 0);
|
|
293
|
+
__decorate([
|
|
294
|
+
(0, inversify_1.inject)(test_output_ui_model_1.TestOutputUIModel),
|
|
295
|
+
__metadata("design:type", test_output_ui_model_1.TestOutputUIModel)
|
|
296
|
+
], TestRunTreeWidget.prototype, "uiModel", void 0);
|
|
297
|
+
__decorate([
|
|
298
|
+
(0, inversify_1.postConstruct)(),
|
|
299
|
+
__metadata("design:type", Function),
|
|
300
|
+
__metadata("design:paramtypes", []),
|
|
301
|
+
__metadata("design:returntype", void 0)
|
|
302
|
+
], TestRunTreeWidget.prototype, "init", null);
|
|
303
|
+
TestRunTreeWidget = TestRunTreeWidget_1 = __decorate([
|
|
304
|
+
(0, inversify_1.injectable)(),
|
|
305
|
+
__param(0, (0, inversify_1.inject)(tree_1.TreeProps)),
|
|
306
|
+
__param(1, (0, inversify_1.inject)(tree_1.TreeModel)),
|
|
307
|
+
__param(2, (0, inversify_1.inject)(browser_1.ContextMenuRenderer)),
|
|
308
|
+
__metadata("design:paramtypes", [Object, Object, browser_1.ContextMenuRenderer])
|
|
309
|
+
], TestRunTreeWidget);
|
|
310
|
+
exports.TestRunTreeWidget = TestRunTreeWidget;
|
|
311
311
|
//# sourceMappingURL=test-run-widget.js.map
|