exclude empty values from MultiString when deserializing JSON

sillsdev · Jan 15, 2025 · df22ca0 · df22ca0
1 parent 558ec54
commit df22ca0
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 16 deletions.
diff --git a/backend/FwLite/MiniLcm.Tests/MultiStringTests.cs b/backend/FwLite/MiniLcm.Tests/MultiStringTests.cs
@@ -0,0 +1,72 @@
+using System.Text.Json;
+using SystemTextJsonPatch;
+
+namespace MiniLcm.Tests;
+
+public class MultiStringTests
+{
+
+    [Fact]
+    public void CanDeserializeMultiString()
+    {
+        //lang=json
+        var json = """{"en": "test"}""";
+        var expectedMs = new MultiString() { Values = { { "en", "test" } } };
+        var actualMs = JsonSerializer.Deserialize<MultiString>(json);
+        actualMs.Should().NotBeNull();
+        actualMs.Values.Should().ContainKey("en");
+        actualMs.Should().BeEquivalentTo(expectedMs);
+    }
+
+    [Fact]
+    public void MultiString_DeserializesEmptyString()
+    {
+        //lang=json
+        var json = """{"en": ""}""";
+        var actualMs = JsonSerializer.Deserialize<MultiString>(json);
+        actualMs.Should().NotBeNull();
+        actualMs.Values.Should().NotContainKey("en");
+    }
+
+    [Fact]
+    public void MultiString_DeserializesWhitespaceString()
+    {
+        //lang=json
+        var json = """{"en": "\t"}""";
+        var actualMs = JsonSerializer.Deserialize<MultiString>(json);
+        actualMs.Should().NotBeNull();
+        actualMs.Values.Should().ContainKey("en");
+    }
+
+    [Fact]
+    public void JsonPatchCanUpdateMultiString()
+    {
+        var ms = new MultiString() { Values = { { "en", "test" } } };
+        var patch = new JsonPatchDocument<MultiString>();
+        patch.Replace(ms => ms["en"], "updated");
+        patch.ApplyTo(ms);
+        ms.Values.Should().ContainKey("en");
+        ms.Values["en"].Should().Be("updated");
+    }
+
+    [Fact]
+    public void JsonPatchCanRemoveMultiString()
+    {
+        var ms = new MultiString() { Values = { { "en", "test" } } };
+        var patch = new JsonPatchDocument<MultiString>();
+        patch.Remove(ms => ms["en"]);
+        patch.ApplyTo(ms);
+        ms.Values.Should().NotContainKey("en");
+    }
+
+    [Fact]
+    public void JsonPatchCanAddMultiString()
+    {
+        var ms = new MultiString() { Values = { { "en", "test" } } };
+        var patch = new JsonPatchDocument<MultiString>();
+        patch.Add(ms => ms["fr"], "test");
+        patch.ApplyTo(ms);
+        ms.Values.Should().ContainKey("fr");
+        ms.Values["fr"].Should().Be("test");
+    }
+}
diff --git a/...wLite/LcmCrdt.Tests/SerializationTests.cs → ...wLite/MiniLcm.Tests/SerializationTests.cs b/...wLite/LcmCrdt.Tests/SerializationTests.cs → ...wLite/MiniLcm.Tests/SerializationTests.cs
@@ -1,8 +1,7 @@
 using System.Text.Json;
-using MiniLcm.Models;
 using Xunit.Abstractions;
 
-namespace LcmCrdt.Tests;
+namespace MiniLcm.Tests;
 
 public class SerializationTests(ITestOutputHelper output)
 {
@@ -65,20 +64,6 @@ public void CanDeserializeEntry()
         fromJson.Should().BeEquivalentTo(entry);
     }
 
-    [Fact]
-    public void CanDeserializeMultiString()
-    {
-        //lang=json
-        var json = """{"en": "test"}""";
-        var expectedMs = new MultiString()
-        {
-            Values = { { "en", "test" } }
-        };
-        var actualMs = JsonSerializer.Deserialize<MultiString>(json);
-        actualMs.Should().NotBeNull();
-        actualMs.Values.Should().ContainKey("en");
-        actualMs.Should().BeEquivalentTo(expectedMs);
-    }
 
     [Fact]
     public void EqualityTest()

diff --git a/backend/FwLite/MiniLcm/Models/MultiString.cs b/backend/FwLite/MiniLcm/Models/MultiString.cs
@@ -168,6 +168,7 @@ public class MultiStringConverter : JsonConverter<MultiString>
         var ms = new MultiString();
         foreach (var (key, value) in dict)
         {
+            if (string.IsNullOrEmpty(value)) continue;
             ms.Values[key] = value;
         }