diff --git a/packages/talker/lib/src/models/talker_data.dart b/packages/talker/lib/src/models/talker_data.dart index 54c2c59fc..63c3f2c24 100644 --- a/packages/talker/lib/src/models/talker_data.dart +++ b/packages/talker/lib/src/models/talker_data.dart @@ -72,7 +72,7 @@ class TalkerData { /// {@endtemplate} String generateTextMessage( {TimeFormat timeFormat = TimeFormat.timeAndSeconds}) { - return '${displayTitleWithTime(timeFormat: timeFormat)}$message$displayStackTrace'; + return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayError$displayStackTrace'; } } diff --git a/packages/talker/lib/src/models/talker_log.dart b/packages/talker/lib/src/models/talker_log.dart index 16691e7da..81874c45c 100644 --- a/packages/talker/lib/src/models/talker_log.dart +++ b/packages/talker/lib/src/models/talker_log.dart @@ -19,6 +19,6 @@ class TalkerLog extends TalkerData { @override String generateTextMessage( {TimeFormat timeFormat = TimeFormat.timeAndSeconds}) { - return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayStackTrace'; + return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayError$displayStackTrace'; } } diff --git a/packages/talker/test/talker_data_models_test.dart b/packages/talker/test/talker_data_models_test.dart index 78d2b8b3f..4bc7bb36c 100644 --- a/packages/talker/test/talker_data_models_test.dart +++ b/packages/talker/test/talker_data_models_test.dart @@ -65,22 +65,39 @@ Exception''', }); test('TalkerLog', () async { + final error = Error(); + final exception = Exception('Test Exception'); + final dateTime = DateTime.now(); final log = TalkerLog( _testMessage, logLevel: LogLevel.debug, + exception: exception, + error: error, + stackTrace: StackTrace.current, title: _testTitle, + time: dateTime, + pen: AnsiPen()..red(), + key: 'custom-key', ); expect(log is TalkerData, true); expect(log is TalkerLog, true); - expect(log.message, _testMessage); - expect(log.title, _testTitle); - expect(log.time is DateTime, true); + expect(log.message, equals(_testMessage)); + expect(log.logLevel, equals(LogLevel.debug)); + expect(log.exception, equals(exception)); + expect(log.error, equals(error)); + expect(log.stackTrace is StackTrace, true); + expect(log.title, equals(_testTitle)); + expect(log.time, equals(dateTime)); + expect(log.pen, isNotNull); + expect(log.key, equals('custom-key')); final message = log.generateTextMessage(); expect( message, - '''[test title] | ${TalkerDateTimeFormatter(log.time).timeAndSeconds} | test message''', + equals( + '${log.displayTitleWithTime()}${log.displayMessage}${log.displayException}${log.displayError}${log.displayStackTrace}', + ), ); }); }); diff --git a/packages/talker/test/talker_data_test.dart b/packages/talker/test/talker_data_test.dart index 921e7b42c..56edd22ec 100644 --- a/packages/talker/test/talker_data_test.dart +++ b/packages/talker/test/talker_data_test.dart @@ -44,7 +44,7 @@ void main() { expect( generatedMessage, equals( - '${talkerData.displayTitleWithTime()}${talkerData.displayMessage}${talkerData.displayStackTrace}', + '${talkerData.displayTitleWithTime()}${talkerData.displayMessage}${talkerData.displayException}${talkerData.displayError}${talkerData.displayStackTrace}', ), ); });