Merge pull request #880 from Lombiq/issue/OSOE-402

OSOE-402: Custom logging instead of NLog-based one in Lombiq.UITestingToolbox

NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="7.0.0" />
+    <PackageReference Include="Lombiq.AuditTrailExtensions" Version="7.0.1-alpha.2.osoe-864" />
     <PackageReference Include="Lombiq.BaseTheme" Version="8.0.0" />
     <PackageReference Include="Lombiq.BaseTheme.Samples" Version="8.0.0" />
     <PackageReference Include="Lombiq.ChartJs" Version="8.0.0" />
@@ -35,22 +35,22 @@
     <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="7.0.0" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="7.0.0" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="7.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Admin.Login" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement" Version="8.0.1-alpha.0.osoe-402" />
     <PackageReference Include="Lombiq.JsonEditor" Version="8.0.0" />
     <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="8.0.0" />
     <PackageReference Include="Lombiq.LoginAsAnybody" Version="4.0.0" />
     <PackageReference Include="Lombiq.Privacy" Version="9.0.0" />
     <PackageReference Include="Lombiq.Privacy.Samples" Version="9.0.0" />
     <PackageReference Include="Lombiq.SetupExtensions" Version="7.0.0" />
-    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="11.0.0" />
-    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="11.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="11.1.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="11.1.1-alpha.0.osoe-402" />
     <PackageReference Include="Lombiq.UIKit" Version="8.0.0" />
     <PackageReference Include="Lombiq.VueJs" Version="7.0.0" />
     <PackageReference Include="Lombiq.VueJs.Samples" Version="7.0.0" />

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Lombiq.OSOCE.NuGet.Tests.UI.csproj

@@ -30,19 +30,19 @@
     <PackageReference Include="Lombiq.Hosting.BuildVersionDisplay.Tests.UI" Version="6.0.0" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge.Tests.UI" Version="7.0.0" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Tests.UI" Version="7.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="8.0.0" />
-    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="8.0.0" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Maintenance.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
+    <PackageReference Include="Lombiq.Hosting.Tenants.Management.Tests.UI" Version="8.0.1-alpha.0.osoe-402" />
     <PackageReference Include="Lombiq.JsonEditor.Tests.UI" Version="8.0.0" />
     <PackageReference Include="Lombiq.LoginAsAnybody.Tests.UI" Version="4.0.0" />
     <PackageReference Include="Lombiq.OrchardCoreApiClient.Tests.UI" Version="6.0.1-alpha.0.osoe-909" />
     <PackageReference Include="Lombiq.Privacy.Tests.UI" Version="9.0.0" />
     <PackageReference Include="Lombiq.HelpfulExtensions.Tests.UI" Version="9.0.0" />
-    <PackageReference Include="Lombiq.Tests.UI" Version="11.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="11.1.1-alpha.0.osoe-402" />
     <PackageReference Include="Lombiq.VueJs.Tests.UI" Version="7.0.0" />
     <PackageReference Include="Lombiq.Walkthroughs.Tests.UI" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs

@@ -1,15 +1,15 @@
 using Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.Extensions;
+using Lombiq.OSOCE.NuGet.Tests.UI.Constants;
 using Lombiq.Tests.UI.Extensions;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
-using static Lombiq.OSOCE.NuGet.Tests.UI.Constants.RecipeIds;
 
 namespace Lombiq.OSOCE.NuGet.Tests.UI.Tests.ModuleTests;
 
-public class IdleTenantTests : UITestBase
+public class BehaviorIdleTenantsTests : UITestBase
 {
-    public IdleTenantTests(ITestOutputHelper testOutputHelper)
+    public BehaviorIdleTenantsTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }
@@ -20,11 +20,7 @@ public Task ShuttingDownIdleTenantsShouldWork() =>
             async context =>
             {
                 await context.SignInDirectlyAsync();
-
-                await context.TestIdleTenantManagerBehaviorAsync(TestsSetupRecipeId);
-
-                context.Configuration.AssertAppLogsAsync = webApplicationInstance =>
-                    IdleTenantManagementExtensions.AssertAppLogsWithIdleCheckAsync(webApplicationInstance);
+                await context.TestIdleTenantManagerBehaviorAsync(RecipeIds.TestsSetupRecipeId);
             },
-            configuration => configuration.SetMaxIdleMinutesAndLoggingForUITest());
+            configuration => configuration.ConfigureIdleTenantManagementTestSettings());
 }

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests.UI/UITestBase.cs

@@ -32,7 +32,7 @@ protected override Task ExecuteTestAsync(
             async configuration =>
             {
                 configuration.AssertAppLogsAsync =
-                    OrchardCoreUITestExecutorConfiguration.AssertAppLogsCanContainWarningsAndCacheFolderErrorsAsync;
+                    OrchardCoreUITestExecutorConfiguration.AssertAppLogsCanContainCacheFolderErrorsAsync;
 
                 // These two can be removed once  https://github.com/OrchardCMS/OrchardCore/issues/15222 is done.
                 configuration.AssertBrowserLog = AssertHtmlAndBrowserErrorsHelper.AssertNoNativeButtonUsageInBrowserLog;

NuGetTest/test/Lombiq.OSOCE.NuGet.Tests/Lombiq.OSOCE.NuGet.Tests.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Lombiq.HelpfulLibraries" Version="11.0.0" />
-    <PackageReference Include="Lombiq.Tests" Version="3.0.0" />
+    <PackageReference Include="Lombiq.Tests" Version="4.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Readme.md

@@ -131,7 +131,7 @@ When adding a new extension, or significant new features to existing extensions,
 - If you introduce .NET breaking changes, the Validate NuGet Publish workflow will fail due to [baseline package validation](https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/package-validation/baseline-version-validator). Preferably, adjust the change to not be breaking if possible; if it has to be a breaking change, then you’ll need to create a _CompatibilitySuppressions.xml_ file to mark it as deliberate, what you can do with the following command:
 
 ```powershell
-dotnet pack /p:EnablePackageValidation=true /p:PackageValidationBaselineVersion=<current version> /p:Version=<new version> /p:NuGetBuild=true /p:GenerateCompatibilitySuppressionFile=true
+dotnet pack /p:EnablePackageValidation=true /p:PackageValidationBaselineVersion=<current version, like 1.2.3> /p:Version=<the next patch version> /p:NuGetBuild=true /p:GenerateCompatibilitySuppressionFile=true
 ```
 
 ### Dependencies between Lombiq projects

test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorIdleTenantsTests.cs

@@ -21,5 +21,5 @@ public Task ShuttingDownIdleTenantsShouldWork() =>
                 await context.SignInDirectlyAsync();
                 await context.TestIdleTenantManagerBehaviorAsync();
             },
-            configuration => configuration.SetMaxIdleMinutesAndLoggingForUITest());
+            configuration => configuration.ConfigureIdleTenantManagementTestSettings());
 }

test/Lombiq.OSOCE.Tests.UI/UITestBase.cs

@@ -41,7 +41,5 @@ protected static void ChangeConfiguration(OrchardCoreUITestExecutorConfiguration
 
         configuration.BrowserConfiguration.Headless =
             TestConfigurationManager.GetBoolConfiguration("BrowserConfiguration:Headless", defaultValue: false);
-
-        configuration.AssertAppLogsAsync = OrchardCoreUITestExecutorConfiguration.AssertAppLogsCanContainWarningsAndCacheFolderErrorsAsync;
     }
 }