added some missing cancellation tokens and fixed incorrect tests
This commit is contained in:
@@ -42,7 +42,7 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var documents = Fixture.CreateMany<TestDocument>().ToList();
|
||||
var count = Fixture.Create<long>();
|
||||
var cancellationToken = new CancellationToken();
|
||||
var cancellationToken = new CancellationToken(true);
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
@@ -89,7 +89,7 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var content = Fixture.Create<string>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -144,7 +144,7 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
var content = Fixture.Create<string>();
|
||||
var count = Fixture.Create<long>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -193,19 +193,20 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var documents = Fixture.CreateMany<TestDocumentWithKey<int>>().ToList();
|
||||
var count = Fixture.Create<long>();
|
||||
var cancellationToken = new CancellationToken();
|
||||
var cancellationToken = new CancellationToken(true);
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteManyAsync<TestDocumentWithKey<int>, int>(It.IsAny<IEnumerable<TestDocumentWithKey<int>>>(), It.IsAny<CancellationToken>()))
|
||||
.ReturnsAsync(count);
|
||||
.Setup(x => x.DeleteManyAsync<TestDocumentWithKey<int>, int>(documents, cancellationToken))
|
||||
.ReturnsAsync(count)
|
||||
.Verifiable();
|
||||
|
||||
// Act
|
||||
var result = await Sut.DeleteManyAsync<TestDocumentWithKey<int>, int>(documents, cancellationToken);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteManyAsync<TestDocumentWithKey<int>, int>(documents, cancellationToken), Times.Once);
|
||||
Eraser.Verify();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -240,7 +241,7 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var content = Fixture.Create<string>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -295,7 +296,7 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
var content = Fixture.Create<string>();
|
||||
var count = Fixture.Create<long>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -317,4 +318,4 @@ public class DeleteManyAsyncTests : TestMongoRepositoryContext
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var document = Fixture.Create<TestDocument>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
@@ -85,7 +85,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -134,7 +134,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -180,7 +180,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var document = Fixture.Create<TestDocumentWithKey<int>>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
@@ -225,7 +225,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -274,7 +274,7 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
@@ -293,4 +293,4 @@ public class DeleteOneAsyncTests : TestMongoRepositoryContext
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
using System;
|
||||
namespace CoreUnitTests.BaseMongoRepositoryTests.DeleteTests;
|
||||
|
||||
using System;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading;
|
||||
using AutoFixture;
|
||||
using CoreUnitTests.Infrastructure;
|
||||
using CoreUnitTests.Infrastructure.Model;
|
||||
using FluentAssertions;
|
||||
using Infrastructure;
|
||||
using Infrastructure.Model;
|
||||
using MongoDbGenericRepository.DataAccess.Delete;
|
||||
using Moq;
|
||||
using Xunit;
|
||||
|
||||
namespace CoreUnitTests.BaseMongoRepositoryTests.DeleteTests;
|
||||
|
||||
public class DeleteOneTests : TestMongoRepositoryContext
|
||||
{
|
||||
[Fact]
|
||||
@@ -21,7 +22,7 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<TestDocument>()))
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<TestDocument>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -29,7 +30,28 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(document), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(document, CancellationToken.None), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WithDocumentAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var document = Fixture.Create<TestDocument>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken(true);
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<TestDocument>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne(document, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(document, token), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -44,7 +66,7 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<Expression<Func<TestDocument, bool>>>(), It.IsAny<string>()))
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<Expression<Func<TestDocument, bool>>>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -52,7 +74,35 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, null), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, null, CancellationToken.None), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WithFilterAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocument, Guid>(
|
||||
It.IsAny<Expression<Func<TestDocument, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne(filter, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, null, token), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -68,7 +118,11 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocument, Guid>(It.IsAny<Expression<Func<TestDocument, bool>>>(), It.IsAny<string>()))
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocument, Guid>(
|
||||
It.IsAny<Expression<Func<TestDocument, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -76,7 +130,36 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, partitionKey), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, partitionKey, CancellationToken.None), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WithFilterAndPartitionKeyAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocument, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocument, Guid>(
|
||||
It.IsAny<Expression<Func<TestDocument, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne(filter, partitionKey, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocument, Guid>(filter, partitionKey, token), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -88,7 +171,7 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocumentWithKey<int>, int>(It.IsAny<TestDocumentWithKey<int>>()))
|
||||
.Setup(x => x.DeleteOne<TestDocumentWithKey<int>, int>(It.IsAny<TestDocumentWithKey<int>>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -96,8 +179,30 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(document), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(document, CancellationToken.None), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WithKeyedDocumentAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var document = Fixture.Create<TestDocumentWithKey<int>>();
|
||||
var count = Fixture.Create<long>();
|
||||
var token = new CancellationToken(true);
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocumentWithKey<int>, int>(It.IsAny<TestDocumentWithKey<int>>(), It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne<TestDocumentWithKey<int>, int>(document, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(document, token), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Keyed_WithFilter_ShouldDeleteOne()
|
||||
{
|
||||
@@ -110,7 +215,11 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocumentWithKey<int>, int>(It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(), It.IsAny<string>()))
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocumentWithKey<int>, int>(
|
||||
It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -118,7 +227,35 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, null), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, null, CancellationToken.None), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Keyed_WithFilterAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocumentWithKey<int>, int>(
|
||||
It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne<TestDocumentWithKey<int>, int>(filter, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, null, token), Times.Once);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -134,7 +271,11 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(x => x.DeleteOne<TestDocumentWithKey<int>, int>(It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(), It.IsAny<string>()))
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocumentWithKey<int>, int>(
|
||||
It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
@@ -142,6 +283,35 @@ public class DeleteOneTests : TestMongoRepositoryContext
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, partitionKey), Times.Once);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, partitionKey, CancellationToken.None), Times.Once);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Keyed_WithFilterAndPartitionKeyAndCancellationToken_ShouldDeleteOne()
|
||||
{
|
||||
// Arrange
|
||||
var count = Fixture.Create<long>();
|
||||
var content = Fixture.Create<string>();
|
||||
var partitionKey = Fixture.Create<string>();
|
||||
var token = new CancellationToken(true);
|
||||
|
||||
Expression<Func<TestDocumentWithKey<int>, bool>> filter = x => x.SomeContent == content;
|
||||
|
||||
Eraser = new Mock<IMongoDbEraser>();
|
||||
|
||||
Eraser
|
||||
.Setup(
|
||||
x => x.DeleteOne<TestDocumentWithKey<int>, int>(
|
||||
It.IsAny<Expression<Func<TestDocumentWithKey<int>, bool>>>(),
|
||||
It.IsAny<string>(),
|
||||
It.IsAny<CancellationToken>()))
|
||||
.Returns(count);
|
||||
|
||||
// Act
|
||||
var result = Sut.DeleteOne<TestDocumentWithKey<int>, int>(filter, partitionKey, token);
|
||||
|
||||
// Assert
|
||||
result.Should().Be(count);
|
||||
Eraser.Verify(x => x.DeleteOne<TestDocumentWithKey<int>, int>(filter, partitionKey, token), Times.Once);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user