Update the cross framework spec to include complex POCO object, Type …

…serialization, and support for netcoreapp3.1 and net5.0

src/Hyperion.Tests/CrossFrameworkSerializationTests.cs

@@ -2,26 +2,39 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using FluentAssertions;
 using Hyperion.Tests.Generator;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Hyperion.Tests
 {
     public class CrossFrameworkSerializationTests
     {
+        private readonly ITestOutputHelper _log;
         private readonly Serializer _serializer;
         private readonly CrossFrameworkClass _originalObject;
+        private readonly CrossFrameworkMixedClass _originalMixedObject;
 
-        public CrossFrameworkSerializationTests()
+        public CrossFrameworkSerializationTests(ITestOutputHelper log)
         {
+            _log = log;
             _serializer = new Serializer();
             _originalObject = CrossFrameworkInitializer.Init();
+            _originalMixedObject = CrossFrameworkInitializer.InitMixed();
         }
 
         public static IEnumerable<object[]> SerializationFiles()
         {
             const string defaultOutputPath = CrossFrameworkInitializer.DefaultOutputPath;
-            var testFiles = Directory.GetFiles(defaultOutputPath, "*.tf");
+            var testFiles = Directory.GetFiles(defaultOutputPath, "test_file_.*.tf");
+            return testFiles.Select(x => new object[] { x });
+        }
+
+        public static IEnumerable<object[]> MixedSerializationFiles()
+        {
+            const string defaultOutputPath = CrossFrameworkInitializer.DefaultOutputPath;
+            var testFiles = Directory.GetFiles(defaultOutputPath, "mixed_test_file_.*.tf");
             return testFiles.Select(x => new object[] { x });
         }
 
@@ -32,8 +45,20 @@ public void CanSerializeCrossFramework(string fileName)
             using (var fileStream = new FileStream(fileName, FileMode.Open))
             {
                 var crossFrameworkClass = _serializer.Deserialize<CrossFrameworkClass>(fileStream);
+                _originalObject.Should()
+                    .Be(crossFrameworkClass, $"[CrossFrameworkClass] {fileName} deserialization should work.");
+            }
+        }
 
-                Assert.Equal(_originalObject, crossFrameworkClass);
+        [Theory]
+        [MemberData(nameof(MixedSerializationFiles))]
+        public void CanSerializeComplexObjectCrossFramework(string fileName)
+        {
+            using (var fileStream = new FileStream(fileName, FileMode.Open))
+            {
+                var deserialized = _serializer.Deserialize<CrossFrameworkMixedClass>(fileStream);
+                _originalMixedObject.Should()
+                    .Be(deserialized, $"[CrossFrameworkMixedClass] {fileName} deserialization should work.");
             }
         }
     }

src/Hyperion.Tests/Generator/CrossFrameworkClass.cs

@@ -122,4 +122,47 @@ private bool Equals(CrossFrameworkClass other)
                    && Struct.Equals(other.Struct);
         }
     }
+
+    public interface ICrossFrameworkA
+    {
+        string Name { get; set; }
+    }
+
+    public interface ICrossFrameworkB : ICrossFrameworkA
+    {
+        string Sound { get; set; }
+    }
+
+    public class CrossFrameworkBase : ICrossFrameworkB
+    {
+        public string Name { get; set; }
+        public string Sound { get; set; }
+    }
+
+    public class CrossFrameworkMixedClass : CrossFrameworkBase
+    {
+        public Type FriendType { get; set; }
+        public CrossFrameworkClass Data { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is CrossFrameworkMixedClass other))
+                return false;
+            return other.Equals(this);
+        }
+
+        protected bool Equals(CrossFrameworkMixedClass other)
+        {
+            if (other.Sound != Sound || other.Name != Name)
+                return false;
+            return other.Data.Equals(Data);
+        }
+
+        public override int GetHashCode()
+        {
+            int hash = Name.GetHashCode();
+            hash = (hash * 397) ^ Sound.GetHashCode();
+            return (Data != null ? (hash * 397) ^  Data.GetHashCode() : hash);
+        }
+    }
 }

src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs

@@ -6,6 +6,17 @@ public static class CrossFrameworkInitializer
     {
         public const string DefaultOutputPath = "../../../testfiles";
 
+        public static CrossFrameworkMixedClass InitMixed()
+        {
+            return new CrossFrameworkMixedClass
+            {
+                Name = "Cookie",
+                Sound = "Bark",
+                FriendType = typeof(CrossFrameworkClass),
+                Data = Init()
+            };
+        }
+
         public static CrossFrameworkClass Init()
         {
             return new CrossFrameworkClass()

src/Hyperion.Tests/Generator/Program.cs

@@ -30,14 +30,21 @@ private static void Main(string[] args)
             }
 
             CrossFrameworkClass crossFrameworkClass = CrossFrameworkInitializer.Init();
+            var crossFrameworkMixedClass = CrossFrameworkInitializer.InitMixed();
 
             string fileName = $"test_file_{FrameworkName.ToLowerInvariant()}.tf";
             string fullPath = Path.Combine(outputPath, fileName);
-
             using (var fileStream = new FileStream(fullPath, FileMode.Create))
             {
                 Serializer.Serialize(crossFrameworkClass, fileStream);
             }
+
+            fileName = $"mixed_test_file_{FrameworkName.ToLowerInvariant()}.tf";
+            fullPath = Path.Combine(outputPath, fileName);
+            using (var fileStream = new FileStream(fullPath, FileMode.Create))
+            {
+                Serializer.Serialize(crossFrameworkMixedClass, fileStream);
+            }
         }
     }
 }

src/Hyperion.Tests/Hyperion.Tests.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net5.0</TargetFrameworks>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>latest</LangVersion>
     <StartupObject>Hyperion.Tests.Generator.Program</StartupObject>