Coday/#303 quality fixes

Driver/Program.cs

@@ -21,7 +21,7 @@ internal class Program
         #region Methods
 
         internal static EventStoreClientSettings ConfigureEventStoreSettings() {
-            EventStoreClientSettings settings = new(); //EventStoreClientSettings.Create("esdb://127.0.0.1:2113?tls=trur");
+            EventStoreClientSettings settings = new();
 
             settings.CreateHttpMessageHandler = () => new SocketsHttpHandler {
                                                                                  SslOptions = {
@@ -43,10 +43,6 @@ internal static EventStoreClientSettings ConfigureEventStoreSettings() {
         private static async Task Main(String[] args) {
             Logger.Initialise(NullLogger.Instance);
             await Program.SubscriptionsTest();
-            //await Program.QueryTest();
-
-            //TestDockerHelper t = new TestDockerHelper();
-            //await t.StartContainersForScenarioRun("");
 
             Console.ReadKey();
         }
@@ -69,8 +65,6 @@ private static async Task SubscriptionsTest() {
 
             ISubscriptionRepository subscriptionRepository = SubscriptionRepository.Create(eventStoreConnectionString, cacheDuration);
 
-            //((SubscriptionRepository)subscriptionRepository).Trace += (sender, s) => Extensions.log(TraceEventType.Information, "REPOSITORY", s);
-
             // init our SubscriptionRepository
             subscriptionRepository.PreWarm(CancellationToken.None).Wait();
 
@@ -90,10 +84,6 @@ private static async Task SubscriptionsTest() {
         }
 
         #endregion
-
-        #region Others
-
-        #endregion
     }
 
 

Shared.EventStore.Tests/AggregateExtensionsTests.cs

@@ -80,7 +80,6 @@ public void AggregateExtensions_IsEventDuplicate_EventsIsNotADuplicate(Boolean c
     public void AggregateExtensions_GetPendingEvents_EventIsApplied()
     {
         TestAggregate t = TestAggregate.Create(TestData.AggregateId);
-        AggregateNameSetEvent aggregateNameSetEvent = new AggregateNameSetEvent(TestData.AggregateId, TestData.EventId, "Test");
         t.CommitPendingEvents();
         IList<IDomainEvent> events = t.GetPendingEvents();
         events.Count.ShouldBe(0);

Shared.EventStore.Tests/DomainEventHandlerResolverTests.cs

@@ -36,8 +36,6 @@ public void DomainEventHandlerResolver_EventNotConfigured_NullReturned()
                                                                          return new TestDomainEventHandler();
                                                                      };
 
-            List<String> handlers = new List<String>();
-
             DomainEventHandlerResolver r = new DomainEventHandlerResolver(eventHandlerConfiguration, createEventHandlerFunc);
             List<IDomainEventHandler> result = r.GetDomainEventHandlers(new EstateCreatedEvent(TestData.AggregateId, TestData.EstateName));
             result.ShouldBeNull();
@@ -56,7 +54,7 @@ public void DomainEventHandlerResolver_GetDomainEventHandlers_NoHandlerFound_Err
             eventHandlerConfiguration.Add("EstateCreatedEvent", handlers.ToArray());
 
             Should.Throw<NotSupportedException>(() => {
-                                                    DomainEventHandlerResolver r = new DomainEventHandlerResolver(eventHandlerConfiguration, createEventHandlerFunc);
+                                                    new DomainEventHandlerResolver(eventHandlerConfiguration, createEventHandlerFunc);
                                                 });
         }
     }

Shared.EventStore.Tests/ProjectionHandlerTests.cs

@@ -86,12 +86,6 @@ public async Task ProjectionHandler_Handle_NullEvent_EventHandled()
         [Fact]
         public async Task ProjectionHandler_Handle_EventNotHandled_EventHandled()
         {
-            TestState originalState = new TestState();
-            TestState updatedState = new TestState
-                                     {
-                                         Name = "Test Name"
-                                     };
-
             Mock<IProjectionStateRepository<TestState>> projectionStateRepository = new Mock<IProjectionStateRepository<TestState>>();
             Mock<IProjection<TestState>> projection = new Mock<IProjection<TestState>>();
             projection.Setup(p => p.ShouldIHandleEvent(It.IsAny<IDomainEvent>())).Returns(false);

Shared.EventStore/Aggregate/EventDataFactory.cs

@@ -38,7 +38,6 @@ public class EventDataFactory : IEventDataFactory
         /// </summary>
         public EventDataFactory()
         {
-            //this.Serialiser = new JsonSerialiser(jsonOptionsFunc);
             JsonConvert.DefaultSettings = EventDataFactory.jsonOptionsFunc;
         }
 

Shared.EventStore/EventStore/EventStoreContext.cs

@@ -161,12 +161,6 @@ public async Task<Result> InsertEvents(String streamName,
                                        Object metadata,
                                        CancellationToken cancellationToken)
         {
-            List<EventData> eventData = new List<EventData>();
-            JsonSerializerSettings s = new JsonSerializerSettings
-            {
-                TypeNameHandling = TypeNameHandling.All
-            };
-
             this.LogInformation($"About to append {aggregateEvents.Count} to Stream {streamName}");
             try {
                 await this.EventStoreClient.AppendToStreamAsync(streamName, StreamRevision.FromInt64(expectedVersion),

Shared.EventStore/EventStore/IEventStoreContextManager.cs

@@ -7,6 +7,8 @@ namespace Shared.EventStore.EventStore
 
     public interface IEventStoreContextManager
     {
+        event TraceHandler TraceGenerated;
+
         IEventStoreContext GetEventStoreContext(String connectionIdentifier, String connectionStringIdentifier);
 
         IEventStoreContext GetEventStoreContext(String connectionIdentifier);

Shared.EventStoreContext.Tests/EventStoreContextTests.cs

@@ -39,7 +39,7 @@ public EventStoreContextTests(){
         #region Methods
 
         public void Dispose(){
-
+            // Just needed for the interface
         }
 
         [OneTimeTearDown]
@@ -351,42 +351,5 @@ private IEventStoreContext CreateContext(Boolean secureEventStore, TimeSpan? dea
 
         #endregion
 
-
-        //private async Task<String> RunTransientQuery(IEventStoreContext context, String query, Int32 checkType, TimeSpan? deadline = null, TimeSpan? retryTimeout = null){
-        //    Int32 counter = 0;
-        //    String queryResult = null;
-        //    await Retry.For(async () => {
-        //                        counter++;
-        //                        this.EventStoreDockerHelper.Trace($"Inside Retry Counter [{counter}] Check Type [{checkType}]");
-        //                        Result<String>? queryResult = await context.RunTransientQuery(query, CancellationToken.None);
-        //                        if (checkType == 1){
-        //                            queryResult.IsFailed.ShouldBeTrue();
-
-        //                            String errors = String.Join("|", queryResult.Errors);
-        //                            this.EventStoreDockerHelper.Trace(errors);
-        //                            if (errors.Any()) {
-        //                                errors.Contains("Faulted").ShouldBeTrue();
-        //                            }
-        //                            else {
-        //                                queryResult.Message.Contains("Faulted").ShouldBeTrue();
-        //                            }
-        //                        }
-        //                        else{
-
-        //                            switch(checkType){
-        //                                case 2: // Not Null or Empty
-        //                                    queryResult.Data.ShouldNotBeNullOrEmpty();
-        //                                    break;
-        //                                case 3: // Empty
-        //                                    queryResult.Data.ShouldBeEmpty();
-        //                                    break;
-        //                            }
-        //                        }
-        //                    },
-        //                    retryTimeout,
-        //                    deadline);
-        //    return queryResult; 
-
-        //}
     }
 }

Shared.Tests/TestHelpers.cs

@@ -33,7 +33,7 @@ public static ErrorResponse GetErrorResponse(DefaultHttpContext context)
         return responseData;
     }
 
-    public const String ExceptionMessage = "Test Exception Message";
+    public static readonly String ExceptionMessage = "Test Exception Message";
 
     public static T CreateException<T>() where T : Exception{
         return (T)System.Activator.CreateInstance(typeof(T), TestHelpers.ExceptionMessage);