diff --git a/Shared.EventStore.Tests/AggregateRepositoryTests.cs b/Shared.EventStore.Tests/AggregateRepositoryTests.cs index 921e9df9..d00358b8 100644 --- a/Shared.EventStore.Tests/AggregateRepositoryTests.cs +++ b/Shared.EventStore.Tests/AggregateRepositoryTests.cs @@ -147,11 +147,6 @@ public async Task AggregateRepository_GetLatestVersionFromLastEvent_GetEventsFai AggregateRepository testAggregateRepository = new(context.Object, factory); - AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test"); - EventRecord r = TestData.CreateEventRecord(aggregateNameSetEvent, "TestAggregate"); - List e = new(){ - new ResolvedEvent(r, null, null) - }; context.Setup(c => c.GetEventsBackward(It.IsAny(), It.IsAny(), It.IsAny())).ReturnsAsync(Result.Failure("error")); Result result = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None); diff --git a/Shared.EventStore.Tests/AggregateServiceTests.cs b/Shared.EventStore.Tests/AggregateServiceTests.cs index 5608e3cc..2051fd19 100644 --- a/Shared.EventStore.Tests/AggregateServiceTests.cs +++ b/Shared.EventStore.Tests/AggregateServiceTests.cs @@ -88,7 +88,6 @@ public async Task Get_ShouldReturnAggregateFromRepository_WhenNotInCache_AndSetT public async Task Get_ShouldReturnAggregateFromRepository_GetLatestFails_FailedResultReturned() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); repositoryMock.Setup(repo => repo.GetLatestVersion(aggregateId, It.IsAny())).ReturnsAsync(Result.Failure("Error getting latest")); @@ -106,7 +105,6 @@ public async Task Get_ShouldReturnAggregateFromRepository_GetLatestFails_FailedR public async Task Get_ShouldReturnAggregateFromRepository_GetLatestThrowsException_FailedResultReturned() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); repositoryMock.Setup(repo => repo.GetLatestVersion(aggregateId, It.IsAny())).ThrowsAsync(new Exception("Exception Message")); @@ -228,7 +226,6 @@ public async Task GetLatest_ShouldReturnAggregateDataStore() { public async Task GetLatest_GetFailed_ReturnsFailedResult() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); _repositoryResolverMock.Setup(resolver => resolver.Resolve()).Returns(repositoryMock.Object); @@ -246,7 +243,6 @@ public async Task GetLatest_GetFailed_ReturnsFailedResult() { public async Task GetLatest_GetLatestThrowsException_ReturnsFailedResult() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); _repositoryResolverMock.Setup(resolver => resolver.Resolve()).Returns(repositoryMock.Object); @@ -282,7 +278,6 @@ public async Task GetLatestVersionFromLastEvent_ShouldReturnAggregateDataStore() public async Task GetLatestVersionFromLastEvent_GetFailed_ReturnsFailedResult() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); _repositoryResolverMock.Setup(resolver => resolver.Resolve()).Returns(repositoryMock.Object); @@ -300,7 +295,6 @@ public async Task GetLatestVersionFromLastEvent_GetFailed_ReturnsFailedResult() public async Task GetLatestVersionFromLastEvent_GetLatestThrowsException_ReturnsFailedResult() { // Arrange var aggregateId = Guid.NewGuid(); - var aggregate = new TestAggregate { AggregateId = aggregateId }; var repositoryMock = new Mock>(); _repositoryResolverMock.Setup(resolver => resolver.Resolve()).Returns(repositoryMock.Object); diff --git a/Shared.EventStore.Tests/EventStoreHealthCheckBuilderExtensionsTests.cs b/Shared.EventStore.Tests/EventStoreHealthCheckBuilderExtensionsTests.cs index 5e4ea913..8a430ff7 100644 --- a/Shared.EventStore.Tests/EventStoreHealthCheckBuilderExtensionsTests.cs +++ b/Shared.EventStore.Tests/EventStoreHealthCheckBuilderExtensionsTests.cs @@ -46,7 +46,6 @@ public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_EventsR public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_NoEventsReturned_Unhealthy() { Mock context = new(); - AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test"); context.Setup(c => c.ReadLastEventsFromAll(It.IsAny(), It.IsAny())).ReturnsAsync(Result.Success(new List())); EventStoreConnectionStringHealthCheck healthCheck = new(context.Object); @@ -58,7 +57,6 @@ public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_NoEvent public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_ReadLastEventsFromAll_Unhealthy() { Mock context = new(); - AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test"); context.Setup(c => c.ReadLastEventsFromAll(It.IsAny(), It.IsAny())).ReturnsAsync(Result.Failure()); EventStoreConnectionStringHealthCheck healthCheck = new(context.Object); @@ -70,7 +68,6 @@ public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_ReadLas public async Task EventStoreConnectionStringHealthCheck_CheckHealthAsync_ExceptionThrown_Unhealthy() { Mock context = new(); - AggregateNameSetEvent aggregateNameSetEvent = new(TestData.AggregateId, TestData.EventId, "Test"); context.Setup(c => c.ReadLastEventsFromAll(It.IsAny(), It.IsAny())).ThrowsAsync(new Exception()); EventStoreConnectionStringHealthCheck healthCheck = new(context.Object); diff --git a/Shared.EventStore/EventStore/EventStoreContext.cs b/Shared.EventStore/EventStore/EventStoreContext.cs index ed17ac6c..dff67059 100644 --- a/Shared.EventStore/EventStore/EventStoreContext.cs +++ b/Shared.EventStore/EventStore/EventStoreContext.cs @@ -233,8 +233,6 @@ public async Task> RunTransientQuery(String query, CancellationTo { await this.ProjectionManagementClient.CreateTransientAsync(queryName, query, cancellationToken: source.Token); - Stopwatch stopwatch = Stopwatch.StartNew(); - while (true) { if (cancellationToken.IsCancellationRequested) diff --git a/Shared.EventStore/ProjectionEngine/ProjectionHandler.cs b/Shared.EventStore/ProjectionEngine/ProjectionHandler.cs index 6397cb4a..1239e861 100644 --- a/Shared.EventStore/ProjectionEngine/ProjectionHandler.cs +++ b/Shared.EventStore/ProjectionEngine/ProjectionHandler.cs @@ -46,7 +46,6 @@ public async Task Handle(IDomainEvent @event, CancellationToken cancellationToke } Stopwatch stopwatch = Stopwatch.StartNew(); - StringBuilder builder = new(); //Load the state from persistence TState state = await this.ProjectionStateRepository.Load(@event, cancellationToken); diff --git a/Shared.EventStoreContext.Tests/EventStoreContextTests.cs b/Shared.EventStoreContext.Tests/EventStoreContextTests.cs index 1d3c9026..d371320c 100644 --- a/Shared.EventStoreContext.Tests/EventStoreContextTests.cs +++ b/Shared.EventStoreContext.Tests/EventStoreContextTests.cs @@ -43,8 +43,6 @@ public void Dispose(){ [OneTimeTearDown] public async Task TearDown(){ - DockerServices sharedDockerServices = DockerServices.SqlServer; - //await this.EventStoreDockerHelper.StopContainersForScenarioRun(sharedDockerServices); } @@ -258,7 +256,6 @@ public async Task EventStoreContext_RunTransientQuery_Faulted_ErrorThrown(Boolea [TestCase(false)] public async Task EventStoreContext_RunTransientQuery_QueryIsRun(Boolean secureEventStore){ TimeSpan deadline = TimeSpan.FromMinutes(2); - TimeSpan retryTimeout = TimeSpan.FromMinutes(6); await this.EventStoreDockerHelper.StartContainers(secureEventStore, $"EventStoreContext_RunTransientQuery_QueryIsRun{secureEventStore}"); @@ -305,7 +302,6 @@ public async Task EventStoreContext_RunTransientQuery_QueryIsRun(Boolean secureE [TestCase(false)] public async Task EventStoreContext_RunTransientQuery_ResultIsEmpty_ErrorThrown(Boolean secureEventStore){ TimeSpan deadline = TimeSpan.FromMinutes(2); - TimeSpan retryTimeout = TimeSpan.FromMinutes(6); await this.EventStoreDockerHelper.StartContainers(secureEventStore, $"EventStoreContext_RunTransientQuery_ResultIsEmpty_ErrorThrown{secureEventStore}"); diff --git a/Shared.IntegrationTesting/BaseDockerHelper.cs b/Shared.IntegrationTesting/BaseDockerHelper.cs index aa0d3314..cb9d59bc 100644 --- a/Shared.IntegrationTesting/BaseDockerHelper.cs +++ b/Shared.IntegrationTesting/BaseDockerHelper.cs @@ -546,7 +546,7 @@ public virtual ContainerBuilder SetupTestHostContainer(){ (String imageName, Boolean useLatest) imageDetails = this.GetImageDetails(ContainerType.TestHost); ContainerBuilder testHostContainer = new Builder().UseContainer().WithName(this.TestHostContainerName).WithEnvironment(environmentVariables.ToArray()) - .UseImageDetails(this.GetImageDetails(ContainerType.TestHost)).ExposePort(DockerPorts.TestHostPort) + .UseImageDetails(imageDetails).ExposePort(DockerPorts.TestHostPort) .MountHostFolder(this.DockerPlatform, this.HostTraceFolder) .SetDockerCredentials(this.DockerCredentials); @@ -837,7 +837,6 @@ protected virtual List GetRequiredProjections(){ protected virtual async Task LoadEventStoreProjections(){ //Start our Continuous Projections - we might decide to do this at a different stage, but now lets try here String projectionsFolder = "projections/continuous"; - IPAddress[] ipAddresses = Dns.GetHostAddresses("127.0.0.1"); if (!String.IsNullOrWhiteSpace(projectionsFolder)){ DirectoryInfo di = new(projectionsFolder); @@ -1019,15 +1018,11 @@ protected async Task StartContainer(Func(() => ConfigurationReader.GetValueFromSection>("AppSettings", "TestArray")); }