CSHARP-1716: Remove Equals from AggregateBucketResult.

Author: rstam

src/MongoDB.Driver/AggregateBucketResult.cs

@@ -58,26 +58,5 @@ public AggregateBucketResult(TValue id, long count)
         /// </value>
         [BsonElement("count")]
         public long Count { get; private set; }
-
-        // public methods        
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            var other = obj as AggregateBucketResult<TValue>;
-            if (object.ReferenceEquals(other, null))
-            {
-                return false;
-            }
-
-            return
-                Id.Equals(other.Id) &&
-                Count == other.Count;
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return 0;
-        }
     }
 }

tests/MongoDB.Bson.TestHelpers/CustomEquatable.cs

@@ -33,13 +33,21 @@ public CustomEquatable(T value, IEqualityComparer<T> comparer)
 
         public override bool Equals(object obj)
         {
-            var other = obj as CustomEquatable<T>;
-            if (object.ReferenceEquals(other, null))
+            T other;
+            if (obj is T)
+            {
+                other = (T)obj;
+            }
+            else if (obj is CustomEquatable<T>)
+            {
+                other = ((CustomEquatable<T>)obj)._value;
+            }
+            else
             {
                 return false;
             }
 
-            return _comparer.Equals(_value, other._value);
+            return _comparer.Equals(_value, other);
         }
 
         public override int GetHashCode()

tests/MongoDB.Driver.Tests/AggregateBucketResultEqualityComparer.cs

@@ -0,0 +1,48 @@
+/* Copyright 2016 MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System.Collections.Generic;
+
+namespace MongoDB.Driver.Tests
+{
+    public class AggregateBucketResultEqualityComparer<TValue> : IEqualityComparer<AggregateBucketResult<TValue>>
+    {
+        private static readonly AggregateBucketResultEqualityComparer<TValue> __instance = new AggregateBucketResultEqualityComparer<TValue>();
+
+        public static AggregateBucketResultEqualityComparer<TValue> Instance => __instance;
+
+        public bool Equals(AggregateBucketResult<TValue> x, AggregateBucketResult<TValue> y)
+        {
+            if (object.ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (object.ReferenceEquals(x, null) || object.ReferenceEquals(y, null))
+            {
+                return false;
+            }
+
+            return
+                x.Id.Equals(y.Id) &&
+                x.Count == y.Count;
+        }
+
+        public int GetHashCode(AggregateBucketResult<TValue> obj)
+        {
+            return 0;
+        }
+    }
+}

tests/MongoDB.Driver.Tests/AggregateFluentTests.cs

@@ -22,6 +22,7 @@
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Bson.TestHelpers;
 using MongoDB.Bson.TestHelpers.XunitExtensions;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.TestHelpers.XunitExtensions;
@@ -485,7 +486,8 @@ public void Bucket_should_return_expected_result()
                 new AggregateBucketResult<BsonValue>(1920, 2),
                 new AggregateBucketResult<BsonValue>("Unknown", 1),
             };
-            buckets.Should().Equal(expectedBuckets);
+            var comparer = AggregateBucketResultEqualityComparer<BsonValue>.Instance;
+            buckets.WithComparer(comparer).Should().Equal(expectedBuckets);
         }
 
         [Fact]
@@ -567,7 +569,8 @@ public void Bucket_typed_should_return_expected_result()
                 new AggregateBucketResult<BsonValue>(1920, 2),
                 new AggregateBucketResult<BsonValue>("Unknown", 1),
             };
-            buckets.Should().Equal(expectedBuckets);
+            var comparer = AggregateBucketResultEqualityComparer<BsonValue>.Instance;
+            buckets.WithComparer(comparer).Should().Equal(expectedBuckets);
         }
 
         [Fact]

tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj

@@ -97,6 +97,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AggregateBucketResultEqualityComparer.cs" />
     <Compile Include="AggregateFluentTests.cs" />
     <Compile Include="AsyncCursorHelperTests.cs" />
     <Compile Include="BulkWriteErrorTests.cs" />