Improve error scope test for older PHP versions

Author: felixfbecker

src/test/adapter.ts

@@ -216,41 +216,56 @@ describe('PHP Debug Adapter', () => {
                     client.waitForEvent('stopped') as Promise<DebugProtocol.StoppedEvent>
                 ]);
 
-                async function assertErrorScope(name: string, type: string, message: string|RegExp, code?: string) {
+                async function getErrorScope(threadId: number): Promise<{name: string, type?: string, message?: string, code?: string}> {
                     const frameId = (await client.stackTraceRequest({threadId})).body.stackFrames[0].id;
                     const errorScope = (await client.scopesRequest({frameId})).body.scopes[0];
                     assert.propertyVal(errorScope, 'name', name);
-                    const errorInfo = (await client.variablesRequest({variablesReference: errorScope.variablesReference})).body.variables;
-                    const actualType = errorInfo.find(variable => variable.name === 'type');
-                    const actualMessage = errorInfo.find(variable => variable.name === 'message');
-                    const actualCode = errorInfo.find(variable => variable.name === 'code');
-                    assert.propertyVal(actualType, 'value', type);
-                    if (message instanceof RegExp) {
-                        assert.match(actualMessage.value, message);
-                    } else {
-                        assert.propertyVal(actualMessage, 'value', message);
-                    }
-                    if (code) {
-                        assert.propertyVal(actualCode, 'value', code);
-                    }
+                    const variables = (await client.variablesRequest({variablesReference: errorScope.variablesReference})).body.variables;
+                    const type = variables.find(variable => variable.name === 'type');
+                    const message = variables.find(variable => variable.name === 'message');
+                    const code = variables.find(variable => variable.name === 'code');
+                    return {
+                        name: errorScope.name,
+                        type: type && type.value,
+                        message: message && message.value,
+                        code: code && code.value
+                    };
                 }
-
-                await assertErrorScope('Notice', 'Notice', '"Undefined index: undefined_index"', '8');
+                assert.deepEqual(await getErrorScope(threadId), {
+                    name: 'Notice',
+                    type: 'Notice',
+                    message: '"Undefined index: undefined_index"',
+                    code: '8'
+                });
                 await Promise.all([
                     client.continueRequest({threadId}),
                     client.waitForEvent('stopped')
                 ]);
-                await assertErrorScope('Warning', 'Warning', '"Illegal offset type"', '2');
+                assert.deepEqual(await getErrorScope(threadId), {
+                    name: 'Warning',
+                    type: 'Warning',
+                    message: '"Illegal offset type"',
+                    code: '2'
+                });
                 await Promise.all([
                     client.continueRequest({threadId}),
                     client.waitForEvent('stopped')
                 ]);
-                await assertErrorScope('Exception', 'Exception', '"this is an exception"');
+                assert.deepEqual(await getErrorScope(threadId), {
+                    name: 'Exception',
+                    type: 'Exception',
+                    message: '"this is an exception"'
+                });
                 await Promise.all([
                     client.continueRequest({threadId}),
                     client.waitForEvent('stopped')
                 ]);
-                await assertErrorScope('Fatal error', 'Fatal error', /^"Uncaught Exception: this is an exception(.|\s)*"$/);
+                const fatalErrorScope = await getErrorScope(threadId);
+                assert.propertyVal(fatalErrorScope, 'name', 'Fatal error');
+                assert.propertyVal(fatalErrorScope, 'type', 'Fatal error');
+                assert.match(fatalErrorScope.message, /^"Uncaught Exception/);
+                assert.match(fatalErrorScope.message, /this is an exception/);
+                assert.match(fatalErrorScope.message, /"$/);
             });
         });