@@ -87,8 +87,6 @@ public void generates_wildcard_subscription_pattern()
8787 public void normalizes_slashes_in_tenant_id ( )
8888 {
8989 var mapper = new DefaultTenantSubjectMapper ( ) ;
90-
91- // Tenant IDs with slashes get normalized to dots
9290 mapper . MapSubject ( "orders" , "org/team" ) . ShouldBe ( "org.team.orders" ) ;
9391 }
9492
@@ -319,14 +317,12 @@ public async Task InitializeAsync()
319317 _output . WriteLine ( $ "Using NATS URL: { _natsUrl } ") ;
320318 _output . WriteLine ( $ "Base subject: { _baseSubject } ") ;
321319
322- // Check if NATS is available
323320 if ( ! await IsNatsAvailable ( _natsUrl ) )
324321 {
325322 _output . WriteLine ( "NATS not available, skipping test" ) ;
326323 return ;
327324 }
328-
329- // Create sender host with multi-tenancy enabled
325+
330326 _sender = await Host . CreateDefaultBuilder ( )
331327 . ConfigureLogging ( logging => logging . AddXunitLogging ( _output ) )
332328 . UseWolverine ( opts =>
@@ -343,8 +339,6 @@ public async Task InitializeAsync()
343339 } )
344340 . StartAsync ( ) ;
345341
346- // Create receiver host that listens for messages
347- // The receiver uses wildcard subscription to receive all tenant messages
348342 _receiver = await Host . CreateDefaultBuilder ( )
349343 . ConfigureLogging ( logging => logging . AddXunitLogging ( _output ) )
350344 . UseWolverine ( opts =>
@@ -388,18 +382,15 @@ public async Task messages_are_routed_to_tenant_specific_subjects()
388382
389383 _output . WriteLine ( $ "Sending message { msg1 . Id } with tenant1") ;
390384
391- // Send message with tenant1 and track across both hosts
392385 var session = await _sender
393386 . TrackActivity ( )
394387 . AlsoTrack ( _receiver )
395388 . Timeout ( 30 . Seconds ( ) )
396389 . SendMessageAndWaitAsync ( msg1 , new DeliveryOptions { TenantId = "tenant1" } ) ;
397390
398- // Verify message was sent
399391 var sentMessage = session . Sent . SingleMessage < TenantTestMessage > ( ) ;
400392 sentMessage . Id . ShouldBe ( msg1 . Id ) ;
401393
402- // Verify message was received with correct tenant context
403394 var receivedEnvelope = session . Received . SingleEnvelope < TenantTestMessage > ( ) ;
404395 receivedEnvelope . TenantId . ShouldBe ( "tenant1" ) ;
405396 receivedEnvelope . Message . ShouldBeOfType < TenantTestMessage > ( ) . Id . ShouldBe ( msg1 . Id ) ;
@@ -420,7 +411,6 @@ public async Task different_tenants_route_to_different_subjects()
420411 _output . WriteLine ( $ "Sending message { msg1 . Id } with tenant1") ;
421412 _output . WriteLine ( $ "Sending message { msg2 . Id } with tenant2") ;
422413
423- // Send message for tenant1
424414 var session1 = await _sender
425415 . TrackActivity ( )
426416 . AlsoTrack ( _receiver )
@@ -431,7 +421,6 @@ public async Task different_tenants_route_to_different_subjects()
431421 received1 . TenantId . ShouldBe ( "tenant1" ) ;
432422 received1 . Message . ShouldBeOfType < TenantTestMessage > ( ) . Id . ShouldBe ( msg1 . Id ) ;
433423
434- // Send message for tenant2
435424 var session2 = await _sender
436425 . TrackActivity ( )
437426 . AlsoTrack ( _receiver )
@@ -455,7 +444,6 @@ public async Task fallback_to_default_sends_to_base_subject()
455444 var msgWithTenant = new TenantTestMessage ( Guid . NewGuid ( ) , "With tenant" ) ;
456445 var msgWithoutTenant = new TenantTestMessage ( Guid . NewGuid ( ) , "Without tenant" ) ;
457446
458- // Send message with tenant
459447 var session1 = await _sender
460448 . TrackActivity ( )
461449 . AlsoTrack ( _receiver )
@@ -465,15 +453,13 @@ public async Task fallback_to_default_sends_to_base_subject()
465453 var tenantReceived = session1 . Received . SingleEnvelope < TenantTestMessage > ( ) ;
466454 tenantReceived . TenantId . ShouldBe ( "tenant1" ) ;
467455
468- // Send message without tenant (should fallback to default)
469456 var session2 = await _sender
470457 . TrackActivity ( )
471458 . AlsoTrack ( _receiver )
472459 . Timeout ( 30 . Seconds ( ) )
473460 . SendMessageAndWaitAsync ( msgWithoutTenant ) ;
474461
475462 var defaultReceived = session2 . Received . SingleEnvelope < TenantTestMessage > ( ) ;
476- // Without tenant, should receive on base subject without tenant extraction
477463 defaultReceived . TenantId . ShouldBeNull ( ) ;
478464 }
479465
@@ -521,7 +507,6 @@ public async Task InitializeAsync()
521507 _natsUrl = Environment . GetEnvironmentVariable ( "NATS_URL" ) ?? "nats://localhost:4222" ;
522508 _baseSubject = $ "test.required.{ Guid . NewGuid ( ) : N} ";
523509
524- // Check if NATS is available
525510 if ( ! await IsNatsAvailable ( _natsUrl ) )
526511 {
527512 _output . WriteLine ( "NATS not available, skipping test" ) ;
@@ -625,7 +610,6 @@ public class TenantTestMessageHandler
625610{
626611 public void Handle ( TenantTestMessage message )
627612 {
628- // Message is handled - the test verifies via tracking
629613 }
630614}
631615
0 commit comments