test up

Author: askazakov

.github/workflows/pr.yml

@@ -10,7 +10,8 @@ jobs:
       - uses: actions/setup-dotnet@v1
       - uses: actions/checkout@v2
       - run: dotnet build --configuration Release
-      - run: |
+      - name: unit tests  
+        run: |
           cd ${{ github.workspace }}/mongo-declarative-indexes.Tests
           dotnet test --configuration Release --no-build
         

mongo-declarative-indexes.Tests/IndexEnsurerShould.cs

@@ -76,24 +76,25 @@ public void Ensure_DropsExtraAndCreatesMissingIndexes()
                 {"name", "field_1"},
                 {"ns", "test.collections"}
             };
+            const string remainingFieldName = "remaining_field";
             var remainingDbIndex = new Dictionary<string, object>
             {
                 {"v", 2},
-                {"key", new Dictionary<string, object> {{"another_field", 1}}},
-                {"name", "another_field_1"},
+                {"key", new Dictionary<string, object> {{remainingFieldName, 1}}},
+                {"name", $"{remainingFieldName}_1"},
                 {"ns", "test.collections"}
             };
-            database.ListCollectionNames().Returns(new[] {"collectionName"});
-            database.ListIndexes("collectionName").Returns(new[] {extraIndex, remainingDbIndex});
-
+            const string collectionName = "collectionName";
+            database.ListCollectionNames().Returns(new[] {collectionName});
+            database.ListIndexes(collectionName).Returns(new[] {extraIndex, remainingDbIndex});
 
             var expectedCreatedIndexes = new[] {new Index(keys: new Key("yet_another_field", IndexType.Descending))};
             var ensurer = new IndexEnsurer(database);
-            var remainingIndex = new Index(keys: new Key("another_field", IndexType.Ascending));
-            ensurer.Ensure(new CollectionIndexes("testCollection",
+            var remainingIndex = new Index(keys: new Key(remainingFieldName, IndexType.Ascending));
+            ensurer.Ensure(new CollectionIndexes(collectionName,
                                                  expectedCreatedIndexes.Append(remainingIndex).ToArray()));
-            database.Received().DropOneIndex("collectionName", "field_1");
-            database.Received().CreateManyIndexes("testCollection",
+            database.Received().DropOneIndex(collectionName, "field_1");
+            database.Received().CreateManyIndexes(collectionName,
                                                   Arg.Is<Index[]>(actualIndexes =>
                                                                       actualIndexes
                                                                           .SequenceEqual(expectedCreatedIndexes)));

mongo-declarative-indexes/Index.cs

@@ -62,6 +62,26 @@ public Key(string field, IndexType indexType)
         public string Field { get; }
 
         public IndexType IndexType { get; }
+
+        protected bool Equals(Key other)
+        {
+            return Field == other.Field && IndexType == other.IndexType;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            return obj.GetType() == GetType() && Equals((Key) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return ((Field != null ? Field.GetHashCode() : 0) * 397) ^ (int) IndexType;
+            }
+        }
     }
 
     public enum IndexType

mongo-declarative-indexes/IndexEnsurer.cs

@@ -7,6 +7,9 @@ public class IndexEnsurer
     {
         private readonly IDatabase _database;
 
+        private static readonly IndexIgnoringNameEqualityComparer IndexIgnoringNameEqualityComparer =
+            new IndexIgnoringNameEqualityComparer();
+
         public IndexEnsurer(IDatabase database)
         {
             _database = database;
@@ -26,7 +29,7 @@ public EnsurerContinuation Begin(IEnumerable<CollectionIndexes> indexes)
                                                                   !targetIndexesByCollectionName
                                                                       .ContainsKey(i.CollectionName) ||
                                                                   !targetIndexesByCollectionName[i.CollectionName]
-                                                                      .Contains(x)).ToArray())).ToList();
+                                                                      .Contains(x, IndexIgnoringNameEqualityComparer)).ToArray())).ToList();
 
             foreach (var collectionIndex in extraIndexes)
             foreach (var index in collectionIndex.Indexes)
@@ -64,7 +67,28 @@ private static Index[] GetMissingIndexes(IReadOnlyDictionary<string, Index[]> ex
         {
             return collectionIndex.Indexes
                 .Where(i => !existingIndexesByCollectionName.ContainsKey(collectionIndex.CollectionName) ||
-                            !existingIndexesByCollectionName[collectionIndex.CollectionName].Contains(i)).ToArray();
+                            !existingIndexesByCollectionName[collectionIndex.CollectionName]
+                                .Contains(i, IndexIgnoringNameEqualityComparer)).ToArray();
+        }
+    }
+
+    internal class IndexIgnoringNameEqualityComparer : IEqualityComparer<Index>
+    {
+        public bool Equals(Index x, Index y)
+        {
+            if (ReferenceEquals(x, y)) return true;
+            if (ReferenceEquals(x, null)) return false;
+            if (ReferenceEquals(y, null)) return false;
+            if (x.GetType() != y.GetType()) return false;
+            return x.Keys.SequenceEqual(y.Keys) && x.Unique == y.Unique;
+        }
+
+        public int GetHashCode(Index obj)
+        {
+            unchecked
+            {
+                return ((obj.Keys != null ? obj.Keys.GetHashCode() : 0) * 397) ^ obj.Unique.GetHashCode();
+            }
         }
     }