diff --git a/CoreIntegrationTests/App.config b/CoreIntegrationTests/App.config deleted file mode 100644 index 139995c..0000000 --- a/CoreIntegrationTests/App.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/CoreIntegrationTests/CoreIntegrationTests.csproj b/CoreIntegrationTests/CoreIntegrationTests.csproj index 5d424fa..0733e94 100644 --- a/CoreIntegrationTests/CoreIntegrationTests.csproj +++ b/CoreIntegrationTests/CoreIntegrationTests.csproj @@ -1,13 +1,14 @@  - net6.0 + net8.0 + 10 - + - + all @@ -17,13 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - Always - + diff --git a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Main.cs b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Main.cs index 893908c..853e0f4 100644 --- a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Main.cs +++ b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Main.cs @@ -11,10 +11,8 @@ using Xunit; namespace CoreIntegrationTests.Infrastructure { - public abstract partial class MongoDbDocumentTestBase - where T : TestDoc, new() + public abstract partial class MongoDbDocumentTestBase where T : TestDoc, new() { - private readonly MongoDbTestFixture _fixture; protected MongoDbDocumentTestBase(MongoDbTestFixture fixture) diff --git a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Update.cs b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Update.cs index 465ce1b..d02ee97 100644 --- a/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Update.cs +++ b/CoreIntegrationTests/Infrastructure/MongoDbDocumentTestBase.Update.cs @@ -14,8 +14,7 @@ using Xunit; namespace CoreIntegrationTests.Infrastructure { public abstract partial class MongoDbDocumentTestBase : - IClassFixture> - where T : TestDoc, new() + IClassFixture> where T : TestDoc, new() { #region Update One diff --git a/CoreIntegrationTests/Infrastructure/TestClasses.cs b/CoreIntegrationTests/Infrastructure/TestClasses.cs index 13d02d4..d0f7da7 100644 --- a/CoreIntegrationTests/Infrastructure/TestClasses.cs +++ b/CoreIntegrationTests/Infrastructure/TestClasses.cs @@ -40,7 +40,7 @@ namespace CoreIntegrationTests.Infrastructure public class TestDoc : Document { - public TestDoc() + protected TestDoc() { Version = 2; Nested = new Nested diff --git a/CoreIntegrationTests/Infrastructure/TestRepository.cs b/CoreIntegrationTests/Infrastructure/TestRepository.cs index 1ee0132..e5c5afe 100644 --- a/CoreIntegrationTests/Infrastructure/TestRepository.cs +++ b/CoreIntegrationTests/Infrastructure/TestRepository.cs @@ -12,7 +12,7 @@ namespace CoreIntegrationTests.Infrastructure public class TestTKeyRepository : BaseMongoRepository, ITestRepository where TKey : IEquatable { - const string connectionString = "mongodb://localhost:27017/MongoDbTests"; + const string connectionString = "mongodb://test:Test123!@10.0.3.4:27017/MongoDbTests"; private static readonly ITestRepository _instance = new TestTKeyRepository(connectionString); /// private TestTKeyRepository(string connectionString) : base(connectionString) @@ -44,7 +44,7 @@ namespace CoreIntegrationTests.Infrastructure public sealed class TestRepository : BaseMongoRepository, ITestRepository { - const string connectionString = "mongodb://localhost:27017"; + const string connectionString = "mongodb://test:Test123!@10.0.3.4:27017"; private static readonly ITestRepository _instance = new TestRepository(connectionString, "MongoDbTests"); // Explicit static constructor to tell C# compiler diff --git a/CoreUnitTests/CoreUnitTests.csproj b/CoreUnitTests/CoreUnitTests.csproj index 54fd87a..50c6d9c 100644 --- a/CoreUnitTests/CoreUnitTests.csproj +++ b/CoreUnitTests/CoreUnitTests.csproj @@ -1,19 +1,20 @@ - net6.0 + net8.0 warnings false true latest + 10 - - - - + + + + @@ -24,7 +25,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/CoreUnitTests/Infrastructure/FilterDefinitionExtensions.cs b/CoreUnitTests/Infrastructure/FilterDefinitionExtensions.cs index adcaca5..6725b0a 100644 --- a/CoreUnitTests/Infrastructure/FilterDefinitionExtensions.cs +++ b/CoreUnitTests/Infrastructure/FilterDefinitionExtensions.cs @@ -7,7 +7,7 @@ using MongoDB.Driver; public static class FilterDefinitionExtensions { public static string RenderToJson(this FilterDefinition filter) - => filter.Render(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry).ToJson(); + => filter.Render(new RenderArgs(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry)).ToJson(); public static bool EquivalentTo(this FilterDefinition filter, FilterDefinition other) => filter.RenderToJson() == other.RenderToJson(); diff --git a/CoreUnitTests/Infrastructure/IndexExtensions.cs b/CoreUnitTests/Infrastructure/IndexExtensions.cs index 7ff4fff..b996acb 100644 --- a/CoreUnitTests/Infrastructure/IndexExtensions.cs +++ b/CoreUnitTests/Infrastructure/IndexExtensions.cs @@ -59,9 +59,7 @@ public static class IndexExtensions private static string RenderIndexModelKeys(IndexKeysDefinition keys) { - var indexModelRendered = keys.Render( - BsonSerializer.SerializerRegistry.GetSerializer(), - BsonSerializer.SerializerRegistry); + var indexModelRendered = keys.Render(new RenderArgs(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry)); var result = indexModelRendered.ToString(); return result.Replace(" ", ""); diff --git a/CoreUnitTests/Infrastructure/UpdateDefinitionExtensions.cs b/CoreUnitTests/Infrastructure/UpdateDefinitionExtensions.cs index e4cd92b..54cc60c 100644 --- a/CoreUnitTests/Infrastructure/UpdateDefinitionExtensions.cs +++ b/CoreUnitTests/Infrastructure/UpdateDefinitionExtensions.cs @@ -8,13 +8,9 @@ public static class UpdateDefinitionExtensions { public static bool EquivalentTo(this UpdateDefinition update, UpdateDefinition expected) { - var renderedUpdate = update.Render( - BsonSerializer.SerializerRegistry.GetSerializer(), - BsonSerializer.SerializerRegistry); + var renderedUpdate = update.Render(new RenderArgs(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry)); - var renderedExpected = expected.Render( - BsonSerializer.SerializerRegistry.GetSerializer(), - BsonSerializer.SerializerRegistry); + var renderedExpected = expected.Render(new RenderArgs(BsonSerializer.SerializerRegistry.GetSerializer(), BsonSerializer.SerializerRegistry) ); return renderedUpdate.Equals(renderedExpected); } diff --git a/IntegrationTests/App.config b/IntegrationTests/App.config index 380912d..d11e155 100644 --- a/IntegrationTests/App.config +++ b/IntegrationTests/App.config @@ -4,9 +4,6 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> - - - diff --git a/IntegrationTests/CRUDPartitionedCollectionNameAttributeTests.cs b/IntegrationTests/CRUDPartitionedCollectionNameAttributeTests.cs index 43a7440..3a41db0 100644 --- a/IntegrationTests/CRUDPartitionedCollectionNameAttributeTests.cs +++ b/IntegrationTests/CRUDPartitionedCollectionNameAttributeTests.cs @@ -1,8 +1,9 @@ -using IntegrationTests.Infrastructure; -using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Attributes; using MongoDbGenericRepository.Attributes; using MongoDbGenericRepository.Models; using System; +using IntegrationTests.Infrastructure; +using TestDoc = IntegrationTests.Infrastructure.TestDoc; namespace IntegrationTests { diff --git a/IntegrationTests/CRUDPartitionedTests.cs b/IntegrationTests/CRUDPartitionedTests.cs index 62d4553..3a5dd37 100644 --- a/IntegrationTests/CRUDPartitionedTests.cs +++ b/IntegrationTests/CRUDPartitionedTests.cs @@ -1,5 +1,6 @@ using IntegrationTests.Infrastructure; using MongoDbGenericRepository.Models; +using TestDoc = IntegrationTests.Infrastructure.TestDoc; namespace IntegrationTests { diff --git a/IntegrationTests/CRUDTests.cs b/IntegrationTests/CRUDTests.cs index f1fc55e..b5517db 100644 --- a/IntegrationTests/CRUDTests.cs +++ b/IntegrationTests/CRUDTests.cs @@ -1,5 +1,7 @@ using IntegrationTests.Infrastructure; using NUnit.Framework; +using NUnit.Framework.Internal; +using TestDoc = IntegrationTests.Infrastructure.TestDoc; namespace IntegrationTests { diff --git a/IntegrationTests/Infrastructure/BaseMongoDbRepositoryTests.cs b/IntegrationTests/Infrastructure/BaseMongoDbRepositoryTests.cs index 1c7b43f..854cfa1 100644 --- a/IntegrationTests/Infrastructure/BaseMongoDbRepositoryTests.cs +++ b/IntegrationTests/Infrastructure/BaseMongoDbRepositoryTests.cs @@ -41,8 +41,7 @@ namespace IntegrationTests.Infrastructure [OneTimeSetUp] public void Init() { - var connectionString = ConfigurationManager.ConnectionStrings["MongoDbTests"].ConnectionString; - SUT = new TestRepository(connectionString, "MongoDbTests"); + SUT = new TestRepository("mongodb://test:Test123!@10.0.3.4:27017", "MongoDbTests"); } [OneTimeTearDown] diff --git a/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs b/IntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs similarity index 77% rename from IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs rename to IntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs index ea3dfd6..40d000b 100644 --- a/IntegrationTests/Infrastructure/MongoDBDocumentTestBase.cs +++ b/IntegrationTests/Infrastructure/MongoDbDocumentTestBase.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using NUnit.Framework.Legacy; namespace IntegrationTests.Infrastructure { @@ -65,8 +66,7 @@ namespace IntegrationTests.Infrastructure [OneTimeSetUp] public void Init() { - var connectionString = ConfigurationManager.ConnectionStrings["MongoDbTests"].ConnectionString; - SUT = new TestRepository(connectionString, "MongoDbTests"); + SUT = new TestRepository("mongodb://test:Test123!@10.0.3.4:27017/", "MongoDbTests"); } [OneTimeTearDown] @@ -95,7 +95,7 @@ namespace IntegrationTests.Infrastructure // Assert long count = string.IsNullOrEmpty(PartitionKey) ? SUT.Count(e => e.Id.Equals(document.Id)) : SUT.Count(e => e.Id.Equals(document.Id), PartitionKey); - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -108,7 +108,7 @@ namespace IntegrationTests.Infrastructure // Assert long count = string.IsNullOrEmpty(PartitionKey) ? SUT.Count(e => e.Id.Equals(document.Id)) : SUT.Count(e => e.Id.Equals(document.Id), PartitionKey); - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -123,7 +123,7 @@ namespace IntegrationTests.Infrastructure || e.Id.Equals(documents[1].Id)) : SUT.Count(e => e.Id.Equals(documents[0].Id) || e.Id.Equals(documents[1].Id), PartitionKey); - Assert.AreEqual(2, count, GetTestName()); + Assert.That(count, Is.EqualTo(2), GetTestName()); } [Test] @@ -138,7 +138,7 @@ namespace IntegrationTests.Infrastructure || e.Id.Equals(documents[1].Id)) : SUT.Count(e => e.Id.Equals(documents[0].Id) || e.Id.Equals(documents[1].Id), PartitionKey); - Assert.AreEqual(2, count, GetTestName()); + Assert.That(count, Is.EqualTo(2), GetTestName()); } @@ -155,7 +155,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetByIdAsync(document.Id, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -167,7 +167,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetById(document.Id, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -179,7 +179,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetOneAsync(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -191,7 +191,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetOne(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -204,7 +204,7 @@ namespace IntegrationTests.Infrastructure var cursor = SUT.GetCursor(x => x.Id.Equals(document.Id), PartitionKey); var count = cursor.CountDocuments(); // Assert - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -216,7 +216,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.AnyAsync(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(true, result, GetTestName()); + Assert.That(result, Is.EqualTo(true), GetTestName()); } [Test] @@ -228,7 +228,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.AnyAsync(x => x.Id.Equals(Guid.NewGuid()), PartitionKey); // Assert - Assert.AreEqual(false, result, GetTestName()); + Assert.That(result, Is.EqualTo(false), GetTestName()); } [Test] @@ -240,7 +240,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Any(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(true, result, GetTestName()); + Assert.That(result, Is.EqualTo(true), GetTestName()); } [Test] @@ -252,7 +252,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Any(x => x.Id.Equals(Guid.NewGuid()), PartitionKey); // Assert - Assert.AreEqual(false, result, GetTestName()); + Assert.That(result, Is.EqualTo(false), GetTestName()); } [Test] @@ -266,7 +266,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetAllAsync(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); } [Test] @@ -280,7 +280,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetAll(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); } [Test] @@ -294,7 +294,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.CountAsync(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result, GetTestName()); + Assert.That(result, Is.EqualTo(5), GetTestName()); } [Test] @@ -308,7 +308,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Count(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result, GetTestName()); + Assert.That(result, Is.EqualTo(5), GetTestName()); } #endregion Read @@ -326,10 +326,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -343,10 +343,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -359,10 +359,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document, x => x.SomeContent, content); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -375,10 +375,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document, x => x.SomeContent, content); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -391,10 +391,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(x => x.Id.Equals(document.Id), x => x.SomeContent, content, PartitionKey); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -407,10 +407,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(x => x.Id.Equals(document.Id), x => x.SomeContent, content, PartitionKey); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -430,13 +430,13 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document, updateDef); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument); - Assert.AreEqual(childrenToAdd[0].Type, updatedDocument.Children[0].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[0].Value, updatedDocument.Children[0].Value, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Type, updatedDocument.Children[1].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Value, updatedDocument.Children[1].Value, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument); + Assert.That(updatedDocument.Children[0].Type, Is.EqualTo(childrenToAdd[0].Type), GetTestName()); + Assert.That(updatedDocument.Children[0].Value, Is.EqualTo(childrenToAdd[0].Value), GetTestName()); + Assert.That(updatedDocument.Children[1].Type, Is.EqualTo(childrenToAdd[1].Type), GetTestName()); + Assert.That(updatedDocument.Children[1].Value, Is.EqualTo(childrenToAdd[1].Value), GetTestName()); } [Test] @@ -456,13 +456,13 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document, updateDef); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument); - Assert.AreEqual(childrenToAdd[0].Type, updatedDocument.Children[0].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[0].Value, updatedDocument.Children[0].Value, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Type, updatedDocument.Children[1].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Value, updatedDocument.Children[1].Value, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument); + Assert.That(updatedDocument.Children[0].Type, Is.EqualTo(childrenToAdd[0].Type), GetTestName()); + Assert.That(updatedDocument.Children[0].Value, Is.EqualTo(childrenToAdd[0].Value), GetTestName()); + Assert.That(updatedDocument.Children[1].Type, Is.EqualTo(childrenToAdd[1].Type), GetTestName()); + Assert.That(updatedDocument.Children[1].Value, Is.EqualTo(childrenToAdd[1].Value), GetTestName()); } #endregion Update @@ -478,8 +478,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteOne(document); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -491,8 +491,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteOne(e => e.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -504,8 +504,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteOneAsync(document); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -517,8 +517,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteOneAsync(e => e.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -532,8 +532,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteManyAsync(e => e.SomeContent == criteria, PartitionKey); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -547,8 +547,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteManyAsync(documents); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -562,8 +562,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteMany(e => e.SomeContent == criteria, PartitionKey); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -577,8 +577,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteMany(documents); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } #endregion Delete @@ -605,10 +605,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); - Assert.AreEqual(someContent, result.SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.SomeDate.Second, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); + Assert.That(result.SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -631,10 +631,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); - Assert.AreEqual(someContent, result.SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.SomeDate.Second, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); + Assert.That(result.SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -661,10 +661,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); - Assert.AreEqual(someContent, result.First().SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.First().SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.First().SomeDate.Second, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); + Assert.That(result.First().SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.First().SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.First().SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -691,10 +691,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); - Assert.AreEqual(someContent, result.First().SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.First().SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.First().SomeDate.Second, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); + Assert.That(result.First().SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.First().SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.First().SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } #endregion Project @@ -730,11 +730,11 @@ namespace IntegrationTests.Infrastructure // Assert var key1Group = result.First(e => e.Key == 1); - Assert.NotNull(key1Group); - Assert.AreEqual(3, key1Group.Content.Count); + ClassicAssert.NotNull(key1Group); + Assert.That(key1Group.Content.Count, Is.EqualTo(3)); var key2Group = result.First(e => e.Key == 2); - Assert.NotNull(key2Group); - Assert.AreEqual(2, key2Group.Content.Count); + ClassicAssert.NotNull(key2Group); + Assert.That(key2Group.Content.Count, Is.EqualTo(2)); } [Test] @@ -775,11 +775,11 @@ namespace IntegrationTests.Infrastructure // Assert var key1Group = result.First(e => e.Key == 4); - Assert.NotNull(key1Group); - Assert.AreEqual(3, key1Group.Content.Count); + ClassicAssert.NotNull(key1Group); + Assert.That(key1Group.Content.Count, Is.EqualTo(3)); var key2Group = result.First(e => e.Key == 5); - Assert.NotNull(key2Group); - Assert.AreEqual(1, key2Group.Content.Count); + ClassicAssert.NotNull(key2Group); + Assert.That(key2Group.Content.Count, Is.EqualTo(1)); } #endregion Group By @@ -818,4 +818,4 @@ namespace IntegrationTests.Infrastructure } -} +} \ No newline at end of file diff --git a/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs b/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs index 45f8b28..a32de59 100644 --- a/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs +++ b/IntegrationTests/Infrastructure/MongoDbTKeyDocumentTestBase.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using NUnit.Framework.Legacy; namespace IntegrationTests.Infrastructure { @@ -66,8 +67,7 @@ namespace IntegrationTests.Infrastructure [OneTimeSetUp] public void Init() { - var connectionString = ConfigurationManager.ConnectionStrings["MongoDbTests"].ConnectionString; - SUT = new TestRepository(connectionString, "MongoDbTests"); + SUT = new TestRepository("mongodb://test:Test123!@10.0.3.4:27017", "MongoDbTests"); } [OneTimeTearDown] @@ -96,7 +96,7 @@ namespace IntegrationTests.Infrastructure // Assert long count = string.IsNullOrEmpty(PartitionKey) ? SUT.Count(e => e.Id.Equals(document.Id)) : SUT.Count(e => e.Id.Equals(document.Id), PartitionKey); - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -109,7 +109,7 @@ namespace IntegrationTests.Infrastructure // Assert long count = string.IsNullOrEmpty(PartitionKey) ? SUT.Count(e => e.Id.Equals(document.Id)) : SUT.Count(e => e.Id.Equals(document.Id), PartitionKey); - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -124,7 +124,7 @@ namespace IntegrationTests.Infrastructure || e.Id.Equals(documents[1].Id)) : SUT.Count(e => e.Id.Equals(documents[0].Id) || e.Id.Equals(documents[1].Id), PartitionKey); - Assert.AreEqual(2, count, GetTestName()); + Assert.That(count, Is.EqualTo(2), GetTestName()); } [Test] @@ -139,7 +139,7 @@ namespace IntegrationTests.Infrastructure || e.Id.Equals(documents[1].Id)) : SUT.Count(e => e.Id.Equals(documents[0].Id) || e.Id.Equals(documents[1].Id), PartitionKey); - Assert.AreEqual(2, count, GetTestName()); + Assert.That(count, Is.EqualTo(2), GetTestName()); } @@ -156,7 +156,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetByIdAsync(document.Id, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -168,7 +168,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetById(document.Id, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -180,7 +180,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetOneAsync(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -192,7 +192,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetOne(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); } [Test] @@ -205,7 +205,7 @@ namespace IntegrationTests.Infrastructure var cursor = SUT.GetCursor(x => x.Id.Equals(document.Id), PartitionKey); var count = cursor.CountDocuments(); // Assert - Assert.AreEqual(1, count, GetTestName()); + Assert.That(count, Is.EqualTo(1), GetTestName()); } [Test] @@ -217,7 +217,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.AnyAsync(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(true, result, GetTestName()); + Assert.That(result, Is.EqualTo(true), GetTestName()); } [Test] @@ -229,7 +229,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.AnyAsync(x => x.Id.Equals(document.Init()), PartitionKey); // Assert - Assert.AreEqual(false, result, GetTestName()); + Assert.That(result, Is.EqualTo(false), GetTestName()); } [Test] @@ -241,7 +241,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Any(x => x.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(true, result, GetTestName()); + Assert.That(result, Is.EqualTo(true), GetTestName()); } [Test] @@ -253,7 +253,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Any(x => x.Id.Equals(document.Init()), PartitionKey); // Assert - Assert.AreEqual(false, result, GetTestName()); + Assert.That(result, Is.EqualTo(false), GetTestName()); } [Test] @@ -267,7 +267,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.GetAllAsync(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); } [Test] @@ -281,7 +281,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.GetAll(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); } [Test] @@ -295,7 +295,7 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.CountAsync(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result, GetTestName()); + Assert.That(result, Is.EqualTo(5), GetTestName()); } [Test] @@ -309,7 +309,7 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.Count(x => x.SomeContent == content, PartitionKey); // Assert - Assert.AreEqual(5, result, GetTestName()); + Assert.That(result, Is.EqualTo(5), GetTestName()); } #endregion Read @@ -327,10 +327,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document); // Assert - Assert.IsTrue(result); + Assert.That(result, Is.True); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -344,10 +344,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document); // Assert - Assert.IsTrue(result); + Assert.That(result, Is.True); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -360,10 +360,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document, x => x.SomeContent, content); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -376,10 +376,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document, x => x.SomeContent, content); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -392,10 +392,10 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(x => x.Id.Equals(document.Id), x => x.SomeContent, content, PartitionKey); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -408,10 +408,10 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(x => x.Id.Equals(document.Id), x => x.SomeContent, content, PartitionKey); // Assert - Assert.IsTrue(result, GetTestName()); + ClassicAssert.IsTrue(result, GetTestName()); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument, GetTestName()); - Assert.AreEqual(content, updatedDocument.SomeContent, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument, GetTestName()); + Assert.That(updatedDocument.SomeContent, Is.EqualTo(content), GetTestName()); } [Test] @@ -431,13 +431,13 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.UpdateOneAsync(document, updateDef); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument); - Assert.AreEqual(childrenToAdd[0].Type, updatedDocument.Children[0].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[0].Value, updatedDocument.Children[0].Value, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Type, updatedDocument.Children[1].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Value, updatedDocument.Children[1].Value, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument); + Assert.That(updatedDocument.Children[0].Type, Is.EqualTo(childrenToAdd[0].Type), GetTestName()); + Assert.That(updatedDocument.Children[0].Value, Is.EqualTo(childrenToAdd[0].Value), GetTestName()); + Assert.That(updatedDocument.Children[1].Type, Is.EqualTo(childrenToAdd[1].Type), GetTestName()); + Assert.That(updatedDocument.Children[1].Value, Is.EqualTo(childrenToAdd[1].Value), GetTestName()); } [Test] @@ -457,13 +457,13 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.UpdateOne(document, updateDef); // Assert - Assert.IsTrue(result); + ClassicAssert.IsTrue(result); var updatedDocument = SUT.GetById(document.Id, PartitionKey); - Assert.IsNotNull(updatedDocument); - Assert.AreEqual(childrenToAdd[0].Type, updatedDocument.Children[0].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[0].Value, updatedDocument.Children[0].Value, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Type, updatedDocument.Children[1].Type, GetTestName()); - Assert.AreEqual(childrenToAdd[1].Value, updatedDocument.Children[1].Value, GetTestName()); + ClassicAssert.IsNotNull(updatedDocument); + Assert.That(updatedDocument.Children[0].Type, Is.EqualTo(childrenToAdd[0].Type), GetTestName()); + Assert.That(updatedDocument.Children[0].Value, Is.EqualTo(childrenToAdd[0].Value), GetTestName()); + Assert.That(updatedDocument.Children[1].Type, Is.EqualTo(childrenToAdd[1].Type), GetTestName()); + Assert.That(updatedDocument.Children[1].Value, Is.EqualTo(childrenToAdd[1].Value), GetTestName()); } #endregion Update @@ -479,8 +479,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteOne(document); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -492,8 +492,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteOne(e => e.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -505,8 +505,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteOneAsync(document); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -518,8 +518,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteOneAsync(e => e.Id.Equals(document.Id), PartitionKey); // Assert - Assert.AreEqual(1, result); - Assert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(1)); + ClassicAssert.IsFalse(SUT.Any(e => e.Id.Equals(document.Id), PartitionKey), GetTestName()); } [Test] @@ -533,8 +533,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteManyAsync(e => e.SomeContent == criteria, PartitionKey); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -548,8 +548,8 @@ namespace IntegrationTests.Infrastructure // Act var result = await SUT.DeleteManyAsync(documents); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -563,8 +563,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteMany(e => e.SomeContent == criteria, PartitionKey); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } [Test] @@ -578,8 +578,8 @@ namespace IntegrationTests.Infrastructure // Act var result = SUT.DeleteMany(documents); // Assert - Assert.AreEqual(5, result); - Assert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); + Assert.That(result, Is.EqualTo(5)); + ClassicAssert.IsFalse(SUT.Any(e => e.SomeContent == criteria, PartitionKey), GetTestName()); } #endregion Delete @@ -606,10 +606,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); - Assert.AreEqual(someContent, result.SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.SomeDate.Second, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); + Assert.That(result.SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -632,10 +632,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.IsNotNull(result, GetTestName()); - Assert.AreEqual(someContent, result.SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.SomeDate.Second, GetTestName()); + ClassicAssert.IsNotNull(result, GetTestName()); + Assert.That(result.SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -662,10 +662,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); - Assert.AreEqual(someContent, result.First().SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.First().SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.First().SomeDate.Second, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); + Assert.That(result.First().SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.First().SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.First().SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } [Test] @@ -692,10 +692,10 @@ namespace IntegrationTests.Infrastructure }, PartitionKey); // Assert - Assert.AreEqual(5, result.Count, GetTestName()); - Assert.AreEqual(someContent, result.First().SomeContent, GetTestName()); - Assert.AreEqual(someDate.Minute, result.First().SomeDate.Minute, GetTestName()); - Assert.AreEqual(someDate.Second, result.First().SomeDate.Second, GetTestName()); + Assert.That(result.Count, Is.EqualTo(5), GetTestName()); + Assert.That(result.First().SomeContent, Is.EqualTo(someContent), GetTestName()); + Assert.That(result.First().SomeDate.Minute, Is.EqualTo(someDate.Minute), GetTestName()); + Assert.That(result.First().SomeDate.Second, Is.EqualTo(someDate.Second), GetTestName()); } #endregion Project diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj index 9d9684c..2c27401 100644 --- a/IntegrationTests/IntegrationTests.csproj +++ b/IntegrationTests/IntegrationTests.csproj @@ -1,199 +1,59 @@ - - - - - - - Debug - AnyCPU - {A484A355-A015-40CC-9B35-A4E872421128} - Library - Properties - IntegrationTests - IntegrationTests - v4.8 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\AWSSDK.Core.3.7.100.14\lib\net45\AWSSDK.Core.dll - - - ..\packages\AWSSDK.SecurityToken.3.7.100.14\lib\net45\AWSSDK.SecurityToken.dll - - - ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - - ..\packages\DnsClient.1.6.1\lib\net471\DnsClient.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - - ..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll - - - ..\packages\MongoDB.Bson.2.28.0\lib\net472\MongoDB.Bson.dll - - - ..\packages\MongoDB.Driver.2.28.0\lib\net472\MongoDB.Driver.dll - - - ..\packages\MongoDB.Driver.Core.2.28.0\lib\net472\MongoDB.Driver.Core.dll - - - ..\packages\MongoDB.Libmongocrypt.1.11.0\lib\net472\MongoDB.Libmongocrypt.dll - - - - ..\packages\NUnit.3.13.2\lib\net45\nunit.framework.dll - - - ..\packages\SharpCompress.0.30.1\lib\net461\SharpCompress.dll - - - ..\packages\Snappier.1.0.0\lib\netstandard2.0\Snappier.dll - - - ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - - ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - ..\packages\ZstdSharp.Port.0.7.3\lib\net461\ZstdSharp.dll - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - {efc776c4-2af3-440c-be80-3fbe335817a5} - MongoDbGenericRepository - - - - - - - - - - + + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + net8.0 + enable + enable + + false + true - - - - - - \ No newline at end of file + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + + diff --git a/IntegrationTests/Properties/AssemblyInfo.cs b/IntegrationTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 8919b95..0000000 --- a/IntegrationTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Les informations générales relatives à un assembly dépendent de -// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations -// associées à un assembly. -[assembly: AssemblyTitle("IntegrationTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("IntegrationTests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly -// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de -// COM, affectez la valeur true à l'attribut ComVisible sur ce type. -[assembly: ComVisible(false)] - -// Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM -[assembly: Guid("a484a355-a015-40cc-9b35-a4e872421128")] - -// Les informations de version pour un assembly se composent des quatre valeurs suivantes : -// -// Version principale -// Version secondaire -// Numéro de build -// Révision -// -// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut -// en utilisant '*', comme indiqué ci-dessous : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/IntegrationTests/libmongocrypt.dylib b/IntegrationTests/libmongocrypt.dylib index 62acf40..b15997b 100644 Binary files a/IntegrationTests/libmongocrypt.dylib and b/IntegrationTests/libmongocrypt.dylib differ diff --git a/IntegrationTests/libmongocrypt.so b/IntegrationTests/libmongocrypt.so index 5fe44d7..97d06c5 100644 Binary files a/IntegrationTests/libmongocrypt.so and b/IntegrationTests/libmongocrypt.so differ diff --git a/IntegrationTests/mongocrypt.dll b/IntegrationTests/mongocrypt.dll index a2125dc..de8d95b 100644 Binary files a/IntegrationTests/mongocrypt.dll and b/IntegrationTests/mongocrypt.dll differ diff --git a/IntegrationTests/packages.config b/IntegrationTests/packages.config deleted file mode 100644 index 360a921..0000000 --- a/IntegrationTests/packages.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MongoDbGenericRepository.sln b/MongoDbGenericRepository.sln index 9d1e6d8..f365187 100644 --- a/MongoDbGenericRepository.sln +++ b/MongoDbGenericRepository.sln @@ -3,24 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "IntegrationTests\IntegrationTests.csproj", "{A484A355-A015-40CC-9B35-A4E872421128}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDbGenericRepository", "MongoDbGenericRepository\MongoDbGenericRepository.csproj", "{EFC776C4-2AF3-440C-BE80-3FBE335817A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreIntegrationTests", "CoreIntegrationTests\CoreIntegrationTests.csproj", "{C640C106-7A25-4E49-A0CF-E4F248E5A97F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreUnitTests", "CoreUnitTests\CoreUnitTests.csproj", "{8BE513ED-84F4-47E1-946D-84958CF95E6B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "IntegrationTests\IntegrationTests.csproj", "{B3146094-8062-45C4-8FF9-4E1CBDDCAB59}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A484A355-A015-40CC-9B35-A4E872421128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A484A355-A015-40CC-9B35-A4E872421128}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A484A355-A015-40CC-9B35-A4E872421128}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A484A355-A015-40CC-9B35-A4E872421128}.Release|Any CPU.Build.0 = Release|Any CPU {EFC776C4-2AF3-440C-BE80-3FBE335817A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EFC776C4-2AF3-440C-BE80-3FBE335817A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {EFC776C4-2AF3-440C-BE80-3FBE335817A5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -33,6 +29,10 @@ Global {8BE513ED-84F4-47E1-946D-84958CF95E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BE513ED-84F4-47E1-946D-84958CF95E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BE513ED-84F4-47E1-946D-84958CF95E6B}.Release|Any CPU.Build.0 = Release|Any CPU + {B3146094-8062-45C4-8FF9-4E1CBDDCAB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3146094-8062-45C4-8FF9-4E1CBDDCAB59}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3146094-8062-45C4-8FF9-4E1CBDDCAB59}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3146094-8062-45C4-8FF9-4E1CBDDCAB59}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MongoDbGenericRepository/DataAccess/Base/DataAccessBase.cs b/MongoDbGenericRepository/DataAccess/Base/DataAccessBase.cs index 3e55c59..5826742 100644 --- a/MongoDbGenericRepository/DataAccess/Base/DataAccessBase.cs +++ b/MongoDbGenericRepository/DataAccess/Base/DataAccessBase.cs @@ -2,6 +2,7 @@ using MongoDB.Driver.Linq; using MongoDbGenericRepository.Models; using System; +using System.Linq; using System.Linq.Expressions; namespace MongoDbGenericRepository.DataAccess.Base @@ -35,7 +36,7 @@ namespace MongoDbGenericRepository.DataAccess.Base /// The filter definition. /// The collection partition key. /// - public virtual IMongoQueryable GetQuery(Expression> filter, string partitionKey = null) + public virtual IQueryable GetQuery(Expression> filter, string partitionKey = null) where TDocument : IDocument where TKey : IEquatable { diff --git a/MongoDbGenericRepository/DataAccess/Base/IDataAccessBase.cs b/MongoDbGenericRepository/DataAccess/Base/IDataAccessBase.cs index af0fb43..0df582e 100644 --- a/MongoDbGenericRepository/DataAccess/Base/IDataAccessBase.cs +++ b/MongoDbGenericRepository/DataAccess/Base/IDataAccessBase.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Linq.Expressions; using MongoDB.Driver; using MongoDB.Driver.Linq; @@ -19,7 +20,7 @@ namespace MongoDbGenericRepository.DataAccess.Base /// The filter definition. /// The collection partition key. /// - IMongoQueryable GetQuery(Expression> filter, string partitionKey = null) + IQueryable GetQuery(Expression> filter, string partitionKey = null) where TDocument : IDocument where TKey : IEquatable; diff --git a/MongoDbGenericRepository/MongoDbContext.cs b/MongoDbGenericRepository/MongoDbContext.cs index 2eae9ee..55bf510 100644 --- a/MongoDbGenericRepository/MongoDbContext.cs +++ b/MongoDbGenericRepository/MongoDbContext.cs @@ -97,7 +97,6 @@ namespace MongoDbGenericRepository // GuidRepresentation and GuidRepresentationMode will be removed in the next major release of the MongoDB Driver. // We can safely replace this with RepositorySerializationProvider.Instance.RegisterSerializer once we upgrade to the next major release. #pragma warning disable CS0618 - BsonDefaults.GuidRepresentationMode = GuidRepresentationMode.V3; RepositorySerializationProvider.Instance.RegisterSerializer(new GuidSerializer(guidRepresentation)); #pragma warning restore CS0618 } diff --git a/MongoDbGenericRepository/MongoDbGenericRepository.csproj b/MongoDbGenericRepository/MongoDbGenericRepository.csproj index b392918..46cd6e2 100644 --- a/MongoDbGenericRepository/MongoDbGenericRepository.csproj +++ b/MongoDbGenericRepository/MongoDbGenericRepository.csproj @@ -1,7 +1,6 @@  - net472;netstandard2.0; true MongoDbGenericRepository 1.6.2 @@ -18,6 +17,8 @@ 1.6.2 https://github.com/alexandre-spieser/mongodb-generic-repository Git + netstandard2.1 + 7.3 @@ -25,7 +26,7 @@ - + \ No newline at end of file