Cleanup

Author: andreas-valtech

Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs

@@ -53,41 +53,20 @@ public virtual async Task InitializeAsync()
                     })
                     .ConfigureAppConfiguration((context, configBuilder) =>
                     {
-                        // Workaround to set separate database names inisde container
-                        /*if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
-                        {*/
-                            var testSettings = new Dictionary<string, string?>
-                            {
-                                // TODO: Find Constant for connection string!
-                                ["ConnectionStrings:EPiServerDB"] = cmsDatabaseConnectionString,
-                                ["ConnectionStrings:EcfSqlConnection"] = commerceDatabaseConnectionString,
-                            };
+                        var testSettings = new Dictionary<string, string?>
+                        {
+                            ["ConnectionStrings:EPiServerDB"] = cmsDatabaseConnectionString,
+                            ["ConnectionStrings:EcfSqlConnection"] = commerceDatabaseConnectionString,
+                        };
 
-                            configBuilder.AddInMemoryCollection(testSettings);
-                        /*}*/
+                        configBuilder.AddInMemoryCollection(testSettings);
                     });
 
+                // To configure aps separately with Cms and Commerce Statup files in separate projects
                 ConfiureWebHostBuilder(webHostBuilder); 
-                
-                // TOOD: Run startup in each test project!
-                /*if (includeCommerce && !string.IsNullOrWhiteSpace(commerceDatabaseConnectionString))
-                {
-                    webHostBuilder.UseStartup<Optimizely.TestContainers.Startup>();
-                }
-                else
-                {
-                    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) 
         var initializer = _host.Services.GetRequiredService<InitializationEngine>();

test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs

@@ -19,6 +19,7 @@ protected override void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder)
 
         webHostBuilder.ConfigureServices(services =>
         {
+            // Add data importer service to setup default content for the tests
             services.AddTransient<OptimizelyDataImporter>();
         });
     }
@@ -33,6 +34,8 @@ public void Can_Create_And_Read_NewsPage()
         var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
         var episerverDataFile = Path.Combine(basePath, "DefaultSiteContent.episerverdata");
         var dataImporter = Services.GetRequiredService<OptimizelyDataImporter>();
+        
+        // Run data importer service to setup default content for the tests
         dataImporter.Import(episerverDataFile);
 
         // Find StartPage from root