fix: ExceptionInfo - legacy type deserialization

servicetitan · Sep 18, 2023 · 5516a1a · 5516a1a
1 parent ab20edf
commit 5516a1a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/src/Stl.Fusion.Ext.Contracts/Authentication/UserIdentity.cs b/src/Stl.Fusion.Ext.Contracts/Authentication/UserIdentity.cs
@@ -6,7 +6,7 @@ namespace Stl.Fusion.Authentication;
 {
     private static readonly ListFormat IdFormat = ListFormat.SlashSeparated;
 
-    public static UserIdentity None { get; } = default;
+    public static readonly UserIdentity None;
     public static string DefaultSchema { get; } = "Default";
 
     [DataMember(Order = 0), MemoryPackOrder(0)]

diff --git a/src/Stl.Testing/TypeEvolutionTester.cs b/src/Stl.Testing/TypeEvolutionTester.cs
@@ -74,10 +74,15 @@ public void CheckMessagePackByteSerializer(TOld value, ITestOutputHelper? output
     {
         var s = new MessagePackByteSerializer();
         using var buffer = s.Write(value);
-        var b0 = buffer.WrittenMemory.ToArray();
-        Output?.WriteLine($"MessagePackByteSerializer: {JsonFormatter.Format(b0)}");
-        var v0 = s.Read<TNew>(b0);
+        var bytes = buffer.WrittenMemory.ToArray();
+        Output?.WriteLine($"MessagePackByteSerializer: {JsonFormatter.Format(bytes)}");
+        s.Write(buffer, value);
+
+        bytes = buffer.WrittenMemory.ToArray();
+        var v0 = s.Read<TNew>(bytes, out var readLength);
         AssertEqual(value, v0);
+        var v1 = s.Read<TNew>(bytes[readLength..]);
+        AssertEqual(value, v1);
     }
 
     // MemoryPack serializer
@@ -86,9 +91,14 @@ public void CheckMemoryPackByteSerializer(TOld value, ITestOutputHelper? output
     {
         var s = new MemoryPackByteSerializer();
         using var buffer = s.Write(value);
-        var b0 = buffer.WrittenMemory.ToArray();
-        Output?.WriteLine($"MemoryPackByteSerializer: {JsonFormatter.Format(b0)}");
-        var v0 = s.Read<TNew>(b0);
+        var bytes = buffer.WrittenMemory.ToArray();
+        Output?.WriteLine($"MemoryPackByteSerializer: {JsonFormatter.Format(bytes)}");
+        s.Write(buffer, value);
+
+        bytes = buffer.WrittenMemory.ToArray();
+        var v0 = s.Read<TNew>(bytes, out var readLength);
         AssertEqual(value, v0);
+        var v1 = s.Read<TNew>(bytes[readLength..]);
+        AssertEqual(value, v1);
     }
 }
diff --git a/src/Stl/Async/AsyncChain.cs b/src/Stl/Async/AsyncChain.cs
@@ -3,8 +3,8 @@ namespace Stl.Async;
 [StructLayout(LayoutKind.Auto)]
 public readonly record struct AsyncChain(string Name, Func<CancellationToken, Task> Start)
 {
-    public static AsyncChain None { get; } = new("(no-operation)", _ => Task.CompletedTask);
-    public static AsyncChain NeverEnding { get; } = new("(never-ending)", _ => TaskExt.NeverEndingTask);
+    public static readonly AsyncChain None = new("(no-operation)", _ => Task.CompletedTask);
+    public static readonly AsyncChain NeverEnding = new("(never-ending)", _ => TaskExt.NeverEndingTask);
 
     public AsyncChain(Func<CancellationToken, Task> start)
         : this("(unnamed)", start) { }

diff --git a/src/Stl/Serialization/ExceptionInfo.cs b/src/Stl/Serialization/ExceptionInfo.cs
@@ -8,7 +8,7 @@ namespace Stl.Serialization;
     private static readonly Type[] ExceptionCtorArgumentTypes1 = { typeof(string), typeof(Exception) };
     private static readonly Type[] ExceptionCtorArgumentTypes2 = { typeof(string) };
 
-    public static ExceptionInfo None { get; } = default;
+    public static readonly ExceptionInfo None = default;
     public static Func<TypeRef, Type>? UnknownExceptionTypeResolver { get; set; } = null;
 
     private readonly string _message;
@@ -41,7 +41,7 @@ public ExceptionInfo(Exception? exception)
     public override string ToString()
         => IsNone
             ? $"{GetType().Name}()"
-            : $"{GetType().Name}({TypeRef}, {JsonFormatter.Format(Message)})";
+            : $"{GetType().Name}({TypeRef.ToString()}, {JsonFormatter.Format(Message)})";
 
     public Exception? ToException()
     {

diff --git a/tests/Stl.Tests/Serialization/ExceptionInfoTest.cs b/tests/Stl.Tests/Serialization/ExceptionInfoTest.cs
@@ -32,7 +32,7 @@ public void BasicTest()
     }
 
     [Fact]
-    public void LegacyExceptionInfoTest()
+    public void OldExceptionInfoTest()
     {
         var t = new TypeEvolutionTester<OldExceptionInfo, ExceptionInfo>(
             (li, i) => Assert.True(li.TypeRef == i.TypeRef && Equals(li.Message, i.Message)));

diff --git a/tests/Stl.Tests/Serialization/OldExceptionInfo.cs b/tests/Stl.Tests/Serialization/OldExceptionInfo.cs
@@ -10,7 +10,7 @@ namespace Stl.Tests.Serialization;
     private static readonly Type[] ExceptionCtorArgumentTypes1 = { typeof(string), typeof(Exception) };
     private static readonly Type[] ExceptionCtorArgumentTypes2 = { typeof(string) };
 
-    public static OldExceptionInfo None { get; } = default;
+    public static readonly OldExceptionInfo None = default;
     public static Func<OldExceptionInfo, Exception?> ToExceptionConverter { get; set; } = DefaultToExceptionConverter;
 
     private readonly string _message;