update unit tests

baoduy · baoduy · commit 6464ebd6cd05 · 2025-06-24T17:52:59.000+08:00
diff --git a/DKNet.FW.sln.DotSettings.user b/DKNet.FW.sln.DotSettings.user
@@ -223,5 +223,5 @@
   &lt;Solution /&gt;
 &lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=9dfe26f6_002Dfee8_002D4a51_002D9d09_002Ded7cf9019a4b/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from &amp;lt;z_Templates&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
-  &lt;Project Location="/Users/steven/_CODE/GIT/DKNet" Presentation="&amp;lt;z_Templates&amp;gt;" /&gt;
+  &lt;Solution /&gt;
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
diff --git a/Rider-Code-Coverage.dcvr b/Rider-Code-Coverage.dcvr
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.Api/appsettings.Development.json b/z_Templates/SlimBus.ApiEndpoints/SlimBus.Api/appsettings.Development.json
@@ -19,7 +19,7 @@
     "RunDbMigrationWhenAppStart": true
   },
   "ConnectionStrings": {
-    "AppDb": "Server=tcp:localhost,1433; Initial Catalog=SlimBusDb; User Id=sa; Password=a1ckZmGjwV8VqNdBUexV; MultipleActiveResultSets=False; Encrypt=True; TrustServerCertificate=True; Connection Timeout=120;",
+    "AppDb": "",
     "AzureBus": ""
   }
 }
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.Api/appsettings.json b/z_Templates/SlimBus.ApiEndpoints/SlimBus.Api/appsettings.json
@@ -37,11 +37,5 @@
   "ConnectionStrings": {
     "TEMPDb": "",
     "AppConfig": ""
-  },
-
-  "Aspire": {
-    "Store": {
-      "Path": "~/AspireStorage"
-    }
   }
 }
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/ApiTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/ApiTests.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace SlimBus.App.Tests.ArchitectureTests;
+namespace SlimBus.App.Tests.Architecture;
 
 public class ApiTests
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/AppServiceTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/AppServiceTests.cs
@@ -2,7 +2,7 @@
 using SlimBus.AppServices;
 using SlimMessageBus;
 
-namespace SlimBus.App.Tests.ArchitectureTests;
+namespace SlimBus.App.Tests.Architecture;
 
 public class AppServiceTests
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/InfraTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Architecture/InfraTests.cs
@@ -5,7 +5,7 @@
 using SlimBus.Infra.Extensions;
 using SlimMessageBus;
 
-namespace SlimBus.App.Tests.ArchitectureTests;
+namespace SlimBus.App.Tests.Architecture;
 
 public class InfraTests
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Fixtures/ApiFixture.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Fixtures/ApiFixture.cs
@@ -1,4 +1,3 @@
-using Aspire.Hosting.ServiceBus;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
@@ -13,7 +12,7 @@ public sealed class ApiFixture : WebApplicationFactory<Api.Program>, IAsyncLifet
     private readonly DistributedApplication _app;
     private readonly IResourceBuilder<RedisResource> _cache;
     private readonly IResourceBuilder<SqlServerDatabaseResource> _db;
-    private readonly IResourceBuilder<ServiceBusResource> _bus;
+    //private readonly IResourceBuilder<ServiceBusResource> _bus;
 
     public ApiFixture()
     {
@@ -30,8 +29,8 @@ public ApiFixture()
             .WithLifetime(ContainerLifetime.Persistent);
         _db = sqlServer.AddDatabase("TestDb");
 
-        _bus = builder.AddServiceBus(sqlServer, "Data/busConfig.json")
-            .WithLifetime(ContainerLifetime.Persistent);
+        // _bus = builder.AddServiceBus(sqlServer, "Data/busConfig.json")
+        //     .WithLifetime(ContainerLifetime.Persistent);
         _app = builder.Build();
     }
 
@@ -64,12 +63,12 @@ public async Task InitializeAsync()
 
         var cacheConn = await _cache.Resource.GetConnectionStringAsync();
         var dbConn = await _db.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None)+";TrustServerCertificate=true";
-        var busConn = await _bus.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None);
-        busConn = busConn?.Replace("localhost", "127.0.0.1", StringComparison.CurrentCultureIgnoreCase);
+        //var busConn = await _bus.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None);
+        //busConn = busConn?.Replace("localhost", "127.0.0.1", StringComparison.CurrentCultureIgnoreCase);
 
         Environment.SetEnvironmentVariable($"ConnectionStrings:{SharedConsts.RedisConnectionString}", cacheConn);
         Environment.SetEnvironmentVariable($"ConnectionStrings:{SharedConsts.DbConnectionString}", dbConn);
-        Environment.SetEnvironmentVariable($"ConnectionStrings:{SharedConsts.AzureBusConnectionString}", busConn);
+        //Environment.SetEnvironmentVariable($"ConnectionStrings:{SharedConsts.AzureBusConnectionString}", busConn);
 
         await Task.Delay(TimeSpan.FromSeconds(15));
 
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Integration/ProfileTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Integration/ProfileTests.cs
@@ -5,7 +5,7 @@
 using SlimBus.AppServices.Profiles.V1.Queries;
 using SlimBus.Infra.ExternalEvents;
 
-namespace SlimBus.App.Tests;
+namespace SlimBus.App.Tests.Integration;
 
 public class ProfileTests(ApiFixture api) : IClassFixture<ApiFixture>
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyMapFixture.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyMapFixture.cs
@@ -1,6 +1,6 @@
 using Mapster;
 
-namespace SlimBus.App.Tests.LazyMapper;
+namespace SlimBus.App.Tests.Unit.LazyMapper;
 
 public sealed class LazyMapFixture : IDisposable, IAsyncDisposable
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyMapperTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyMapperTests.cs
@@ -1,7 +1,7 @@
 using SlimBus.App.Tests.Data;
 using SlimBus.AppServices.Extensions.LazyMapper;
 
-namespace SlimBus.App.Tests.LazyMapper;
+namespace SlimBus.App.Tests.Unit.LazyMapper;
 
 public class LazyMapperTests(LazyMapFixture fixture) : IClassFixture<LazyMapFixture>
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyResultTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/LazyMapper/LazyResultTests.cs
@@ -1,7 +1,7 @@
 using SlimBus.App.Tests.Data;
 using SlimBus.AppServices.Extensions.LazyMapper;
 
-namespace SlimBus.App.Tests.LazyMapper;
+namespace SlimBus.App.Tests.Unit.LazyMapper;
 
 public class LazyResultTests(LazyMapFixture fixture) : IClassFixture<LazyMapFixture>
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/ToProblemDetailsTests.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.App.Tests/Unit/ToProblemDetailsTests.cs
@@ -1,4 +1,4 @@
-namespace SlimBus.App.Tests;
+namespace SlimBus.App.Tests.Unit;
 
 public class ToProblemDetailsTests(ITestOutputHelper testOutputHelper)
 {
diff --git a/z_Templates/SlimBus.ApiEndpoints/SlimBus.Infra/Extensions/ServiceBusSetup.cs b/z_Templates/SlimBus.ApiEndpoints/SlimBus.Infra/Extensions/ServiceBusSetup.cs
@@ -1,9 +1,11 @@
-﻿using Azure.Messaging.ServiceBus;
+﻿using System.Diagnostics.CodeAnalysis;
+using Azure.Messaging.ServiceBus;
 using SlimBus.AppServices.Profiles.V1.Events;
 using SlimBus.Infra.ExternalEvents;
 
 namespace SlimBus.Infra.Extensions;
 
+[ExcludeFromCodeCoverage]
 public static class ServiceBusSetup
 {
     public static IServiceCollection AddServiceBus(this IServiceCollection service, IConfiguration configuration,
@@ -32,33 +34,28 @@ public static IServiceCollection AddServiceBus(this IServiceCollection service,
                         .WithProviderServiceBus(st =>
                     {
                         st.ConnectionString = busConnectionString;
-                        st.ClientFactory = (provider, settings) =>
+                        st.ClientFactory = (_, settings) =>
                             new ServiceBusClient(settings.ConnectionString, new ServiceBusClientOptions
                         {
                             TransportType = ServiceBusTransportType.AmqpTcp,
                         });
 
                         st.TopologyProvisioning = new ServiceBusTopologySettings
                         {
-                            Enabled = false,
+                            Enabled = true,
+                            CanProducerCreateTopic = true,
+                            CanProducerCreateQueue = true,
+                            CanConsumerCreateSubscription = true,
+                            CanConsumerCreateQueue = true,
+                            CreateSubscriptionOptions = op =>
+                            {
+                                op.EnableBatchedOperations = true;
+                                op.MaxDeliveryCount = 10;
+                                op.AutoDeleteOnIdle = TimeSpan.FromDays(60);
+                                op.DeadLetteringOnMessageExpiration = true;
+                                op.DefaultMessageTimeToLive = TimeSpan.FromDays(7);
+                            },
                         };
-                        // st.TopologyProvisioning = new ServiceBusTopologySettings
-                        // {
-                        //     Enabled = true,
-                        //     // CanConsumerCreateQueue = false,
-                        //     // CanConsumerCreateTopic = false,
-                        //     // CanProducerCreateTopic = false,
-                        //     // CanProducerCreateQueue = false,
-                        //     CanConsumerCreateSubscription = true,
-                        //     CreateSubscriptionOptions = op =>
-                        //     {
-                        //         op.EnableBatchedOperations = true;
-                        //         op.MaxDeliveryCount = 10;
-                        //         op.AutoDeleteOnIdle = TimeSpan.FromDays(60);
-                        //         op.DeadLetteringOnMessageExpiration = true;
-                        //         op.DefaultMessageTimeToLive = TimeSpan.FromDays(15);
-                        //     },
-                        // };
                     });
 
                     azb.Produce<ProfileCreatedEvent>(o => o.DefaultTopic("profile-tp"));

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"RunDbMigrationWhenAppStart": true`
`20`	`20`	`},`
`21`	`21`	`"ConnectionStrings": {`
`22`		`- "AppDb": "Server=tcp:localhost,1433; Initial Catalog=SlimBusDb; User Id=sa; Password=a1ckZmGjwV8VqNdBUexV; MultipleActiveResultSets=False; Encrypt=True; TrustServerCertificate=True; Connection Timeout=120;",`
	`22`	`+ "AppDb": "",`
`23`	`23`	`"AzureBus": ""`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,5 @@`
`37`	`37`	`"ConnectionStrings": {`
`38`	`38`	`"TEMPDb": "",`
`39`	`39`	`"AppConfig": ""`
`40`		`- },`
`41`		`-`
`42`		`- "Aspire": {`
`43`		`- "Store": {`
`44`		`- "Path": "~/AspireStorage"`
`45`		`- }`
`46`	`40`	`}`
`47`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`	`2`
`3`		`-namespace SlimBus.App.Tests.ArchitectureTests;`
	`3`	`+namespace SlimBus.App.Tests.Architecture;`
`4`	`4`
`5`	`5`	`public class ApiTests`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using SlimBus.AppServices;`
`3`	`3`	`using SlimMessageBus;`
`4`	`4`
`5`		`-namespace SlimBus.App.Tests.ArchitectureTests;`
	`5`	`+namespace SlimBus.App.Tests.Architecture;`
`6`	`6`
`7`	`7`	`public class AppServiceTests`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using SlimBus.Infra.Extensions;`
`6`	`6`	`using SlimMessageBus;`
`7`	`7`
`8`		`-namespace SlimBus.App.Tests.ArchitectureTests;`
	`8`	`+namespace SlimBus.App.Tests.Architecture;`
`9`	`9`
`10`	`10`	`public class InfraTests`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using SlimBus.AppServices.Profiles.V1.Queries;`
`6`	`6`	`using SlimBus.Infra.ExternalEvents;`
`7`	`7`
`8`		`-namespace SlimBus.App.Tests;`
	`8`	`+namespace SlimBus.App.Tests.Integration;`
`9`	`9`
`10`	`10`	`public class ProfileTests(ApiFixture api) : IClassFixture<ApiFixture>`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Mapster;`
`2`	`2`
`3`		`-namespace SlimBus.App.Tests.LazyMapper;`
	`3`	`+namespace SlimBus.App.Tests.Unit.LazyMapper;`
`4`	`4`
`5`	`5`	`public sealed class LazyMapFixture : IDisposable, IAsyncDisposable`
`6`	`6`	`{`