Merge branch 'main' into merge-commit

Author: synercoder

tests/Synercoding.Primitives.Tests/PointTests.cs

@@ -92,6 +92,30 @@ public void Convert_From_Json_IsCorrect(string value, Point expected)
         Assert.Equal(expected, result);
     }
 
+    public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
+        => new[]
+        {
+                new object[]
+                {
+                    "{ \"X\": \"10mm\", \"Y\": \"20mm\" }",
+                    new Point(
+                        x: new Value(10, Unit.Millimeters),
+                        y: new Value(20, Unit.Millimeters)
+                    ),
+                }
+        };
+
+    [Theory]
+    [MemberData(nameof(DataForConvert_From_Json_IsCorrect))]
+    public void Convert_From_Json_IsCorrect(string value, Point expected)
+    {
+        // Act
+        var result = System.Text.Json.JsonSerializer.Deserialize<Point>(value);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
     public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
         => new[]
         {

tests/Synercoding.Primitives.Tests/RectangleTests.cs

@@ -105,6 +105,32 @@ public void Convert_From_Json_IsCorrect(string value, Rectangle expected)
         Assert.Equal(expected, result);
     }
 
+    public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
+        => new[]
+        {
+                new object[]
+                {
+                    "{ \"LLX\": \"1mm\", \"LLY\": \"2mm\", \"URX\": \"3mm\", \"URY\": \"4mm\" }",
+                    new Rectangle(
+                        llx: new Value(1, Unit.Millimeters),
+                        lly: new Value(2, Unit.Millimeters),
+                        urx: new Value(3, Unit.Millimeters),
+                        ury: new Value(4, Unit.Millimeters)
+                    ),
+                },
+        };
+
+    [Theory]
+    [MemberData(nameof(DataForConvert_From_Json_IsCorrect))]
+    public void Convert_From_Json_IsCorrect(string value, Rectangle expected)
+    {
+        // Act
+        var result = System.Text.Json.JsonSerializer.Deserialize<Rectangle>(value);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
     public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
         => new[]
         {

tests/Synercoding.Primitives.Tests/SizeTests.cs

@@ -92,6 +92,30 @@ public void Convert_From_Json_IsCorrect(string value, Size expected)
         Assert.Equal(expected, result);
     }
 
+    public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
+        => new[]
+        {
+                new object[]
+                {
+                    "{ \"Width\": \"10mm\", \"Height\": \"20mm\" }",
+                    new Size(
+                        width: new Value(10, Unit.Millimeters),
+                        height: new Value(20, Unit.Millimeters)
+                    ),
+                }
+        };
+
+    [Theory]
+    [MemberData(nameof(DataForConvert_From_Json_IsCorrect))]
+    public void Convert_From_Json_IsCorrect(string value, Size expected)
+    {
+        // Act
+        var result = System.Text.Json.JsonSerializer.Deserialize<Size>(value);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
     public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
         => new[]
         {

tests/Synercoding.Primitives.Tests/SpacingTests.cs

@@ -89,6 +89,33 @@ public void Convert_From_Json_IsCorrect(string value, Spacing expected)
         Assert.Equal(expected, result);
     }
 
+    public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
+        => new[]
+        {
+                new object[]
+                {
+                    "{ \"Left\": \"1mm\", \"Right\": \"2mm\", \"Top\": \"3mm\", \"Bottom\": \"4mm\" }",
+                    new Spacing(
+                        left: new Value(1, Unit.Millimeters),
+                        right: new Value(2, Unit.Millimeters),
+                        top: new Value(3, Unit.Millimeters),
+                        bottom: new Value(4, Unit.Millimeters)
+                    ),
+                },
+                new object[]{ "\"All: 5mm\"", new Spacing(new Value(5, Unit.Millimeters)) }
+        };
+
+    [Theory]
+    [MemberData(nameof(DataForConvert_From_Json_IsCorrect))]
+    public void Convert_From_Json_IsCorrect(string value, Spacing expected)
+    {
+        // Act
+        var result = System.Text.Json.JsonSerializer.Deserialize<Spacing>(value);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
     public static IEnumerable<object[]> DataForConvert_From_Json_IsCorrect
         => new[]
         {