Add tests and fix base copier

dotnet · Nov 2, 2024 · af16a0c · af16a0c
1 parent 00f41d9
commit af16a0c
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/src/Orleans.Serialization/Codecs/CollectionCodec.cs b/src/Orleans.Serialization/Codecs/CollectionCodec.cs
@@ -204,6 +204,8 @@ public Collection<T> DeepCopy(Collection<T> input, CopyContext context)
     /// <inheritdoc/>
     public void DeepCopy(Collection<T> input, Collection<T> output, CopyContext context)
     {
+        output.Clear();
+
         foreach (var item in input)
         {
             output.Add(_copier.DeepCopy(item, context));

diff --git a/test/Orleans.Serialization.UnitTests/BuiltInCodecTests.cs b/test/Orleans.Serialization.UnitTests/BuiltInCodecTests.cs
@@ -2215,6 +2215,56 @@ protected override Collection<int> CreateValue()
         protected override Collection<int>[] TestValues => [null, new Collection<int>(), CreateValue(), CreateValue(), CreateValue()];
     }
 
+    [GenerateSerializer]
+    public class TypeWithCollectionBase : Collection<int>
+    {
+        public TypeWithCollectionBase() : this(true) { }
+        public TypeWithCollectionBase(bool addDefaultValue)
+        {
+            if (addDefaultValue)
+            {
+                this.Add(42);
+            }
+        }
+
+        [Id(0)]
+        public int OtherProperty { get; set; }
+
+        public override string ToString() => $"[OtherProperty: {OtherProperty}, Values: [{string.Join(", ", this)}]]";
+    }
+
+    public class CollectionBaseCodecTests(ITestOutputHelper output) : FieldCodecTester<TypeWithCollectionBase, IFieldCodec<TypeWithCollectionBase>>(output)
+    {
+        private static TypeWithCollectionBase AddValues(TypeWithCollectionBase value)
+        {
+            value.Add(1);
+            value.Add(2);
+            value.Add(3);
+            return value;
+        }
+
+        protected override TypeWithCollectionBase[] TestValues => [null, new(), new(addDefaultValue: false), new() { 15 }, AddValues(new() { OtherProperty = 123 })];
+
+        protected override TypeWithCollectionBase CreateValue() => AddValues(new() { OtherProperty = Random.Next() });
+        protected override bool Equals(TypeWithCollectionBase left, TypeWithCollectionBase right) => ReferenceEquals(left, right) || left.SequenceEqual(right) && left.OtherProperty == right.OtherProperty;
+    }
+
+    public class CollectionBaseCopierTests(ITestOutputHelper output) : CopierTester<TypeWithCollectionBase, IDeepCopier<TypeWithCollectionBase>>(output)
+    {
+        private static TypeWithCollectionBase AddValues(TypeWithCollectionBase value)
+        {
+            value.Add(1);
+            value.Add(2);
+            value.Add(3);
+            return value;
+        }
+
+        protected override TypeWithCollectionBase[] TestValues => [null, new(), new(addDefaultValue: false), new() { 15 }, AddValues(new() { OtherProperty = 123 })];
+
+        protected override TypeWithCollectionBase CreateValue() => AddValues(new() { OtherProperty = Random.Next() });
+        protected override bool Equals(TypeWithCollectionBase left, TypeWithCollectionBase right) => ReferenceEquals(left, right) || left.SequenceEqual(right) && left.OtherProperty == right.OtherProperty;
+    }
+
     public class ReadOnlyCollectionCodecTests(ITestOutputHelper output) : FieldCodecTester<ReadOnlyCollection<int>, ReadOnlyCollectionCodec<int>>(output)
     {
         protected override ReadOnlyCollection<int> CreateValue()