Clean up

Author: Havret

src/System.Text.Json.Protobuf/JsonSerializerOptionsExtensions.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Protobuf;
+
+// ReSharper disable once CheckNamespace
+namespace System.Text.Json;
+
+public static class JsonSerializerOptionsExtensions
+{
+    public static void AddProtobufSupport(this JsonSerializerOptions options)
+    {
+        options.Converters.Add(new ProtobufJsonConverterFactory());
+    }
+}

src/System.Text.Json.Protobuf/ProtobufJsonConverterFactory.cs

@@ -3,7 +3,7 @@
 
 namespace System.Text.Json.Protobuf;
 
-public class ProtobufJsonConverterFactory : JsonConverterFactory
+internal class ProtobufJsonConverterFactory : JsonConverterFactory
 {
     public override bool CanConvert(Type typeToConvert)
     {

test/System.Text.Json.Protobuf.Tests/MessageWithRepeatedListTests.Should_serialize_message_with_repeated_list.approved.json

@@ -0,0 +1,12 @@
+{
+  "int32List": [
+    1,
+    2,
+    3
+  ],
+  "int64List": [
+    2147483648,
+    2147483649,
+    2147483650
+  ]
+}

test/System.Text.Json.Protobuf.Tests/MessageWithRepeatedListTests.cs

@@ -0,0 +1,52 @@
+using System.Text.Json.Protobuf.Tests.Utils;
+using Shouldly;
+using SmartAnalyzers.ApprovalTestsExtensions;
+using Xunit;
+
+namespace System.Text.Json.Protobuf.Tests;
+
+public class MessageWithRepeatedListTests
+{
+    [Fact]
+    public void Should_serialize_message_with_repeated_list()
+    {
+        // Arrange
+        var msg = new MessageWithRepeatedList
+        {
+            Int32List = {1, 2, 3},
+            Int64List = {int.MaxValue + 1L, int.MaxValue + 2L, int.MaxValue + 3L}
+        };
+
+        var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();
+
+        // Act
+        var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
+
+        // Assert
+        var approver = new ExplicitApprover();
+        approver.VerifyJson(serialized);
+    }
+
+    [Fact]
+    public void Should_deserialize_message_with_repeated_list()
+    {
+        // Arrange
+        var msg = new MessageWithRepeatedList
+        {
+            Int32List = {1, 2, 3},
+            Int64List = {int.MaxValue + 1L, int.MaxValue + 2L, int.MaxValue + 3L}
+        };
+
+        var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();
+
+        // Act
+        var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
+        var deserialized = JsonSerializer.Deserialize<MessageWithRepeatedList>(serialized, jsonSerializerOptions);
+
+        // Assert
+        deserialized.ShouldNotBeNull();
+
+        deserialized.Int32List.ShouldBe(msg.Int32List);
+        deserialized.Int64List.ShouldBe(msg.Int64List);
+    }
+}

test/System.Text.Json.Protobuf.Tests/Protos/message_with_reptead_list.proto

@@ -4,4 +4,6 @@ option csharp_namespace = "System.Text.Json.Protobuf.Tests";
 
 message MessageWithRepeatedList {
   repeated int32 int_32_list = 1;
+
+  repeated int64 int_64_list = 2;
 }

test/System.Text.Json.Protobuf.Tests/SimpleMessageTests.Should_serialize_message_with_repeated_list.approved.json

@@ -1,3 +1,4 @@
+using System.Text.Json.Protobuf.Tests.Utils;
 using Shouldly;
 using SmartAnalyzers.ApprovalTestsExtensions;
 using Xunit;
@@ -15,8 +16,9 @@ public void Should_serialize_message_with_primitive_types()
             Int32Property = 1,
             Int64Property = 2,
         };
-        var jsonSerializerOptions = CreateJsonSerializerOptions();
-
+        var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();
+        
+        // Act
         var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
 
         // Assert
@@ -33,8 +35,9 @@ public void Should_deserialize_message_with_primitive_types()
             Int32Property = 1,
             Int64Property = 2,
         };
-        var jsonSerializerOptions = CreateJsonSerializerOptions();
+        var jsonSerializerOptions = TestHelper.CreateJsonSerializerOptions();
 
+        // Act
         var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
         var deserialized = JsonSerializer.Deserialize<SimpleMessage>(serialized, jsonSerializerOptions);
 
@@ -43,46 +46,4 @@ public void Should_deserialize_message_with_primitive_types()
         deserialized.Int32Property.ShouldBe(msg.Int32Property);
         deserialized.Int64Property.ShouldBe(msg.Int64Property);
     }
-
-    [Fact]
-    public void Should_serialize_message_with_repeated_list()
-    {
-        var msg = new MessageWithRepeatedList
-        {
-            Int32List = {1, 2, 3}
-        };
-        
-        var jsonSerializerOptions = CreateJsonSerializerOptions();
-
-        var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
-
-        // Assert
-        var approver = new ExplicitApprover();
-        approver.VerifyJson(serialized);
-    }
-    
-    [Fact]
-    public void Should_deserialize_message_with_repeated_list()
-    {
-        var msg = new MessageWithRepeatedList
-        {
-            Int32List = {1, 2, 3}
-        };
-        
-        var jsonSerializerOptions = CreateJsonSerializerOptions();
-
-        var serialized = JsonSerializer.Serialize(msg, jsonSerializerOptions);
-        var deserialized = JsonSerializer.Deserialize<MessageWithRepeatedList>(serialized, jsonSerializerOptions);
-
-        // Assert
-        deserialized.ShouldNotBeNull();
-        deserialized.Int32List.ShouldBeEquivalentTo(msg.Int32List);
-    }
-
-    private static JsonSerializerOptions CreateJsonSerializerOptions()
-    {
-        var jsonSerializerOptions = new JsonSerializerOptions();
-        jsonSerializerOptions.Converters.Add(new ProtobufJsonConverterFactory());
-        return jsonSerializerOptions;
-    }
 }

test/System.Text.Json.Protobuf.Tests/SimpleMessageTests.cs

@@ -0,0 +1,11 @@
+namespace System.Text.Json.Protobuf.Tests.Utils;
+
+public class TestHelper
+{
+    public static JsonSerializerOptions CreateJsonSerializerOptions()
+    {
+        var jsonSerializerOptions = new JsonSerializerOptions();
+        jsonSerializerOptions.AddProtobufSupport();
+        return jsonSerializerOptions;
+    }
+}