console: Write the whole stack trace when using console.trace()

Also ensure this in a test

1 files changed, 54 insertions, 2 deletions

diff --git a/installed-tests/js/testConsole.js b/installed-tests/js/testConsole.js
index 95049d57..1b70c7ea 100644
--- a/installed-tests/js/testConsole.js
+++ b/installed-tests/js/testConsole.js
@@ -12,15 +12,43 @@ import {decodedStringMatching} from './matchers.js';
 function objectContainingLogMessage(
     message,
     domain = DEFAULT_LOG_DOMAIN,
-    fields = {}
+    fields = {},
+    messageMatcher = decodedStringMatching
 ) {
     return jasmine.objectContaining({
-        MESSAGE: decodedStringMatching(message),
+        MESSAGE: messageMatcher(message),
         GLIB_DOMAIN: decodedStringMatching(domain),
         ...fields,
     });
 }
 
+function matchStackTrace(log, sourceFile = null, encoding = 'utf-8') {
+    const matcher = jasmine.stringMatching(log);
+    const stackLineMatcher = jasmine.stringMatching(/^[\w./<]*@.*:\d+:\d+/);
+    const sourceMatcher = sourceFile ? jasmine.stringMatching(RegExp(
+        String.raw`^[\w]*@(file|resource):\/\/\/.*\/${sourceFile}\.js:\d+:\d+$`))
+        : stackLineMatcher;
+
+    return {
+        asymmetricMatch(compareTo) {
+            const decoder = new TextDecoder(encoding);
+            const decoded = decoder.decode(new Uint8Array(Array.from(compareTo)));
+            const lines = decoded.split('\n').filter(l => !!l.length);
+
+            if (!matcher.asymmetricMatch(lines[0]))
+                return false;
+
+            if (!sourceMatcher.asymmetricMatch(lines[1]))
+                return false;
+
+            return lines.slice(2).every(l => stackLineMatcher.asymmetricMatch(l));
+        },
+        jasmineToString() {
+            return `<decodedStringMatching(${log})>`;
+        },
+    };
+}
+
 describe('console', function () {
     /** @type {jasmine.Spy<(_level: any, _fields: any) => any>} */
     let writer_func;
@@ -103,6 +131,30 @@ describe('console', function () {
         writer_func.calls.reset();
     });
 
+    it('traces a line', function () {
+        console.trace('a trace');
+
+        expect(writer_func).toHaveBeenCalledOnceWith(
+            GLib.LogLevelFlags.LEVEL_MESSAGE,
+            objectContainingLogMessage('a trace', DEFAULT_LOG_DOMAIN, {},
+                message => matchStackTrace(message, 'testConsole'))
+        );
+
+        writer_func.calls.reset();
+    });
+
+    it('traces a empty message', function () {
+        console.trace();
+
+        expect(writer_func).toHaveBeenCalledOnceWith(
+            GLib.LogLevelFlags.LEVEL_MESSAGE,
+            objectContainingLogMessage('Trace', DEFAULT_LOG_DOMAIN,
+                message => matchStackTrace(message, 'testConsole'))
+        );
+
+        writer_func.calls.reset();
+    });
+
     describe('clear()', function () {
         it('can be called', function () {
             console.clear();