fix: support symbols in mocked mqtt topic names

BEagle1984 · Jul 21, 2022 · 55693cd · 55693cd
1 parent 44aca09
commit 55693cd
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Label="Package information">
     <BaseVersionSuffix></BaseVersionSuffix>
-    <BaseVersion>3.7.2$(BaseVersionSuffix)</BaseVersion>
+    <BaseVersion>3.7.3$(BaseVersionSuffix)</BaseVersion>
     <DatabasePackagesRevision>1</DatabasePackagesRevision>
     <DatabasePackagesVersionSuffix>$(BaseVersionSuffix)</DatabasePackagesVersionSuffix>
   </PropertyGroup>

diff --git a/docs/releases.md b/docs/releases.md
@@ -4,6 +4,12 @@ uid: releases
 
 # Releases
 
+## [3.7.3](https://github.com/BEagle1984/silverback/releases/tag/v3.7.3)
+
+### Fixes
+
+* Support topic names with symbols (e.g. hyphens) in mocked MQTT broker
+
 ## [3.7.2](https://github.com/BEagle1984/silverback/releases/tag/v3.7.2)
 
 ### Fixes

diff --git a/src/Silverback.Integration.MQTT.Testing/Messaging/Broker/Mqtt/Mocks/ClientSession.cs b/src/Silverback.Integration.MQTT.Testing/Messaging/Broker/Mqtt/Mocks/ClientSession.cs
@@ -204,8 +204,8 @@ private static bool IsSharedSubscription(
             private static Regex GetSubscriptionRegex(string topic, IMqttClientOptions clientOptions)
             {
                 var pattern = Regex.Escape(GetFullTopicName(topic, clientOptions))
-                    .Replace("\\+", "[\\w]*", StringComparison.Ordinal)
-                    .Replace("\\#", "[\\w\\/]*", StringComparison.Ordinal);
+                    .Replace("\\+", "[^\\/]*", StringComparison.Ordinal)
+                    .Replace("\\#", ".*", StringComparison.Ordinal);
 
                 return new Regex($"^{pattern}$", RegexOptions.Compiled);
             }

diff --git a/tests/Silverback.Integration.Tests.E2E/Mqtt/SubscriptionTests.cs b/tests/Silverback.Integration.Tests.E2E/Mqtt/SubscriptionTests.cs
@@ -142,5 +142,35 @@ await publisher.PublishAsync(
                 .Select(envelope => ((TestEventOne)envelope.Message!).Content)
                 .Should().BeEquivalentTo(Enumerable.Range(1, 15).Select(i => $"{i}"));
         }
+
+        [Fact]
+        public async Task Subscription_WithSymbolsInTopicName_MessagesConsumed()
+        {
+            Host.ConfigureServices(
+                    services => services
+                        .AddLogging()
+                        .AddSilverback()
+                        .UseModel()
+                        .WithConnectionToMessageBroker(options => options.AddMockedMqtt())
+                        .AddMqttEndpoints(
+                            endpoints => endpoints
+                                .Configure(
+                                    config => config
+                                        .ConnectViaTcp("e2e-mqtt-broker"))
+                                .AddOutbound<TestEventOne>(endpoint => endpoint.ProduceTo("test/some-topic?name"))
+                                .AddInbound(endpoint => endpoint.ConsumeFrom("test/+").Configure(config => config.WithClientId("e2e-test-1")))
+                                .AddInbound(endpoint => endpoint.ConsumeFrom("test/#").Configure(config => config.WithClientId("e2e-test-2"))))
+                        .AddIntegrationSpyAndSubscriber())
+                .Run();
+
+            var publisher = Host.ScopedServiceProvider.GetRequiredService<IEventPublisher>();
+
+            await publisher.PublishAsync(new TestEventOne());
+
+            await Helper.WaitUntilAllMessagesAreConsumedAsync();
+
+            Helper.Spy.OutboundEnvelopes.Should().HaveCount(1);
+            Helper.Spy.InboundEnvelopes.Should().HaveCount(2);
+        }
     }
 }