Added tests for Event Type Filtering

Cleaned up leftover in Nginx docker compose config
oskardudycz · May 24, 2024 · 83034ed · 83034ed
1 parent 2fbf052
commit 83034ed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/Core.EventStoreDB.Tests/Subscriptions/Filtering/EventTypeFiltersTests.cs b/Core.EventStoreDB.Tests/Subscriptions/Filtering/EventTypeFiltersTests.cs
@@ -5,6 +5,7 @@
 using Xunit;
 
 namespace Core.EventStoreDB.Tests.Subscriptions.Filtering;
+
 using static EventFilters;
 
 public class EventTypeFiltersTests
@@ -14,7 +15,8 @@ public void ExcludeSystemAndCheckpointEventsRegex_Should_NotMatch_SystemEvents()
     {
         ExcludeSystemAndCheckpointEventsRegex.IsMatch("$scavengeIndexInitialized").Should().BeFalse();
         ExcludeSystemAndCheckpointEventsRegex.IsMatch(typeof(CheckpointStored).FullName!).Should().BeFalse();
-        ExcludeSystemAndCheckpointEventsRegex.IsMatch("Core.EventStoreDB.Subscriptions.Checkpoints.CheckpointStored").Should().BeFalse();
+        ExcludeSystemAndCheckpointEventsRegex.IsMatch("Core.EventStoreDB.Subscriptions.Checkpoints.CheckpointStored")
+            .Should().BeFalse();
     }
 
     [Fact]
@@ -53,6 +55,17 @@ public void OneOfEventTypesRegex_WithEventTypeMapper_Should_Match_ProvidedEventT
         regex.IsMatch("ShoppingCartOpened").Should().BeTrue();
     }
 
+    [Fact]
+    public void OneOfEventTypesRegex_WithEventTypeMapper_Should_NotMatch_EventTypesWithDefaultName()
+    {
+        var eventTypeMapper = new EventTypeMapper();
+        eventTypeMapper.AddCustomMap<ShoppingCartOpened>("ShoppingCartOpened");
+
+        var regex = OneOfEventTypesRegex(eventTypeMapper, typeof(ShoppingCartOpened));
+
+        regex.IsMatch(typeof(ShoppingCartOpened).FullName!).Should().BeFalse();
+    }
+
     [Fact]
     public void OneOfEventTypesRegex_WithEventTypeMapper_Should_NotMatch_OtherEventTypesWithCustomMap()
     {
@@ -62,8 +75,10 @@ public void OneOfEventTypesRegex_WithEventTypeMapper_Should_NotMatch_OtherEventT
         var regex = OneOfEventTypesRegex(eventTypeMapper, typeof(ShoppingCartOpened));
 
         regex.IsMatch("OrderPlaced").Should().BeFalse();
+        regex.IsMatch(typeof(ShoppingCartOpened).FullName!).Should().BeFalse();
+        regex.IsMatch(typeof(OrderPlaced).FullName!).Should().BeFalse();
     }
-    
+
     [Fact]
     public void OneOfEventTypesRegex_WithEventTypeMapper_Should_Match_ProvidedEventTypes()
     {
@@ -82,10 +97,16 @@ public void OneOfEventTypesRegex_WithEventTypeMapper_Should_NotMatch_OtherEventT
         var regex = OneOfEventTypesRegex(eventTypeMapper, typeof(ShoppingCartOpened));
 
         regex.IsMatch("OrderPlaced").Should().BeFalse();
+        regex.IsMatch(typeof(OrderPlaced).FullName!).Should().BeFalse();
     }
 
     private record ShoppingCartOpened(
         Guid ShoppingCartId,
         Guid ClientId
     );
+
+    private record OrderPlaced(
+        Guid OrderId,
+        Guid ClientId
+    );
 }
diff --git a/Sample/Helpdesk/Helpdesk.Api/docker-compose.yml b/Sample/Helpdesk/Helpdesk.Api/docker-compose.yml
@@ -7,7 +7,6 @@ services:
             - 8089:80
         volumes:
             - ./nginx.conf:/etc/nginx/nginx.conf
-#            - ./nginx.conf:/etc/nginx/conf.d/default.conf
         depends_on:
             - backend