Split into two projects with separate assemblies to make initialization work for both Commerce and Cms

andreas-valtech · andreas-valtech · commit f26b5203e49e · 2025-07-11T15:53:52.000+02:00
diff --git a/Optimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs b/Optimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs
@@ -7,9 +7,10 @@
 using Mediachase.Commerce;
 using Mediachase.Commerce.Catalog;
 using Microsoft.Extensions.DependencyInjection;
-using Optimizely.TestContainers.Models.Commerce;
+using Optimizely.TestContainers.Commerce.Tests.Models.Commerce;
+using Optimizely.TestContainers.Shared;
 
-namespace OptimizelyTestContainers.Tests;
+namespace Optimizely.TestContainers.Commerce.Tests;
 
 public class CommerceCatalogIntegrationTests() : OptimizelyIntegrationTestBase(includeCommerce: true)
 {
diff --git a/Optimizely.TestContainers.Commerce.Tests/Models/Commerce/TestProduct.cs b/Optimizely.TestContainers.Commerce.Tests/Models/Commerce/TestProduct.cs
@@ -1,8 +1,11 @@
 ﻿using System.ComponentModel.DataAnnotations;
 using EPiServer.Commerce.Catalog.ContentTypes;
 using EPiServer.Commerce.Catalog.DataAnnotations;
+using EPiServer.Core;
+using EPiServer.DataAbstraction;
+using EPiServer.DataAnnotations;
 
-namespace Optimizely.TestContainers.Models.Commerce;
+namespace Optimizely.TestContainers.Commerce.Tests.Models.Commerce;
 
 [CatalogContentType(
     GUID = "0B06DE9B-6AE3-40FB-909E-E718CCC260AE",
diff --git a/Optimizely.TestContainers.Commerce.Tests/Startup.cs b/Optimizely.TestContainers.Commerce.Tests/Startup.cs
@@ -2,10 +2,14 @@
 using EPiServer.Cms.UI.AspNetIdentity;
 using EPiServer.Scheduler;
 using EPiServer.Web.Routing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
-namespace Optimizely.TestContainers;
+namespace Optimizely.TestContainers.Commerce.Tests;
 
-public class StartupWithCmsAndCommerce(IWebHostEnvironment webHostingEnvironment)
+public class Startup(IWebHostEnvironment webHostingEnvironment)
 {
     public void ConfigureServices(IServiceCollection services)
     {
@@ -21,7 +25,7 @@ public void ConfigureServices(IServiceCollection services)
             .AddCms()
             .AddCommerce()
             .AddAdminUserRegistration()
-            .AddEmbeddedLocalization<StartupWithCms>();
+            .AddEmbeddedLocalization<Startup>();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/Optimizely.TestContainers.Commerce/Optimizely.TestContainers.Commerce.csproj b/Optimizely.TestContainers.Commerce/Optimizely.TestContainers.Commerce.csproj
@@ -0,0 +1,10 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>Optimizely.TestContainers.Cms</RootNamespace>
+    </PropertyGroup>
+
+</Project>
diff --git a/Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs b/Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs
@@ -1,15 +1,13 @@
-﻿using EPiServer.Framework;
+﻿using EPiServer.Data;
+using EPiServer.Framework;
 using EPiServer.Framework.Initialization;
-using Mediachase.Data.Provider;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Optimizely.TestContainers;
 using Testcontainers.MsSql;
 
-namespace OptimizelyTestContainers.Tests;
+namespace Optimizely.TestContainers.Shared;
 
 public class OptimizelyIntegrationTestBase(bool includeCommerce) : IAsyncLifetime
 {
@@ -29,10 +27,10 @@ public virtual async Task InitializeAsync()
         var cmsDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Cms");
 
         string? commerceDatabaseConnectionString = null;
-        if (includeCommerce)
-        {
+        /*if (includeCommerce)
+        {*/
             commerceDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Commerce");
-        }
+        /*}*/
         
         
         // Build CMS host
@@ -42,14 +40,21 @@ public virtual async Task InitializeAsync()
                 webHostBuilder
                     .ConfigureServices((context, services) =>
                     {
+                        // TODO: Only include in CMS test
                         // Add data importer service to setup default content for the tests
-                        services.AddTransient<OptimizelyDataImporter>();
+                       //services.AddTransient<OptimizelyDataImporter>();
+                        
+                        // Must be set here too for initialization to work for CMS
+                        services.Configure<DataAccessOptions>(o =>
+                        {
+                            o.SetConnectionString(cmsDatabaseConnectionString);
+                        });
                     })
                     .ConfigureAppConfiguration((context, configBuilder) =>
                     {
                         // Workaround to set separate database names inisde container
-                        if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
-                        {
+                        /*if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
+                        {*/
                             var testSettings = new Dictionary<string, string?>
                             {
                                 // TODO: Find Constant for connection string!
@@ -58,26 +63,30 @@ public virtual async Task InitializeAsync()
                             };
 
                             configBuilder.AddInMemoryCollection(testSettings);
-                        }
+                        /*}*/
                     });
                 
+                // TOOD: Run startup in each test project!
                 if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
                 {
-                    webHostBuilder.UseStartup<StartupWithCmsAndCommerce>();
+                    //webHostBuilder.UseStartup<StartupWithCmsAndCommerce>();
                 }
                 else
                 {
-                    webHostBuilder.UseStartup<StartupWithCms>(); 
+                    //webHostBuilder.UseStartup<StartupWithCms>(); 
                 }
+                
+                
 
             })
             .ConfigureCmsDefaults()
            .Build();
+
+        // TOOD:Try to remove this as well!
+        //AssemblyScanner.ExcludedAssemblies.Add("Mediachase");
+        //AssemblyScanner.ExcludedAssemblies.Add("EPiServer.Commerce");
         
         // Run initialization engine (simulate application startup) 
-        
-        // TODO: Runs all initializable modules even if commerce is not included!
-        // Solve with custom IAssemblyScanner?
         var initializer = _host.Services.GetRequiredService<InitializationEngine>();
         if (initializer.InitializationState != InitializationState.Initialized)
             initializer.Initialize(); 
diff --git a/OptimizelyTestContainers.slnx b/OptimizelyTestContainers.slnx
@@ -1,4 +1,7 @@
 <Solution>
+  <Project Path="Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj" Type="Classic C#" />
+  <Project Path="Optimizely.TestContainers.Commerce\Optimizely.TestContainers.Commerce.csproj" Type="Classic C#" />
+  <Project Path="Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" Type="Classic C#" />
   <Project Path="src/Web/Optimizely.TestContainers.csproj" />
   <Project Path="test/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj" />
-</Solution>
+</Solution>
diff --git a/src/Web/Optimizely.TestContainers.csproj b/src/Web/Optimizely.TestContainers.csproj
@@ -26,4 +26,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Translations\**\*" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/Web/Program.cs b/src/Web/Program.cs
@@ -1,12 +1,13 @@
+using Optimizely.TestContainers.Commerce.Tests;
+
 namespace Optimizely.TestContainers;
 
 public class Program
 {
     public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
 
-    // Split Startup into two classes StartupWithCmsAndCommerce and StartupWithCms to be able to test both in isolation
     public static IHostBuilder CreateHostBuilder(string[] args) =>
         Host.CreateDefaultBuilder(args)
             .ConfigureCmsDefaults()
-            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<StartupWithCmsAndCommerce>());
+            .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
 }
diff --git a/src/Web/StartupWithCms.cs b/src/Web/StartupWithCms.cs
diff --git a/test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs b/test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs
@@ -6,6 +6,7 @@
 using EPiServer.Web;
 using Microsoft.Extensions.DependencyInjection;
 using Optimizely.TestContainers.Models.Pages;
+using Optimizely.TestContainers.Shared;
 
 namespace OptimizelyTestContainers.Tests;
 
diff --git a/test/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj b/test/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj
@@ -35,6 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" />
       <ProjectReference Include="..\..\src\Web\Optimizely.TestContainers.csproj" />
     </ItemGroup>
 
diff --git a/test/OptimizelyTestContainers.Tests/Startup.cs b/test/OptimizelyTestContainers.Tests/Startup.cs
@@ -0,0 +1,66 @@
+using EPiServer.Cms.Shell;
+using EPiServer.Cms.UI.AspNetIdentity;
+using EPiServer.Commerce.Internal;
+using EPiServer.Data.SchemaUpdates;
+using EPiServer.Scheduler;
+using EPiServer.Web.Routing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace OptimizelyTestContainers.Tests;
+
+public class Startup(IWebHostEnvironment webHostingEnvironment)
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        if (webHostingEnvironment.IsDevelopment())
+        {
+            AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(webHostingEnvironment.ContentRootPath, "App_Data"));
+
+            services.Configure<SchedulerOptions>(options => options.Enabled = false);
+        }
+
+        services
+            .AddCmsAspNetIdentity<ApplicationUser>()
+            .AddCms()
+            .AddAdminUserRegistration()
+            .AddEmbeddedLocalization<Startup>();
+        
+        // Remove the schema updater from the container if we're not running Commerce
+        /*if (!includeCommerce)
+        {*/
+            //services.RemoveImplementation<ISchemaUpdater, CommerceDatabaseSchemaUpdater>();
+            //services.RemoveImplementation<SchemaUpdaterBase, CommerceDatabaseSchemaUpdater>();
+        /*}*/
+
+        // TODO: Runs all initializable modules even if commerce is not included!
+        // Solve with custom IAssemblyScanner?
+        /*
+        if (!includeCommerce)
+        {
+            services.Replace(new ServiceDescriptor(typeof(IAssemblyScanner)))
+            services.AddSingleton<IAssemblyScanner, ExcludeCommerceAssemblyScanner>();
+        }
+        */
+    }
+
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+
+        app.UseStaticFiles();
+        app.UseRouting();
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapContent();
+        });
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
	`1`	`+using Optimizely.TestContainers.Commerce.Tests;`
	`2`	`+`
`1`	`3`	`namespace Optimizely.TestContainers;`
`2`	`4`
`3`	`5`	`public class Program`
`4`	`6`	`{`
`5`	`7`	`public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();`
`6`	`8`
`7`		`- // Split Startup into two classes StartupWithCmsAndCommerce and StartupWithCms to be able to test both in isolation`
`8`	`9`	`public static IHostBuilder CreateHostBuilder(string[] args) =>`
`9`	`10`	`Host.CreateDefaultBuilder(args)`
`10`	`11`	`.ConfigureCmsDefaults()`
`11`		`- .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<StartupWithCmsAndCommerce>());`
	`12`	`+ .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());`
`12`	`13`	`}`