From 8e68e145e07d93ae2432063f3610a1fc9852e404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Wed, 10 Jun 2026 16:28:42 +0200 Subject: [PATCH] simplify: use indexer-style dict initializer and inline lambdas in SerializerUtilities - SerializerUtilities.cs: replace Add-style { { key, value } } dictionary initializer with indexer-style [key] = value (per project coding standards), and eliminate unnecessary local variable by using an expression-body lambda. - SerializerUtilities.TestNodeSerializers.cs: convert two verbose block-body lambdas (TestNodeUpdateMessage, TestNodeStateChangedEventArgs) to the same expression-body pattern already used for Artifact and RunResponseArgs in the same file. Both files were refactored as part of #8974 (splitting the monolithic SerializerUtilities.cs). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...SerializerUtilities.TestNodeSerializers.cs | 22 +++++-------------- .../ServerMode/JsonRpc/SerializerUtilities.cs | 10 ++------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.TestNodeSerializers.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.TestNodeSerializers.cs index 07ee45c174..26c46b5d6d 100644 --- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.TestNodeSerializers.cs +++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.TestNodeSerializers.cs @@ -30,27 +30,17 @@ private static void RegisterTestNodeSerializers() [JsonRpcStrings.Attachments] = res.Artifacts.Select(f => Serialize(f)).ToList(), }); - Serializers[typeof(TestNodeUpdateMessage)] = new ObjectSerializer(ev => + Serializers[typeof(TestNodeUpdateMessage)] = new ObjectSerializer(ev => new Dictionary { - Dictionary values = new() - { - [JsonRpcStrings.Node] = Serialize(ev.TestNode), - [JsonRpcStrings.Parent] = ev.ParentTestNodeUid?.Value, - }; - - return values; + [JsonRpcStrings.Node] = Serialize(ev.TestNode), + [JsonRpcStrings.Parent] = ev.ParentTestNodeUid?.Value, }); // Serialize event types. - Serializers[typeof(TestNodeStateChangedEventArgs)] = new ObjectSerializer(ev => + Serializers[typeof(TestNodeStateChangedEventArgs)] = new ObjectSerializer(ev => new Dictionary { - Dictionary values = new() - { - [JsonRpcStrings.RunId] = ev.RunId, - [JsonRpcStrings.Changes] = ev.Changes?.Select(ch => Serialize(ch)).ToList(), - }; - - return values; + [JsonRpcStrings.RunId] = ev.RunId, + [JsonRpcStrings.Changes] = ev.Changes?.Select(ch => Serialize(ch)).ToList(), }); Serializers[typeof(TestNode)] = new ObjectSerializer( diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.cs index 7b75e5691a..6c6b66e31a 100644 --- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.cs +++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.cs @@ -19,14 +19,8 @@ static SerializerUtilities() Deserializers = []; Serializers[typeof(object)] = new ObjectSerializer(_ => new Dictionary()); - Serializers[typeof(KeyValuePair)] = new ObjectSerializer>(o => - { - Dictionary values = new() - { - { o.Key, o.Value }, - }; - return values; - }); + Serializers[typeof(KeyValuePair)] = new ObjectSerializer>( + o => new Dictionary { [o.Key] = o.Value }); RegisterRpcMessageSerializers(); RegisterTestNodeSerializers();