Skip to content

Commit

Permalink
Migrating tests to xUnit v3
Browse files Browse the repository at this point in the history
  • Loading branch information
Piedone committed Dec 21, 2024
1 parent ab8c516 commit 1d6d87c
Show file tree
Hide file tree
Showing 42 changed files with 18 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
github.event.label.name == 'run-windows-build' ||
(github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build')))
name: Build and Test Windows - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-935
with:
parent-job-name: root-solution-larger-runners
machine-types: '["windows-2022-8core"]'
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
github.event.label.name == 'run-windows-build' ||
(github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build'))
name: Build and Test Windows - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-935
with:
parent-job-name: nuget-solution
machine-types: '["windows-2022"]'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-test-larger-runners:
if: github.ref_name != github.event.repository.default_branch
name: Build and Test - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-935
with:
parent-job-name: root-solution-larger-runners
machine-types: '["warp-ubuntu-2404-x64-4x"]'
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:

build-and-test-nuget-test:
name: Build and Test - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-935
with:
parent-job-name: nuget-solution
build-directory: NuGetTest
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.DataTables
6 changes: 4 additions & 2 deletions test/Lombiq.OSOCE.Tests.UI/Lombiq.OSOCE.Tests.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
<None Remove="NoUniqueLandmark.htmlvalidate.json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit.v3" Version="1.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Linq;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.OrchardCoreApiClient.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.LibraryTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.Azure.ApplicationInsights.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Lombiq.Tests.UI.Helpers;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Text.Json;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Lombiq.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

public class BehaviorEmailQuotaTests : UITestBase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.Tenants.EnvironmentRobots.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Lombiq.Tests.UI.Samples.Helpers;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.HelpfulExtensions.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Lombiq.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.JsonEditor.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.LoginAsAnybody.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Lombiq.Tests.UI.Samples.Helpers;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.Tenants.MediaStorageManagement.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Linq;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.Tenants.Management.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Linq;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Linq;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Walkthroughs.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Hosting.BuildVersionDisplay.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.DataTables.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ModuleTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Lombiq.Tests.UI.Extensions;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ThemeTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ThemeTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Lombiq.Tests.UI.Services;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.ThemeTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Tests.UI.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.UITestingToolboxTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Tests.UI.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.UITestingToolboxTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Tests.UI.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.UITestingToolboxTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Lombiq.Tests.UI.Tests.UI.TestCases;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.UITestingToolboxTests;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using SixLabors.ImageSharp;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;

namespace Lombiq.OSOCE.Tests.UI.Tests.VisualVerificationTests;

Expand Down
2 changes: 1 addition & 1 deletion test/Lombiq.OSOCE.Tests.UI/UITestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Lombiq.Tests.UI.Services;
using System;
using System.Threading.Tasks;
using Xunit.Abstractions;
using Xunit;

namespace Lombiq.OSOCE.Tests.UI;

Expand Down
2 changes: 1 addition & 1 deletion test/Lombiq.Tests
2 changes: 1 addition & 1 deletion test/Lombiq.UITestingToolbox
Submodule Lombiq.UITestingToolbox updated 44 files
+1 −1 Lombiq.Tests.UI.Samples/FrontendUITestBase.cs
+4 −2 Lombiq.Tests.UI.Samples/Lombiq.Tests.UI.Samples.csproj
+0 −1 Lombiq.Tests.UI.Samples/Tests/AccessibilityTest.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/AzureBlobStorageTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/BasicOrchardFeaturesTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/BasicVisualVerificationTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/DatabaseSnapshotTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/EmailTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/ErrorHandlingTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/FrontendTests.cs
+9 −8 Lombiq.Tests.UI.Samples/Tests/InteractiveModeTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/JavaScriptTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/MonkeyTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/MultiBrowserTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/RemoteTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/SecurityScanningTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/ShiftTimeTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/SqlServerTests.cs
+0 −1 Lombiq.Tests.UI.Samples/Tests/TenantTests.cs
+1 −1 Lombiq.Tests.UI.Samples/UITestBase.cs
+11 −2 Lombiq.Tests.UI/Attributes/AllBrowsersAttribute.cs
+7 −4 Lombiq.Tests.UI/Attributes/BrowserAttributeBase.cs
+1 −0 Lombiq.Tests.UI/CloudflareRemoteUITestBase.cs
+1 −1 Lombiq.Tests.UI/Docs/CreatingTests.md
+1 −1 Lombiq.Tests.UI/Docs/SecurityScanning.md
+1 −1 Lombiq.Tests.UI/Extensions/FrontendUITestContextExtensions.cs
+3 −2 Lombiq.Tests.UI/Extensions/TestOutputHelperExtensions.cs
+1 −0 Lombiq.Tests.UI/Helpers/CloudflareHelper.cs
+1 −1 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
+4 −29 Lombiq.Tests.UI/Models/UITestManifest.cs
+2 −2 Lombiq.Tests.UI/OrchardCoreUITestBase.cs
+2 −2 Lombiq.Tests.UI/RemoteUITestBase.cs
+1 −0 Lombiq.Tests.UI/SecurityScanning/ZapManager.cs
+1 −0 Lombiq.Tests.UI/Services/AtataFactory.cs
+1 −0 Lombiq.Tests.UI/Services/FrontendServer.cs
+19 −5 Lombiq.Tests.UI/Services/GitHub/GitHubActionsGroupingTestOutputHelper.cs
+5 −4 Lombiq.Tests.UI/Services/GitHub/GitHubAnnotationWriter.cs
+1 −1 Lombiq.Tests.UI/Services/ITestOutputHelperDecorator.cs
+1 −0 Lombiq.Tests.UI/Services/OrchardCoreInstance.cs
+1 −28 Lombiq.Tests.UI/Services/OrchardCoreUITestExecutorConfiguration.cs
+1 −1 Lombiq.Tests.UI/Services/TestOutputLogConsumer.cs
+2 −1 Lombiq.Tests.UI/Services/UITestExecutionSession.cs
+0 −22 Lombiq.Tests.UI/Services/UITestExecutor.cs
+1 −1 Lombiq.Tests.UI/UITestBase.cs

0 comments on commit 1d6d87c

Please sign in to comment.