From 5694b2d08facc73cb0d4d18f53af8b6d7ea0e10d Mon Sep 17 00:00:00 2001 From: Tomas Lycken Date: Thu, 26 Oct 2017 10:19:53 +0200 Subject: [PATCH] Update nugets (#30) * Remove System.ValueTuple This should be picked up from the .NET Standard Library instead. * Update xUnit and Moq Due to improved support for parallel test runs in xUnit 2.3, we need to explicitly disable parallel test runs of the EF tests, because they're all re-using the same db instance. A better solution would be to refactor the test fixture and base class to create a new db-connection instance for each test, and use that. * Use xUnit asserts more idiomatically --- .../ExtensibilityTests/NonDefaultImplementationsTests.cs | 3 +-- .../Infrastructure/AssemblyInitializerFixture.cs | 2 +- .../RdbmsEventStore.EntityFramework.Tests.csproj | 4 ++-- src/RdbmsEventStore.Tests/RdbmsEventStore.Tests.csproj | 6 +++--- src/RdbmsEventStore/RdbmsEventStore.csproj | 1 - 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/RdbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs b/src/RdbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs index 9016cc8..686c097 100644 --- a/src/RdbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs +++ b/src/RdbmsEventStore.EntityFramework.Tests/ExtensibilityTests/NonDefaultImplementationsTests.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity; -using System.Linq; using System.Text; using System.Threading.Tasks; using RdbmsEventStore.EntityFramework.Tests.Infrastructure; @@ -84,7 +83,7 @@ public async Task CanReadEventsFromStoreWithNonDefaultImplementations() var events = await store.Events(1); - Assert.Equal(1, events.Count()); + Assert.Single(events); } public void Dispose() { diff --git a/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/AssemblyInitializerFixture.cs b/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/AssemblyInitializerFixture.cs index 9097215..4de5167 100644 --- a/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/AssemblyInitializerFixture.cs +++ b/src/RdbmsEventStore.EntityFramework.Tests/Infrastructure/AssemblyInitializerFixture.cs @@ -10,6 +10,6 @@ public AssemblyInitializerFixture() } } - [CollectionDefinition(nameof(InMemoryDatabaseCollection))] + [CollectionDefinition(nameof(InMemoryDatabaseCollection), DisableParallelization = true)] public class InMemoryDatabaseCollection : ICollectionFixture { } } \ No newline at end of file diff --git a/src/RdbmsEventStore.EntityFramework.Tests/RdbmsEventStore.EntityFramework.Tests.csproj b/src/RdbmsEventStore.EntityFramework.Tests/RdbmsEventStore.EntityFramework.Tests.csproj index 4b6395c..bb61e91 100644 --- a/src/RdbmsEventStore.EntityFramework.Tests/RdbmsEventStore.EntityFramework.Tests.csproj +++ b/src/RdbmsEventStore.EntityFramework.Tests/RdbmsEventStore.EntityFramework.Tests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/RdbmsEventStore.Tests/RdbmsEventStore.Tests.csproj b/src/RdbmsEventStore.Tests/RdbmsEventStore.Tests.csproj index e133c53..9a36ce7 100644 --- a/src/RdbmsEventStore.Tests/RdbmsEventStore.Tests.csproj +++ b/src/RdbmsEventStore.Tests/RdbmsEventStore.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/RdbmsEventStore/RdbmsEventStore.csproj b/src/RdbmsEventStore/RdbmsEventStore.csproj index b4abd27..f3e5deb 100644 --- a/src/RdbmsEventStore/RdbmsEventStore.csproj +++ b/src/RdbmsEventStore/RdbmsEventStore.csproj @@ -20,7 +20,6 @@ -