More cleanup

.gitignore

@@ -2,4 +2,5 @@ bin/
 obj/
 /packages/
 riderModule.iml
-/_ReSharper.Caches/
+/_ReSharper.Caches/
+**/modules/_protected/

OptimizelyTestContainers.sln

@@ -1,10 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelyTestContainers.Tests", "test\OptimizelyTestContainers.Tests\OptimizelyTestContainers.Tests.csproj", "{60DAC0B9-1D46-4D3A-BC27-4B7BE193AB4E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptimizelyTestContainers.Tests", "src\OptimizelyTestContainers.Tests\OptimizelyTestContainers.Tests.csproj", "{60DAC0B9-1D46-4D3A-BC27-4B7BE193AB4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimizely.TestContainers.Shared", "Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj", "{E4204C7A-7CC7-40FB-BFE2-D36B7286D7D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimizely.TestContainers.Shared", "src\Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj", "{E4204C7A-7CC7-40FB-BFE2-D36B7286D7D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimizely.TestContainers.Commerce.Tests", "Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj", "{63D88C12-0DF6-4C82-939C-1FF0B564B63E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimizely.TestContainers.Commerce.Tests", "src\Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj", "{63D88C12-0DF6-4C82-939C-1FF0B564B63E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

OptimizelyTestContainers.slnx

@@ -1,5 +1,5 @@
 <Solution>
-  <Project Path="Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj" Type="Classic C#" />
-  <Project Path="Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" Type="Classic C#" />
-  <Project Path="test/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj" />
+  <Project Path="src/Optimizely.TestContainers.Commerce.Tests\Optimizely.TestContainers.Commerce.Tests.csproj" />
+  <Project Path="src/Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" />
+  <Project Path="src/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj" />
 </Solution>

Optimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs → src/Optimizely.TestContainers.Commerce.Tests/CommerceCatalogIntegrationTests.cs

@@ -15,7 +15,7 @@ namespace Optimizely.TestContainers.Commerce.Tests;
 
 public class CommerceCatalogIntegrationTests() : OptimizelyIntegrationTestBase(includeCommerce: true)
 {
-    protected override void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder)
+    protected override void ConfigureWebHostBuilder(IWebHostBuilder webHostBuilder)
     {
         webHostBuilder.UseStartup<Startup>();
     }
@@ -57,6 +57,7 @@ public void Can_Save_Catalog_And_Node_And_Product()
         Assert.NotNull(testAlienProductReference);
 
         // Act
+        aliensCatalog = contentRepository.Get<CatalogContent>(alienCatalogReference);
         aliensNode = contentRepository.Get<NodeContent>(aliensNodeReference);
         testAlienProduct = contentRepository.Get<TestProduct>(testAlienProductReference);
 

Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs → src/Optimizely.TestContainers.Shared/OptimizelyIntegrationTestBase.cs

@@ -14,37 +14,32 @@ public abstract class OptimizelyIntegrationTestBase(bool includeCommerce) : IAsy
 {
     private IHost _host = null!;
 
-    // Since we use same container with different db names we can remove one of these :P
     private MsSqlContainer _databaseContainer = null!;
 
     protected IServiceProvider Services { get; private set; } = null!;
 
     public virtual async Task InitializeAsync()
     {
-        // Create Cms SQL Server container
+        // Create SQL Server container
         var container = await CreateDatabaseContainer();
 
-        // Create CMS databse
-        var cmsDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Cms");
+        // Create CMS database
+        var cmsDatabaseConnectionString = await CreateNamedDatabase(container, "Cms");
 
         string? commerceDatabaseConnectionString = null;
         if (includeCommerce)
         {
-            commerceDatabaseConnectionString = await CreateNamedDatabaseConnectionString(container, "Commerce");
+            // Create Commerce database
+            commerceDatabaseConnectionString = await CreateNamedDatabase(container, "Commerce");
         }
 
-
         // Build CMS host
         _host = Host.CreateDefaultBuilder()
            .ConfigureWebHostDefaults(webHostBuilder =>
             {
                 webHostBuilder
                     .ConfigureServices((context, services) =>
                     {
-                        // TODO: Only include in CMS test
-                        // Add data importer service to setup default content for the tests
-                       //services.AddTransient<OptimizelyDataImporter>();
-
                         // Must be set here too for initialization to work for CMS
                         services.Configure<DataAccessOptions>(o =>
                         {
@@ -62,8 +57,8 @@ public virtual async Task InitializeAsync()
                         configBuilder.AddInMemoryCollection(testSettings);
                     });
 
-                // To configure aps separately with Cms and Commerce Statup files in separate projects
-                ConfiureWebHostBuilder(webHostBuilder); 
+                // To configure apps separately with Cms and Commerce Startup files in separate projects
+                ConfigureWebHostBuilder(webHostBuilder); 
             })
             .ConfigureCmsDefaults()
            .Build();
@@ -78,7 +73,7 @@ public virtual async Task InitializeAsync()
         await _host.StartAsync();
     }
 
-    protected abstract void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder);
+    protected abstract void ConfigureWebHostBuilder(IWebHostBuilder webHostBuilder);
 
     public async Task DisposeAsync()
     {
@@ -89,19 +84,17 @@ public async Task DisposeAsync()
 
     private async Task<MsSqlContainer> CreateDatabaseContainer()
     {
-        var container = new MsSqlBuilder()
+        _databaseContainer = new MsSqlBuilder()
             .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
             .WithPassword("yourStrong(!)Password")
             .Build();
 
-        await container.StartAsync();
-
-        _databaseContainer = container;
+        await _databaseContainer.StartAsync();
 
         return _databaseContainer;
     }
 
-    private async Task<string> CreateNamedDatabaseConnectionString(MsSqlContainer container, string databaseName)
+    private async Task<string> CreateNamedDatabase(MsSqlContainer container, string databaseName)
     {
         databaseName = $"{GetType().Name}-{databaseName}";
 

test/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs → src/OptimizelyTestContainers.Tests/NewsPageIntegrationTests.cs

@@ -13,7 +13,7 @@ namespace OptimizelyTestContainers.Tests;
 
 public class NewsPageIntegrationTest() : OptimizelyIntegrationTestBase(includeCommerce: false)
 {
-    protected override void ConfiureWebHostBuilder(IWebHostBuilder webHostBuilder)
+    protected override void ConfigureWebHostBuilder(IWebHostBuilder webHostBuilder)
     {
         webHostBuilder.UseStartup<Startup>();
 
@@ -35,7 +35,7 @@ public void Can_Create_And_Read_NewsPage()
         var episerverDataFile = Path.Combine(basePath, "DefaultSiteContent.episerverdata");
         var dataImporter = Services.GetRequiredService<OptimizelyDataImporter>();
 
-        // Run data importer service to setup default content for the tests
+        // Run data importer service to set up default content for the tests
         dataImporter.Import(episerverDataFile);
 
         // Find StartPage from root

test/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj → src/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj

@@ -35,7 +35,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" />
+      <ProjectReference Include="..\Optimizely.TestContainers.Shared\Optimizely.TestContainers.Shared.csproj" />
     </ItemGroup>
 
     <ItemGroup>