Fixed unneeded casts in unit tests and removed duplicate test

Morten Turn Pedersen · Morten Turn Pedersen · commit 578326c51cba · 2021-01-12T13:26:54.000+01:00
diff --git a/NetCoreEntityFramework.Tests/EntityRepositoryTests.cs b/NetCoreEntityFramework.Tests/EntityRepositoryTests.cs
@@ -69,20 +69,20 @@ public async Task AddAddsEntityAndSetsAttributes()
         }
 
         [Test]
-        public async Task AddEntityWithIdKeepsId()
+        [AutoData]
+        public async Task AddEntityWithIdKeepsId(Guid idToCreate)
         {
-            Guid id = Guid.NewGuid();
             var entity = new TestEntity
             {
-                Id = id
+                Id = idToCreate
             };
 
             await using (_repository)
             {
                 await _repository.Add(entity);
             }
 
-            Assert.AreEqual(id, entity.Id);
+            Assert.AreEqual(idToCreate, entity.Id);
         }
 
         [Test]
@@ -93,13 +93,6 @@ public void AddThrowsExceptionIfEntityIsNull()
         #endregion
 
         #region List
-        [Test]
-        public async Task GetListReturnsAllNotDeleted()
-        {
-            var entities = await _repository.GetList();
-
-            Assert.AreEqual(_listEntities.Count() + 1, entities.Count());
-        }
 
         [Test]
         public async Task GetListReturnsAll()
@@ -211,7 +204,7 @@ private TestEntity GetTestEntity(string property)
         [Test]
         public async Task GetValidEntityReturnsEntity()
         {
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreSame(_entity, entity);
         }
@@ -240,7 +233,7 @@ public async Task UpdateUpdatesUpdated(string propertyValue)
                 await _repository.Update(_entity);
             }
 
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreEqual(propertyValue, entity.Property);
             Assert.AreNotEqual(oldUpdated, entity.Updated);
@@ -259,7 +252,7 @@ public void UpdateThrowsExceptionIfNull()
         public async Task DeleteDeletesEntity()
         {
             bool success;
-            var currentEntityCount = _context.Table.Count();
+            var expectedEntityCount = _context.Table.Count() - 1;
             await using(_repository)
             {
                 success = await _repository.Delete(_entity);
@@ -268,7 +261,7 @@ public async Task DeleteDeletesEntity()
             var newlyDeletedEntity = await _repository.Get(_entity.Id);
             Assert.IsTrue(success);
             Assert.IsNull(newlyDeletedEntity);
-            Assert.AreEqual(currentEntityCount - 1, _context.Table.Count());
+            Assert.AreEqual(expectedEntityCount, _context.Table.Count());
         }
 
         [Test]
diff --git a/NetCoreEntityFramework.Tests/EntitySoftDeleteRepositoryTests.cs b/NetCoreEntityFramework.Tests/EntitySoftDeleteRepositoryTests.cs
@@ -233,23 +233,23 @@ private TestSoftDeleteEntity GetTestEntity(string property)
         [Test]
         public async Task GetValidEntityReturnsEntity()
         {
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreSame(_entity, entity);
         }
 
         [Test]
         public async Task DontGetDeletedEntityWithoutFlag()
         {
-            var entity = await _repository.Get((Guid)_deletedEntity.Id);
+            var entity = await _repository.Get(_deletedEntity.Id);
 
             Assert.IsNull(entity);
         }
 
         [Test]
         public async Task GetDeletedEntityWithFlag()
         {
-            var entity = await _repository.Get((Guid)_deletedEntity.Id, true);
+            var entity = await _repository.Get(_deletedEntity.Id, true);
 
             Assert.AreSame(_deletedEntity, entity);
         }
@@ -269,7 +269,7 @@ public async Task UpdateUpdatesUpdated(string propertyValue)
                 await _repository.Update(_entity);
             }
 
-            var entity = await _repository.Get((Guid)_entity.Id);
+            var entity = await _repository.Get(_entity.Id);
 
             Assert.AreEqual(propertyValue, entity.Property);
             Assert.AreNotEqual(oldUpdated, entity.Updated);
@@ -293,7 +293,7 @@ public async Task DeleteSoftDeletesAndSetsDeletedAt()
                 success = await _repository.Delete(_entity);
             }
 
-            var newlyDeletedEntity = await _repository.Get((Guid)_entity.Id, true);
+            var newlyDeletedEntity = await _repository.Get(_entity.Id, true);
             Assert.IsTrue(success);
             Assert.IsTrue(newlyDeletedEntity.Deleted);
             Assert.NotNull(newlyDeletedEntity.DeletedAt);
@@ -309,7 +309,7 @@ public void DeleteThrowsExceptionIfArgumentNull()
         public async Task DeleteWithValidIdDeletesAndSetsDeletedAt()
         {
             bool success;
-            Guid id = (Guid)_entity.Id;
+            Guid id = _entity.Id;
             await using (_repository)
             {
                 success = await _repository.Delete(id);
@@ -353,7 +353,7 @@ public async Task RestoreSetsDeletedFalse()
                 success = await _repository.Restore(_deletedEntity);
             }
 
-            var restoredEntity = await _repository.Get((Guid)_deletedEntity.Id);
+            var restoredEntity = await _repository.Get(_deletedEntity.Id);
             Assert.IsTrue(success);
             Assert.IsFalse(restoredEntity.Deleted);
             Assert.IsNull(restoredEntity.DeletedAt);
@@ -369,7 +369,7 @@ public void RestoreThrowsExceptionWhenEntityNull()
         public async Task RestoreOnIdSetsDeletedFalse()
         {
             bool success;
-            Guid id = (Guid)_deletedEntity.Id;
+            Guid id = _deletedEntity.Id;
 
             await using (_repository)
             {

Original file line number	Diff line number	Diff line change
`@@ -69,20 +69,20 @@ public async Task AddAddsEntityAndSetsAttributes()`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`[Test]`
`72`		`- public async Task AddEntityWithIdKeepsId()`
	`72`	`+ [AutoData]`
	`73`	`+ public async Task AddEntityWithIdKeepsId(Guid idToCreate)`
`73`	`74`	`{`
`74`		`- Guid id = Guid.NewGuid();`
`75`	`75`	`var entity = new TestEntity`
`76`	`76`	`{`
`77`		`- Id = id`
	`77`	`+ Id = idToCreate`
`78`	`78`	`};`
`79`	`79`
`80`	`80`	`await using (_repository)`
`81`	`81`	`{`
`82`	`82`	`await _repository.Add(entity);`
`83`	`83`	`}`
`84`	`84`
`85`		`- Assert.AreEqual(id, entity.Id);`
	`85`	`+ Assert.AreEqual(idToCreate, entity.Id);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`[Test]`
`@@ -93,13 +93,6 @@ public void AddThrowsExceptionIfEntityIsNull()`
`93`	`93`	`#endregion`
`94`	`94`
`95`	`95`	`#region List`
`96`		`- [Test]`
`97`		`- public async Task GetListReturnsAllNotDeleted()`
`98`		`- {`
`99`		`- var entities = await _repository.GetList();`
`100`		`-`
`101`		`- Assert.AreEqual(_listEntities.Count() + 1, entities.Count());`
`102`		`- }`
`103`	`96`
`104`	`97`	`[Test]`
`105`	`98`	`public async Task GetListReturnsAll()`
`@@ -211,7 +204,7 @@ private TestEntity GetTestEntity(string property)`
`211`	`204`	`[Test]`
`212`	`205`	`public async Task GetValidEntityReturnsEntity()`
`213`	`206`	`{`
`214`		`- var entity = await _repository.Get((Guid)_entity.Id);`
	`207`	`+ var entity = await _repository.Get(_entity.Id);`
`215`	`208`
`216`	`209`	`Assert.AreSame(_entity, entity);`
`217`	`210`	`}`
`@@ -240,7 +233,7 @@ public async Task UpdateUpdatesUpdated(string propertyValue)`
`240`	`233`	`await _repository.Update(_entity);`
`241`	`234`	`}`
`242`	`235`
`243`		`- var entity = await _repository.Get((Guid)_entity.Id);`
	`236`	`+ var entity = await _repository.Get(_entity.Id);`
`244`	`237`
`245`	`238`	`Assert.AreEqual(propertyValue, entity.Property);`
`246`	`239`	`Assert.AreNotEqual(oldUpdated, entity.Updated);`
`@@ -259,7 +252,7 @@ public void UpdateThrowsExceptionIfNull()`
`259`	`252`	`public async Task DeleteDeletesEntity()`
`260`	`253`	`{`
`261`	`254`	`bool success;`
`262`		`- var currentEntityCount = _context.Table.Count();`
	`255`	`+ var expectedEntityCount = _context.Table.Count() - 1;`
`263`	`256`	`await using(_repository)`
`264`	`257`	`{`
`265`	`258`	`success = await _repository.Delete(_entity);`
`@@ -268,7 +261,7 @@ public async Task DeleteDeletesEntity()`
`268`	`261`	`var newlyDeletedEntity = await _repository.Get(_entity.Id);`
`269`	`262`	`Assert.IsTrue(success);`
`270`	`263`	`Assert.IsNull(newlyDeletedEntity);`
`271`		`- Assert.AreEqual(currentEntityCount - 1, _context.Table.Count());`
	`264`	`+ Assert.AreEqual(expectedEntityCount, _context.Table.Count());`
`272`	`265`	`}`
`273`	`266`
`274`	`267`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -233,23 +233,23 @@ private TestSoftDeleteEntity GetTestEntity(string property)`
`233`	`233`	`[Test]`
`234`	`234`	`public async Task GetValidEntityReturnsEntity()`
`235`	`235`	`{`
`236`		`- var entity = await _repository.Get((Guid)_entity.Id);`
	`236`	`+ var entity = await _repository.Get(_entity.Id);`
`237`	`237`
`238`	`238`	`Assert.AreSame(_entity, entity);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`[Test]`
`242`	`242`	`public async Task DontGetDeletedEntityWithoutFlag()`
`243`	`243`	`{`
`244`		`- var entity = await _repository.Get((Guid)_deletedEntity.Id);`
	`244`	`+ var entity = await _repository.Get(_deletedEntity.Id);`
`245`	`245`
`246`	`246`	`Assert.IsNull(entity);`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`[Test]`
`250`	`250`	`public async Task GetDeletedEntityWithFlag()`
`251`	`251`	`{`
`252`		`- var entity = await _repository.Get((Guid)_deletedEntity.Id, true);`
	`252`	`+ var entity = await _repository.Get(_deletedEntity.Id, true);`
`253`	`253`
`254`	`254`	`Assert.AreSame(_deletedEntity, entity);`
`255`	`255`	`}`
`@@ -269,7 +269,7 @@ public async Task UpdateUpdatesUpdated(string propertyValue)`
`269`	`269`	`await _repository.Update(_entity);`
`270`	`270`	`}`
`271`	`271`
`272`		`- var entity = await _repository.Get((Guid)_entity.Id);`
	`272`	`+ var entity = await _repository.Get(_entity.Id);`
`273`	`273`
`274`	`274`	`Assert.AreEqual(propertyValue, entity.Property);`
`275`	`275`	`Assert.AreNotEqual(oldUpdated, entity.Updated);`
`@@ -293,7 +293,7 @@ public async Task DeleteSoftDeletesAndSetsDeletedAt()`
`293`	`293`	`success = await _repository.Delete(_entity);`
`294`	`294`	`}`
`295`	`295`
`296`		`- var newlyDeletedEntity = await _repository.Get((Guid)_entity.Id, true);`
	`296`	`+ var newlyDeletedEntity = await _repository.Get(_entity.Id, true);`
`297`	`297`	`Assert.IsTrue(success);`
`298`	`298`	`Assert.IsTrue(newlyDeletedEntity.Deleted);`
`299`	`299`	`Assert.NotNull(newlyDeletedEntity.DeletedAt);`
`@@ -309,7 +309,7 @@ public void DeleteThrowsExceptionIfArgumentNull()`
`309`	`309`	`public async Task DeleteWithValidIdDeletesAndSetsDeletedAt()`
`310`	`310`	`{`
`311`	`311`	`bool success;`
`312`		`- Guid id = (Guid)_entity.Id;`
	`312`	`+ Guid id = _entity.Id;`
`313`	`313`	`await using (_repository)`
`314`	`314`	`{`
`315`	`315`	`success = await _repository.Delete(id);`
`@@ -353,7 +353,7 @@ public async Task RestoreSetsDeletedFalse()`
`353`	`353`	`success = await _repository.Restore(_deletedEntity);`
`354`	`354`	`}`
`355`	`355`
`356`		`- var restoredEntity = await _repository.Get((Guid)_deletedEntity.Id);`
	`356`	`+ var restoredEntity = await _repository.Get(_deletedEntity.Id);`
`357`	`357`	`Assert.IsTrue(success);`
`358`	`358`	`Assert.IsFalse(restoredEntity.Deleted);`
`359`	`359`	`Assert.IsNull(restoredEntity.DeletedAt);`
`@@ -369,7 +369,7 @@ public void RestoreThrowsExceptionWhenEntityNull()`
`369`	`369`	`public async Task RestoreOnIdSetsDeletedFalse()`
`370`	`370`	`{`
`371`	`371`	`bool success;`
`372`		`- Guid id = (Guid)_deletedEntity.Id;`
	`372`	`+ Guid id = _deletedEntity.Id;`
`373`	`373`
`374`	`374`	`await using (_repository)`
`375`	`375`	`{`