Merge pull request #137 from Lombiq/issue/OSOE-935

OSOE-935: Migrating test project to xUnit v3
Lombiq · Feb 13, 2025 · 2f9ee4d · 2f9ee4d
2 parents d0b9735 + 8de5644
commit 2f9ee4d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj b/...EmailQuotaManagement.Tests.UI/Lombiq.Hosting.Tenants.EmailQuotaManagement.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
   </ItemGroup>
 
 </Project>
diff --git a/...q.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj b/...q.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
@@ -51,6 +51,6 @@
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
     <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.1.0" />
-    <PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.0" />
+    <PackageReference Include="Lombiq.HelpfulExtensions" Version="10.0.1-alpha.0.osoe-935" />
   </ItemGroup>
 </Project>
diff --git a/...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj b/...nants.EnvironmentRobots.Tests.UI/Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.csproj
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-        <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+        <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj b/...sting.Tenants.FeaturesGuard.Tests.UI/Lombiq.Hosting.Tenants.FeaturesGuard.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
   </ItemGroup>
 
 </Project>
diff --git a/...osting.Tenants.IdleTenantManagement.Tests.UI/Extensions/IdleTenantManagementExtensions.cs b/...osting.Tenants.IdleTenantManagement.Tests.UI/Extensions/IdleTenantManagementExtensions.cs
@@ -34,7 +34,8 @@ public static void ConfigureIdleTenantManagementTestSettings(this OrchardCoreUIT
             (_, fakeLogCollectorOptions) => fakeLogCollectorOptions.FilteredLevels.Add(LogLevel.Information);
 
         configuration.AssertAppLogsAsync = app =>
-            app.LogsShouldNotContainAsync(logEntry =>
-                AppLogAssertionHelper.NotMediaCacheEntries(logEntry) && logEntry.Level != LogLevel.Information);
+            app.LogsShouldNotContainAsync(
+                logEntry => AppLogAssertionHelper.NotMediaCacheEntries(logEntry) && logEntry.Level != LogLevel.Information,
+                configuration.TestCancellationToken);
     }
 }
diff --git a/...sting.Tenants.IdleTenantManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/...sting.Tenants.IdleTenantManagement.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -1,5 +1,4 @@
 using Lombiq.Tests.UI.Extensions;
-using Lombiq.Tests.UI.Helpers;
 using Lombiq.Tests.UI.Pages;
 using Lombiq.Tests.UI.Services;
 using System;
@@ -32,11 +31,11 @@ await context.GoToSetupPageAndSetupOrchardCoreAsync(
         // Due to the background ask scheduling configuration in ConfigureIdleTenantManagementTestSettings(), the
         // background task should run within not much more than a minute (background tasks are run with a frequency of
         // at least a minute, due to the limitation of cron expressions). Polling for it here.
-        await Task.Delay(TimeSpan.FromMinutes(1));
-        await ReliabilityHelper.DoWithRetriesOrFailAsync(
+        await Task.Delay(TimeSpan.FromMinutes(1), context.Configuration.TestCancellationToken);
+        await context.DoWithRetriesOrFailAsync(
             async () =>
             {
-                var logEntries = await context.Application.GetLogEntriesFromAllLogsAsync();
+                var logEntries = await context.Application.GetLogEntriesFromAllLogsAsync(context.Configuration.TestCancellationToken);
                 return logEntries.Any(logEntry =>
                     logEntry.Message == $"Shutting down tenant \"{IdleTenantName}\" because of idle timeout.");
             },

diff --git a/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj b/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj b/...q.Hosting.Tenants.Maintenance.Tests.UI/Lombiq.Hosting.Tenants.Maintenance.Tests.UI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj b/Lombiq.Hosting.Tenants.Management.Tests.UI/Lombiq.Hosting.Tenants.Management.Tests.UI.csproj
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-        <PackageReference Include="Lombiq.Tests.UI" Version="12.1.0" />
+        <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj b/...aStorageManagement.Tests.UI/Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="12.0.1-alpha.1.osoe-815" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="12.1.1-alpha.3.osoe-935" />
   </ItemGroup>
 
 </Project>