5.2.0 release

skclusive · Dec 5, 2020 · e6d5356 · e6d5356
1 parent 8c522e5
commit e6d5356
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/src/StateTree.csproj b/src/StateTree.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>5.1.2</VersionPrefix>
+    <VersionPrefix>5.2.0</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
     <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <RazorLangVersion>3.0</RazorLangVersion>
@@ -20,9 +20,9 @@
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
   </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Skclusive.Mobx.Observable" Version="5.1.2" />
+    <PackageReference Include="Skclusive.Mobx.Observable" Version="5.2.0" />
   </ItemGroup>
   <!-- <ItemGroup>
-    <ProjectReference Include="..\..\Skclusive.Mobx.Observable\src\Observable.csproj" Version="5.1.2" />
+    <ProjectReference Include="..\..\Skclusive.Mobx.Observable\src\Observable.csproj" />
   </ItemGroup> -->
 </Project>
diff --git a/test/StateTree.Tests.csproj b/test/StateTree.Tests.csproj
@@ -16,6 +16,11 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
+    <PackageReference Include="Skclusive.Text.Json" Version="5.2.0-alpha6" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\src\StateTree.csproj" />

diff --git a/test/StateTree.Tests/TestNested.cs b/test/StateTree.Tests/TestNested.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
 using Skclusive.Mobx.StateTree;
+using Skclusive.Text.Json;
 using Xunit;
 using static Skclusive.Mobx.StateTree.Tests.TestTypes;
 
@@ -11,6 +13,14 @@ public class TestNested
         [Fact]
         public void TestRoot()
         {
+            var services = new ServiceCollection();
+            services.TryAddJsonServices();
+            services.TryAddJsonTypeConverter<IRootSnapshot, RootSnapshot>();
+            services.TryAddJsonTypeConverter<IBranchSnapshot, BranchSnapshot>();
+            services.TryAddJsonTypeConverter<ITreeSnapshot, TreeSnapshot>();
+
+            var jsonService = services.BuildServiceProvider().GetService<IJsonService>();
+
             var root = RootType.Create(new RootSnapshot
             {
                 Tree = new TreeSnapshot
@@ -43,6 +53,39 @@ public void TestRoot()
             root.Tree.Branches[2].EditName("branch 3");
 
             Assert.Equal("branch 3", root.Tree.Branches[2].Name);
+
+            var rootSnapshot = new RootSnapshot
+            {
+                Tree = new TreeSnapshot
+                {
+                    Branches = new IBranchSnapshot[]
+                    {
+                        new BranchSnapshot { Name = "snap branch 1" },
+
+                        new BranchSnapshot { Name = "snap branch 2" }
+                    }
+                }
+            };
+
+            root.ApplySnapshot(rootSnapshot);
+
+            Assert.Equal(2, root.Tree.Branches.Count);
+
+            Assert.Equal("snap branch 1", root.Tree.Branches[0].Name);
+
+            Assert.Equal("snap branch 2", root.Tree.Branches[1].Name);
+
+            var jsonSnapshot = jsonService.Serialize(rootSnapshot);
+
+            var jsonSerialized = jsonService.Deserialize<RootSnapshot>(jsonSnapshot);
+
+            root.ApplySnapshot(jsonSerialized);
+
+            Assert.Equal(2, root.Tree.Branches.Count);
+
+            Assert.Equal("snap branch 1", root.Tree.Branches[0].Name);
+
+            Assert.Equal("snap branch 2", root.Tree.Branches[1].Name);
         }
     }
 }