Add new tests

Updates the package version to 3.2.0. Adds integration tests for empty collections, dictionaries with null and non-string keys, and scalar/non-formattable objects.

Author: vonhoff

Serilog.Sinks.RichTextBox.WinForms.Colored.Test/Integration/JsonFormattingTests.cs

@@ -190,8 +190,9 @@ public void PrettyPrintJson_FormatsNestedStructures()
         public void PrettyPrintJson_EmptyCollectionsFormatCorrectly()
         {
             var emptyArray = new LogEventProperty("EmptyArray", new SequenceValue(Array.Empty<LogEventPropertyValue>()));
+            var emptyDict = new LogEventProperty("EmptyDict", new DictionaryValue(new Dictionary<ScalarValue, LogEventPropertyValue>()));
             var emptyObject = new LogEventProperty("EmptyObject", new StructureValue(Array.Empty<LogEventProperty>(), null));
-            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("Array: {EmptyArray:j}, Object: {EmptyObject:j}"), new[] { emptyArray, emptyObject });
+            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("Array: {EmptyArray:j}, Dict: {EmptyDict:j}, Object: {EmptyObject:j}"), new[] { emptyArray, emptyDict, emptyObject });
 
             var options = new RichTextBoxSinkOptions(
                 theme: _defaultTheme,
@@ -201,6 +202,7 @@ public void PrettyPrintJson_EmptyCollectionsFormatCorrectly()
 
             var result = RenderAndGetText(logEvent, "{Message:l}", options);
             Assert.Contains("Array: []", result);
+            Assert.Contains("Dict: {}", result);
             Assert.Contains("Object: {}", result);
         }
 
@@ -249,9 +251,75 @@ public void CompactJson_StillWorksByDefault()
         {
             var complexProp = new LogEventProperty("ComplexProp", new StructureValue(new[] { new LogEventProperty("Id", new ScalarValue(123)) }, "MyObj"));
             var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("Value: {ComplexProp}"), new[] { complexProp });
-            
-            // Default behavior (compact)
             Assert.Equal("Value: {\"Id\": 123, \"$type\": \"MyObj\"}", RenderAndGetText(logEvent, "{Message:j}"));
         }
+
+        [Fact]
+        public void ScalarValue_IFormattableButNotNumericValueType()
+        {
+            var enumValue = System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance;
+            var prop = new LogEventProperty("EnumProp", new ScalarValue(enumValue));
+            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("{EnumProp:j}"), new[] { prop });
+            
+            var result = RenderAndGetText(logEvent, "{Message:j}");
+            Assert.NotNull(result);
+            Assert.NotEmpty(result);
+        }
+
+        [Fact]
+        public void ScalarValue_NonFormattableObject()
+        {
+            var plainObject = new object();
+            var prop = new LogEventProperty("ObjectProp", new ScalarValue(plainObject));
+            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("{ObjectProp:j}"), new[] { prop });
+            
+            var result = RenderAndGetText(logEvent, "{Message:j}");
+            Assert.NotNull(result);
+            Assert.NotEmpty(result);
+            Assert.StartsWith("\"", result);
+            Assert.EndsWith("\"", result);
+        }
+
+        [Fact]
+        public void PrettyPrintJson_DictionaryWithNullKey()
+        {
+            var dict = new Dictionary<ScalarValue, LogEventPropertyValue>
+            {
+                { new ScalarValue(null), new ScalarValue("value") }
+            };
+            var dictProp = new LogEventProperty("DictProp", new DictionaryValue(dict));
+            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("{DictProp:j}"), new[] { dictProp });
+
+            var options = new RichTextBoxSinkOptions(
+                theme: _defaultTheme,
+                prettyPrintJson: true,
+                indentSize: 4,
+                useSpacesForIndent: true);
+
+            var result = RenderAndGetText(logEvent, "{Message:l}", options);
+            Assert.Contains("\"null\"", result);
+            Assert.Contains("\"value\"", result);
+        }
+
+        [Fact]
+        public void PrettyPrintJson_DictionaryWithNonStringKey()
+        {
+            var dict = new Dictionary<ScalarValue, LogEventPropertyValue>
+            {
+                { new ScalarValue(123), new ScalarValue("value") }
+            };
+            var dictProp = new LogEventProperty("DictProp", new DictionaryValue(dict));
+            var logEvent = new LogEvent(DateTimeOffset.Now, LogEventLevel.Information, null, _parser.Parse("{DictProp:j}"), new[] { dictProp });
+
+            var options = new RichTextBoxSinkOptions(
+                theme: _defaultTheme,
+                prettyPrintJson: true,
+                indentSize: 4,
+                useSpacesForIndent: true);
+
+            var result = RenderAndGetText(logEvent, "{Message:l}", options);
+            Assert.Contains("\"123\"", result);
+            Assert.Contains("\"value\"", result);
+        }
     }
 }

Serilog.Sinks.RichTextBox.WinForms.Colored/Serilog.Sinks.RichTextBox.WinForms.Colored.csproj

@@ -22,14 +22,13 @@
         <TargetFrameworks>net462;net471;net6.0-windows;net8.0-windows;net9.0-windows;netcoreapp3.0-windows;netcoreapp3.1-windows</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <UseWindowsForms>true</UseWindowsForms>
-        <Version>3.1.3</Version>
+        <Version>3.2.0</Version>
         <PackageReleaseNotes>
-- Fixed performance issues when logging large numbers of complex messages that could cause application freezing.
-- Fixed `ArgumentOutOfRangeException` thrown from `RtfBuilder.Clear()`
+- Added support for JSON pretty-printing in log messages.
 
 See repository for more information:
 https://github.com/vonhoff/Serilog.Sinks.RichTextBox.WinForms.Colored
-        </PackageReleaseNotes>
+		</PackageReleaseNotes>
         <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
         <SupportedOSPlatform>windows</SupportedOSPlatform>
         <NeutralLanguage>en-US</NeutralLanguage>

Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Rendering/MessageTemplateTokenRenderer.cs

@@ -18,7 +18,6 @@
 
 using Serilog.Events;
 using Serilog.Parsing;
-using Serilog.Sinks.RichTextBoxForms;
 using Serilog.Sinks.RichTextBoxForms.Formatting;
 using Serilog.Sinks.RichTextBoxForms.Rtf;
 using Serilog.Sinks.RichTextBoxForms.Themes;

Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Rendering/PropertiesTokenRenderer.cs

@@ -18,7 +18,6 @@
 
 using Serilog.Events;
 using Serilog.Parsing;
-using Serilog.Sinks.RichTextBoxForms;
 using Serilog.Sinks.RichTextBoxForms.Formatting;
 using Serilog.Sinks.RichTextBoxForms.Rtf;
 using Serilog.Sinks.RichTextBoxForms.Themes;

Serilog.Sinks.RichTextBox.WinForms.Colored/Sinks/RichTextBoxForms/Rendering/TemplateRenderer.cs

@@ -19,7 +19,6 @@
 using Serilog.Events;
 using Serilog.Formatting.Display;
 using Serilog.Parsing;
-using Serilog.Sinks.RichTextBoxForms;
 using Serilog.Sinks.RichTextBoxForms.Rtf;
 using Serilog.Sinks.RichTextBoxForms.Themes;
 using System;