From d27548687ede2ec99629d96204b3f36ced085799 Mon Sep 17 00:00:00 2001 From: Normen Scheiber Date: Fri, 20 Dec 2024 12:52:01 +0100 Subject: [PATCH] Added xunit3 projects. --- .../Snapshooter.Xunit3.csproj | 3 +- src/Snapshooter.sln | 29 +++++++++++++++++++ .../SnapshotTests.Asynchronous.cs | 1 + .../Helpers/SnapshotDefaultNameResolver.cs | 2 +- .../AssertField/AssertFieldTests.cs | 2 +- .../ExcludeField/ExcludeFieldTests.cs | 3 +- .../MatchOptions/HashField/HashFieldTests.cs | 2 +- .../IsTypeField/IsTypeFieldTests.cs | 2 +- .../Snapshooter.Xunit3.Tests.csproj | 4 +++ .../Snapshooter.Xunit3.Tests/SnapshotTests.cs | 10 +++---- .../SubfolderTests/SnapshotSubfolderTests.cs | 2 +- .../Xunit3AssertTests.cs | 6 ++-- .../Xunit3SnapshotFileInfoReaderTests.cs | 8 ++--- test/TestProject.props | 1 - 14 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src/Snapshooter.Xunit3/Snapshooter.Xunit3.csproj b/src/Snapshooter.Xunit3/Snapshooter.Xunit3.csproj index 366a286..e794387 100644 --- a/src/Snapshooter.Xunit3/Snapshooter.Xunit3.csproj +++ b/src/Snapshooter.Xunit3/Snapshooter.Xunit3.csproj @@ -13,7 +13,8 @@ - + + diff --git a/src/Snapshooter.sln b/src/Snapshooter.sln index 6cd71bf..974aba1 100644 --- a/src/Snapshooter.sln +++ b/src/Snapshooter.sln @@ -36,6 +36,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snapshooter.TUnit", "Snapsh EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snapshooter.TUnit.Tests", "..\test\Snapshooter.TUnit.Tests\Snapshooter.TUnit.Tests.csproj", "{8B65FDBB-A430-406E-8992-1B4474D99358}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snapshooter.Xunit3", "Snapshooter.Xunit3\Snapshooter.Xunit3.csproj", "{F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snapshooter.Xunit3.Tests", "..\test\Snapshooter.Xunit3.Tests\Snapshooter.Xunit3.Tests.csproj", "{C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -226,6 +230,30 @@ Global {8B65FDBB-A430-406E-8992-1B4474D99358}.Release|x64.Build.0 = Release|Any CPU {8B65FDBB-A430-406E-8992-1B4474D99358}.Release|x86.ActiveCfg = Release|Any CPU {8B65FDBB-A430-406E-8992-1B4474D99358}.Release|x86.Build.0 = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|x64.ActiveCfg = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|x64.Build.0 = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|x86.ActiveCfg = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Debug|x86.Build.0 = Debug|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|Any CPU.Build.0 = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|x64.ActiveCfg = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|x64.Build.0 = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|x86.ActiveCfg = Release|Any CPU + {F5A142A6-B4A6-4D4E-B4DC-E9744012ACBC}.Release|x86.Build.0 = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|x64.ActiveCfg = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|x64.Build.0 = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|x86.ActiveCfg = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Debug|x86.Build.0 = Debug|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|Any CPU.Build.0 = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|x64.ActiveCfg = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|x64.Build.0 = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|x86.ActiveCfg = Release|Any CPU + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -240,6 +268,7 @@ Global {A9A09C8D-E9D1-45CC-80F1-3C8DDF8F2600} = {F9DFF684-4ACF-45E4-B23E-E8928DE0C9FE} {3C7A875E-7B9C-45E6-93E1-E952F08758B4} = {F9DFF684-4ACF-45E4-B23E-E8928DE0C9FE} {8B65FDBB-A430-406E-8992-1B4474D99358} = {F9DFF684-4ACF-45E4-B23E-E8928DE0C9FE} + {C23B4BBB-3A91-4D43-A8C9-69B7B4F7F7A6} = {F9DFF684-4ACF-45E4-B23E-E8928DE0C9FE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {2F64A2AB-ACA2-4E2D-B7E2-B87E93C66A24} diff --git a/test/Snapshooter.Xunit3.Tests/Asynchronous/SnapshotTests.Asynchronous.cs b/test/Snapshooter.Xunit3.Tests/Asynchronous/SnapshotTests.Asynchronous.cs index 7d6db6a..9aa5c2b 100644 --- a/test/Snapshooter.Xunit3.Tests/Asynchronous/SnapshotTests.Asynchronous.cs +++ b/test/Snapshooter.Xunit3.Tests/Asynchronous/SnapshotTests.Asynchronous.cs @@ -3,6 +3,7 @@ using Snapshooter.Exceptions; using Snapshooter.Tests.Data; using Xunit; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests { diff --git a/test/Snapshooter.Xunit3.Tests/Helpers/SnapshotDefaultNameResolver.cs b/test/Snapshooter.Xunit3.Tests/Helpers/SnapshotDefaultNameResolver.cs index da1c129..b5091b9 100644 --- a/test/Snapshooter.Xunit3.Tests/Helpers/SnapshotDefaultNameResolver.cs +++ b/test/Snapshooter.Xunit3.Tests/Helpers/SnapshotDefaultNameResolver.cs @@ -21,7 +21,7 @@ public static SnapshotFullName ResolveSnapshotDefaultFullName() { var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); diff --git a/test/Snapshooter.Xunit3.Tests/MatchOptions/AssertField/AssertFieldTests.cs b/test/Snapshooter.Xunit3.Tests/MatchOptions/AssertField/AssertFieldTests.cs index 60bd0d0..da8d0f2 100644 --- a/test/Snapshooter.Xunit3.Tests/MatchOptions/AssertField/AssertFieldTests.cs +++ b/test/Snapshooter.Xunit3.Tests/MatchOptions/AssertField/AssertFieldTests.cs @@ -213,7 +213,7 @@ public void Match_AssertEqualGuidValueFailsWithinFirstSnapshotCreation_ThrowsSna { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); diff --git a/test/Snapshooter.Xunit3.Tests/MatchOptions/ExcludeField/ExcludeFieldTests.cs b/test/Snapshooter.Xunit3.Tests/MatchOptions/ExcludeField/ExcludeFieldTests.cs index f17713e..f4b29ff 100644 --- a/test/Snapshooter.Xunit3.Tests/MatchOptions/ExcludeField/ExcludeFieldTests.cs +++ b/test/Snapshooter.Xunit3.Tests/MatchOptions/ExcludeField/ExcludeFieldTests.cs @@ -1,11 +1,10 @@ using System; using System.IO; -using System.Net; using FluentAssertions; using Snapshooter.Tests.Data; using Snapshooter.Xunit3.Tests.Helpers; using Xunit; -using Xunit3.Sdk; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests.MatchOptions.ExcludeField; diff --git a/test/Snapshooter.Xunit3.Tests/MatchOptions/HashField/HashFieldTests.cs b/test/Snapshooter.Xunit3.Tests/MatchOptions/HashField/HashFieldTests.cs index 277b0c2..3a85cba 100644 --- a/test/Snapshooter.Xunit3.Tests/MatchOptions/HashField/HashFieldTests.cs +++ b/test/Snapshooter.Xunit3.Tests/MatchOptions/HashField/HashFieldTests.cs @@ -5,7 +5,7 @@ using Snapshooter.Tests.Data; using Snapshooter.Xunit3.Tests.Helpers; using Xunit; -using Xunit3.Sdk; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests.MatchOptions.HashField { diff --git a/test/Snapshooter.Xunit3.Tests/MatchOptions/IsTypeField/IsTypeFieldTests.cs b/test/Snapshooter.Xunit3.Tests/MatchOptions/IsTypeField/IsTypeFieldTests.cs index 064bd66..040983f 100644 --- a/test/Snapshooter.Xunit3.Tests/MatchOptions/IsTypeField/IsTypeFieldTests.cs +++ b/test/Snapshooter.Xunit3.Tests/MatchOptions/IsTypeField/IsTypeFieldTests.cs @@ -305,7 +305,7 @@ public void Match_IsTypeIntFailsWithinFirstSnapshotCreation_ThrowsSnapshotFieldE { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); diff --git a/test/Snapshooter.Xunit3.Tests/Snapshooter.Xunit3.Tests.csproj b/test/Snapshooter.Xunit3.Tests/Snapshooter.Xunit3.Tests.csproj index 87835c6..4a3680f 100644 --- a/test/Snapshooter.Xunit3.Tests/Snapshooter.Xunit3.Tests.csproj +++ b/test/Snapshooter.Xunit3.Tests/Snapshooter.Xunit3.Tests.csproj @@ -43,4 +43,8 @@ + + + + diff --git a/test/Snapshooter.Xunit3.Tests/SnapshotTests.cs b/test/Snapshooter.Xunit3.Tests/SnapshotTests.cs index b4db6db..68b82b8 100644 --- a/test/Snapshooter.Xunit3.Tests/SnapshotTests.cs +++ b/test/Snapshooter.Xunit3.Tests/SnapshotTests.cs @@ -8,7 +8,7 @@ using Snapshooter.Tests.Data; using Snapshooter.Xunit3.Tests.Helpers; using Xunit; -using Xunit3.Sdk; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests; @@ -57,7 +57,7 @@ public void Match_FactMatchNewSingleSnapshot_ExpectedSnapshotHasBeenCreated() { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); @@ -130,7 +130,7 @@ public void Match_TheoryMatchNewSingleSnapshot_ExpectedSnapshotHasBeenCreated(in { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); @@ -453,7 +453,7 @@ public void Match_IgnoreFieldFailsWithinFirstSnapshotCreation_ThrowsSnapshotFiel { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); @@ -484,7 +484,7 @@ public void Match_IgnoreFieldNewSingleSnapshot_ExpectedSnapshotHasBeenCreated() { // arrange var snapshotFullNameResolver = new SnapshotFullNameResolver( - new XunitSnapshotFullNameReader()); + new Xunit3SnapshotFullNameReader()); SnapshotFullName snapshotFullName = snapshotFullNameResolver.ResolveSnapshotFullName(); diff --git a/test/Snapshooter.Xunit3.Tests/SubfolderTests/SnapshotSubfolderTests.cs b/test/Snapshooter.Xunit3.Tests/SubfolderTests/SnapshotSubfolderTests.cs index 9ed973c..f953234 100644 --- a/test/Snapshooter.Xunit3.Tests/SubfolderTests/SnapshotSubfolderTests.cs +++ b/test/Snapshooter.Xunit3.Tests/SubfolderTests/SnapshotSubfolderTests.cs @@ -2,7 +2,7 @@ using System; using System.IO; using Xunit; -using Xunit3.Sdk; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests.Subfolder; diff --git a/test/Snapshooter.Xunit3.Tests/Xunit3AssertTests.cs b/test/Snapshooter.Xunit3.Tests/Xunit3AssertTests.cs index cbbf8fe..14b4f12 100644 --- a/test/Snapshooter.Xunit3.Tests/Xunit3AssertTests.cs +++ b/test/Snapshooter.Xunit3.Tests/Xunit3AssertTests.cs @@ -1,6 +1,6 @@ using Xunit; using System; -using Xunit3.Sdk; +using Xunit.Sdk; namespace Snapshooter.Xunit3.Tests; @@ -10,7 +10,7 @@ public class XunitAssertTests public void Assert_AssertEqualText_AssertSuccessful() { // arrange - var snapshotAssert = new XunitAssert(); + var snapshotAssert = new Xunit3Assert(); // act & assert snapshotAssert.Assert("{Same}", "{Same}"); @@ -20,7 +20,7 @@ public void Assert_AssertEqualText_AssertSuccessful() public void Assert_AssertUnequalText_ThrowsEqualException() { // arrange - var snapshotAssert = new XunitAssert(); + var snapshotAssert = new Xunit3Assert(); // act Action action = () => snapshotAssert.Assert("{Same}", "{Sme}"); diff --git a/test/Snapshooter.Xunit3.Tests/Xunit3SnapshotFileInfoReaderTests.cs b/test/Snapshooter.Xunit3.Tests/Xunit3SnapshotFileInfoReaderTests.cs index 9d4471a..80f5164 100644 --- a/test/Snapshooter.Xunit3.Tests/Xunit3SnapshotFileInfoReaderTests.cs +++ b/test/Snapshooter.Xunit3.Tests/Xunit3SnapshotFileInfoReaderTests.cs @@ -9,7 +9,7 @@ public class XunitSnapshotFullNameReaderTests public void ReadSnapshotFullName_ResolveSnapshotFileName_ResolvedSuccessfully() { // arrange - var snapshotFullNameResolver = new XunitSnapshotFullNameReader(); + var snapshotFullNameResolver = new Xunit3SnapshotFullNameReader(); // act SnapshotFullName snapshotFullName = snapshotFullNameResolver.ReadSnapshotFullName(); @@ -25,7 +25,7 @@ public void ReadSnapshotFullName_ResolveSnapshotFileName_ResolvedSuccessfully() public async Task ReadSnapshotFullName_ResolveFactSnapshotNameAsync_ResolvedSuccessfully() { // arrange - var snapshotFullNameResolver = new XunitSnapshotFullNameReader(); + var snapshotFullNameResolver = new Xunit3SnapshotFullNameReader(); await Task.Delay(1); // act @@ -49,7 +49,7 @@ public void ReadSnapshotFullName_ResolveTheorySnapshotName_NameResolvedWithoutIn string param1, int param2) { // arrange - var snapshotFullNameResolver = new XunitSnapshotFullNameReader(); + var snapshotFullNameResolver = new Xunit3SnapshotFullNameReader(); // act SnapshotFullName snapshotFullName = snapshotFullNameResolver.ReadSnapshotFullName(); @@ -69,7 +69,7 @@ public async Task ReadSnapshotFullName_ResolveTheorySnapshotNameAsync_NameResolv string param1, int param2) { // arrange - var snapshotFullNameResolver = new XunitSnapshotFullNameReader(); + var snapshotFullNameResolver = new Xunit3SnapshotFullNameReader(); await Task.Delay(1); // act diff --git a/test/TestProject.props b/test/TestProject.props index 9029f8f..f719ddd 100644 --- a/test/TestProject.props +++ b/test/TestProject.props @@ -4,7 +4,6 @@ $(TestProjectTargetFrameworks) Snapshooter false - 11.0