Skip to content

Commit 2e1d41a

Browse files
edrioukedriouk
committed
Tests updates
1 parent f9f4f60 commit 2e1d41a

3 files changed

Lines changed: 27 additions & 18 deletions

File tree

‎src/solutions/solution-event-hub.test.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ describe('EventHub', () => {
8888
});
8989

9090
describe('fireConvertCompleted', () => {
91-
it.each<{ severity: Severity; detection: boolean }>([
92-
{ severity: 'error', detection: true },
93-
{ severity: 'warning', detection: false },
94-
{ severity: 'info', detection: true },
95-
{ severity: 'success', detection: false },
96-
])('should fire event with severity "$severity" and detection $detection', async ({ severity, detection }) => {
91+
it.each<{ severity: Severity; detection: boolean; success: boolean }>([
92+
{ severity: 'error', detection: true, success: false },
93+
{ severity: 'warning', detection: false, success: true },
94+
{ severity: 'info', detection: true, success: true },
95+
{ severity: 'success', detection: false, success: true },
96+
])('should fire event with severity "$severity" and detection $detection', async ({ severity, detection, success }) => {
9797
const listener = jest.fn();
9898
eventHub.onDidConvertCompleted(listener);
9999

100-
const data: ConvertResultData = { severity, detection, logMessages };
100+
const data: ConvertResultData = { success, severity, detection, logMessages };
101101
await eventHub.fireConvertCompleted(data);
102102

103103
expect(listener).toHaveBeenCalledTimes(1);
@@ -110,7 +110,7 @@ describe('EventHub', () => {
110110
eventHub.onDidConvertCompleted(listener1);
111111
eventHub.onDidConvertCompleted(listener2);
112112

113-
const data: ConvertResultData = { severity: 'success', detection: true, logMessages };
113+
const data: ConvertResultData = { success: true, severity: 'success', detection: true, logMessages };
114114
await eventHub.fireConvertCompleted(data);
115115

116116
expect(listener1).toHaveBeenCalledWith(data);
@@ -138,13 +138,13 @@ describe('EventHub', () => {
138138
expect(completeListener).not.toHaveBeenCalled();
139139
expect(cbuildCompleteListener).not.toHaveBeenCalled();
140140

141-
await eventHub.fireConvertCompleted({ severity: 'success', detection: true, logMessages });
141+
await eventHub.fireConvertCompleted({ success: true, severity: 'success', detection: true, logMessages });
142142

143143
expect(requestListener).toHaveBeenCalledTimes(1);
144144
expect(completeListener).toHaveBeenCalledTimes(1);
145145
expect(cbuildCompleteListener).not.toHaveBeenCalled();
146146

147-
await eventHub.fireCbuildCompleted({ success: true, toolsOutputMessages: [] });
147+
await eventHub.fireCbuildCompleted({ success: true, severity: 'success', toolsOutputMessages: [] });
148148

149149
expect(requestListener).toHaveBeenCalledTimes(1);
150150
expect(completeListener).toHaveBeenCalledTimes(1);
@@ -181,8 +181,8 @@ describe('EventHub', () => {
181181
eventHub.onDidConvertCompleted(listener);
182182

183183
await Promise.all([
184-
eventHub.fireConvertCompleted({ severity: 'info', detection: true, logMessages }),
185-
eventHub.fireConvertCompleted({ severity: 'error', detection: false, logMessages })
184+
eventHub.fireConvertCompleted({ success: true, severity: 'info', detection: true, logMessages }),
185+
eventHub.fireConvertCompleted({ success: false, severity: 'error', detection: false, logMessages })
186186
]);
187187

188188
expect(listener).toHaveBeenCalledTimes(2);
@@ -193,8 +193,8 @@ describe('EventHub', () => {
193193
eventHub.onDidCbuildCompleted(listener);
194194

195195
await Promise.all([
196-
eventHub.fireCbuildCompleted({ success: true, toolsOutputMessages: ['line 1'] }),
197-
eventHub.fireCbuildCompleted({ success: false, toolsOutputMessages: ['line 2'] })
196+
eventHub.fireCbuildCompleted({ success: true, severity: 'success', toolsOutputMessages: ['line 1'] }),
197+
eventHub.fireCbuildCompleted({ success: false, severity: 'error', toolsOutputMessages: ['line 2'] })
198198
]);
199199

200200
expect(listener).toHaveBeenCalledTimes(2);
@@ -203,9 +203,9 @@ describe('EventHub', () => {
203203

204204
describe('fireCbuildCompleted', () => {
205205
it.each<CbuildResultData>([
206-
{ success: true, toolsOutputMessages: ['ok'] },
207-
{ success: false, toolsOutputMessages: ['failed'] },
208-
{ success: true, toolsOutputMessages: undefined },
206+
{ success: true, severity: 'success', toolsOutputMessages: ['ok'] },
207+
{ success: false, severity: 'error', toolsOutputMessages: ['failed'] },
208+
{ success: true, severity: 'success', toolsOutputMessages: undefined },
209209
])('should fire event with cbuild result: %o', async (data) => {
210210
const listener = jest.fn();
211211
eventHub.onDidCbuildCompleted(listener);
@@ -222,7 +222,7 @@ describe('EventHub', () => {
222222
eventHub.onDidCbuildCompleted(listener1);
223223
eventHub.onDidCbuildCompleted(listener2);
224224

225-
const data: CbuildResultData = { success: true, toolsOutputMessages: ['done'] };
225+
const data: CbuildResultData = { success: true, severity: 'success', toolsOutputMessages: ['done'] };
226226
await eventHub.fireCbuildCompleted(data);
227227

228228
expect(listener1).toHaveBeenCalledWith(data);

‎src/solutions/solution-manager.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import { CONFIG_ENVIRONMENT_VARIABLES } from '../manifest';
3535

3636

3737
const convertResultData: ConvertResultData = {
38+
success: true,
3839
severity: 'success',
3940
detection: false,
4041
logMessages: { success: true, errors: [], warnings: [], info: [] },

‎src/solutions/solution-problems.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ describe('SolutionProblems', () => {
114114
const clearSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'clear');
115115

116116
await eventHub.fireConvertCompleted({
117+
success: true,
117118
severity: 'warning',
118119
detection: false,
119120
logMessages: {
@@ -135,6 +136,7 @@ describe('SolutionProblems', () => {
135136
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
136137

137138
await eventHub.fireConvertCompleted({
139+
success: false,
138140
severity: 'error',
139141
detection: false,
140142
logMessages: {
@@ -155,6 +157,7 @@ describe('SolutionProblems', () => {
155157
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
156158

157159
await eventHub.fireConvertCompleted({
160+
success: true,
158161
severity: 'success',
159162
detection: false,
160163
logMessages: {
@@ -215,6 +218,7 @@ describe('SolutionProblems', () => {
215218
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
216219

217220
await eventHub.fireConvertCompleted({
221+
success: false,
218222
severity: 'error',
219223
detection: false,
220224
logMessages: {
@@ -240,6 +244,7 @@ describe('SolutionProblems', () => {
240244
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
241245

242246
await eventHub.fireConvertCompleted({
247+
success: true,
243248
severity: 'warning',
244249
detection: false,
245250
logMessages: {
@@ -320,6 +325,7 @@ describe('SolutionProblems', () => {
320325
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
321326

322327
await eventHub.fireConvertCompleted({
328+
success: true,
323329
severity: 'warning',
324330
detection: false,
325331
logMessages: {
@@ -350,6 +356,7 @@ describe('SolutionProblems', () => {
350356
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
351357

352358
await eventHub.fireConvertCompleted({
359+
success: true,
353360
severity: 'warning',
354361
detection: false,
355362
logMessages: {
@@ -373,6 +380,7 @@ describe('SolutionProblems', () => {
373380
const setSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'set');
374381

375382
await eventHub.fireConvertCompleted({
383+
success: false,
376384
severity: 'error',
377385
detection: false,
378386
logMessages: {

0 commit comments

Comments
 (0)