Skip to content

Commit a61a685

Browse files
committed
Remove unnecessary diff output log for test errors
1 parent 0093af8 commit a61a685

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

extensions/ql-vscode/src/cli.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ export interface TestCompleted {
123123
expected: string;
124124
diff: string[] | undefined;
125125
failureDescription?: string;
126+
failureStage?: string;
126127
}
127128

128129
/**

extensions/ql-vscode/src/test-adapter.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ export class QLTestAdapter extends DisposableObject implements TestAdapter {
294294
: 'failed';
295295
let message: string | undefined;
296296
if (event.failureDescription || event.diff?.length) {
297-
message = ['', `${state}: ${event.test}`, event.failureDescription || event.diff?.join('\n'), ''].join('\n');
297+
message = event.failureStage === 'RESULT'
298+
? ['', `${state}: ${event.test}`, event.failureDescription || event.diff?.join('\n'), ''].join('\n')
299+
: ['', `${event.failureStage?.toLowerCase()} error: ${event.test}`, event.failureDescription || `${event.messages[0].severity}: ${event.messages[0].message}`, ''].join('\n');
298300
void testLogger.log(message);
299301
}
300302
this._testStates.fire({

extensions/ql-vscode/src/vscode-tests/no-workspace/test-adapter.test.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ describe('test-adapter', () => {
9696
type: 'test',
9797
state: 'errored',
9898
test: gPath,
99-
message: `\nerrored: ${gPath}\npqr\nxyz\n`,
99+
message: `\ncompilation error: ${gPath}\nERROR: abc\n`,
100100
decorations: [
101-
{ line: 1, message: 'abc' }
101+
{ line: 1, message: 'abc'},
102+
{ line: 2, severity: 'ERROR'}
102103
]
103104
}]);
104105
expect(listenerSpy.getCall(3).args).to.deep.eq([{
@@ -149,14 +150,17 @@ describe('test-adapter', () => {
149150
pass: false,
150151
diff: ['pqr', 'xyz'],
151152
// a compile error
153+
failureStage: 'COMPILATION',
152154
messages: [
153-
{ position: { line: 1 }, message: 'abc' }
155+
{ position: { line: 1 }, message: 'abc'},
156+
{ position: { line: 2 }, severity: 'ERROR' }
154157
]
155158
});
156159
yield Promise.resolve({
157160
test: Uri.parse('file:/ab/c/e/f/h.ql').fsPath,
158161
pass: false,
159162
diff: ['jkh', 'tuv'],
163+
failureStage: 'RESULT',
160164
messages: []
161165
});
162166
})()

0 commit comments

Comments
 (0)