diff --git a/Directory.Build.targets b/Directory.Build.targets index e0bec33..5508a3c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,34 +1,34 @@  - - + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - + + + + + - - + + \ No newline at end of file diff --git a/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj b/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj index 1a83622..082d614 100644 --- a/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj +++ b/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj @@ -1,6 +1,6 @@  - netstandard2.0;netstandard2.1;net6;net8 + net8 EasyTestFileNunit EasyTestFile.NUnit EasyTestFile;UnitTests;IntegrationTests;NUnit diff --git a/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj b/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj index 006ddf5..0a52971 100644 --- a/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj +++ b/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 82f2bdd..c5a5615 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -27,7 +27,7 @@ - + diff --git a/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs b/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs index 64001c2..ee1dca6 100644 --- a/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs +++ b/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs @@ -10,7 +10,6 @@ namespace EasyTestFile.Json.Tests; using Xunit; using Sut = EasyTestFileSettingsExtension; -[UsesVerify] [SuppressMessage("ReSharper", "InvokeAsExtensionMethod", Justification = "Improves readability SUT.")] public class EasyTestFileSettingsExtensionTest { diff --git a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index a3599da..ddedd0b 100644 --- a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Nunit.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs index dcc0de2..9020a5e 100644 --- a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs @@ -27,7 +27,7 @@ public async Task VerifyAssemblyMetadataAttributes() private static Assembly GetAssemblyOfType(Type t) { var currentAssembly = Assembly.GetAssembly(t); - Assert.NotNull(currentAssembly); + Assert.That(currentAssembly, Is.Not.Null); return currentAssembly!; } } \ No newline at end of file diff --git a/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj b/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj index ac9b6be..53f6051 100644 --- a/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj +++ b/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt index 8f5a49a..fdb6981 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt @@ -1,10 +1,9 @@ { - Assembly: null, - AutoCreateMissingTestFileDisabled: false, - Context: {}, Directory: null, - FileName: null, - MethodName: null, + AutoCreateMissingTestFileDisabled: false, TestFileNamingSuffix: null, - _extension: null + Assembly: null, + _extension: null, + MethodName: null, + FileName: null } \ No newline at end of file diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt index 079387b..528c54e 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt @@ -1,10 +1,9 @@ { - Assembly: null, - AutoCreateMissingTestFileDisabled: true, - Context: {}, Directory: null, - FileName: null, - MethodName: null, + AutoCreateMissingTestFileDisabled: true, TestFileNamingSuffix: null, - _extension: null + Assembly: null, + _extension: null, + MethodName: null, + FileName: null } \ No newline at end of file diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt index 6860c7c..5e61b32 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt @@ -1,10 +1,9 @@ { - Assembly: null, - AutoCreateMissingTestFileDisabled: false, - Context: {}, Directory: null, - FileName: null, - MethodName: null, + AutoCreateMissingTestFileDisabled: false, TestFileNamingSuffix: 1, - _extension: null + Assembly: null, + _extension: null, + MethodName: null, + FileName: null } \ No newline at end of file diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt index fb80c2a..722f01e 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt @@ -1,10 +1,9 @@ { - Assembly: null, - AutoCreateMissingTestFileDisabled: false, - Context: {}, Directory: null, - FileName: null, - MethodName: null, + AutoCreateMissingTestFileDisabled: false, TestFileNamingSuffix: test123, - _extension: null + Assembly: null, + _extension: null, + MethodName: null, + FileName: null } \ No newline at end of file diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt index b89cd31..7dac7a0 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt @@ -1,10 +1,9 @@ { - Assembly: null, - AutoCreateMissingTestFileDisabled: false, - Context: {}, Directory: null, - FileName: null, - MethodName: null, + AutoCreateMissingTestFileDisabled: false, TestFileNamingSuffix: null, - _extension: json + Assembly: null, + _extension: json, + MethodName: null, + FileName: null } \ No newline at end of file diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs index b310a4e..10d8c36 100644 --- a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs +++ b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs @@ -7,7 +7,6 @@ namespace EasyTestFile.Tests; using VerifyXunit; using Xunit; -[UsesVerify] public class EasyTestFileSettingsTest { private static readonly JsonSerializerSettings _jsonSettings = new () { ContractResolver = new AllDataContractResolver(), }; diff --git a/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs b/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs index eeebe21..b1c4ce5 100644 --- a/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs +++ b/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs @@ -6,7 +6,6 @@ namespace EasyTestFile.Tests.Internals; using VerifyXunit; using Xunit; -[UsesVerify] public class AttributeReaderTest { [Fact] diff --git a/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs b/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs index fa1a9d7..954bf36 100644 --- a/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs +++ b/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs @@ -8,7 +8,6 @@ namespace EasyTestFile.Tests.Internals; using Xunit; using Sut = EasyTestFile.Internals.FileNameResolver; -[UsesVerify] public class FileNameResolverTest { [Fact] diff --git a/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs b/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs index 5dbd78b..010f9d0 100644 --- a/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs +++ b/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs @@ -5,7 +5,6 @@ namespace EasyTestFile.Tests; using VerifyXunit; using Xunit; -[UsesVerify] public class TestAssemblyInfoTest { [Fact] diff --git a/tests/EasyTestFile.Tests/TestMethodInfoTest.cs b/tests/EasyTestFile.Tests/TestMethodInfoTest.cs index 75f52fb..51f9cdf 100644 --- a/tests/EasyTestFile.Tests/TestMethodInfoTest.cs +++ b/tests/EasyTestFile.Tests/TestMethodInfoTest.cs @@ -11,7 +11,6 @@ namespace EasyTestFile.Tests; using Xunit; using Sut = EasyTestFile.Internals.FileNameResolver; -[UsesVerify] public class TestMethodInfoTest { [Fact] diff --git a/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index fe229d0..95f58aa 100644 --- a/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Xunit.CopyAlways.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs index b9d048e..4fca78a 100644 --- a/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs @@ -7,7 +7,6 @@ namespace EasyTestFileXunit.Embed.Tests; using VerifyXunit; using Xunit; -[UsesVerify] [UsesEasyTestFile] public class VerifyEmbedded { diff --git a/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index 6409009..cb1f0af 100644 --- a/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Xunit.CopyPreserveNewest.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs index 8dac28c..b1d253c 100644 --- a/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs @@ -7,7 +7,6 @@ namespace EasyTestFileXunit.CopyPreserveNewest.Tests; using VerifyXunit; using Xunit; -[UsesVerify] [UsesEasyTestFile] public class VerifyEmbedded { diff --git a/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index a3599da..9eb8929 100644 --- a/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Xunit.Embed.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs index b9d048e..4fca78a 100644 --- a/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs @@ -7,7 +7,6 @@ namespace EasyTestFileXunit.Embed.Tests; using VerifyXunit; using Xunit; -[UsesVerify] [UsesEasyTestFile] public class VerifyEmbedded { diff --git a/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index b3bf5a9..b90448f 100644 --- a/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Xunit.ModeNone.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs index 8f2326e..22f8b68 100644 --- a/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs @@ -7,7 +7,6 @@ namespace EasyTestFileXunit.ModeNone.Tests; using VerifyXunit; using Xunit; -[UsesVerify] [UsesEasyTestFile] public class VerifyEmbedded { diff --git a/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt index a3599da..8c13922 100644 --- a/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt +++ b/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt @@ -19,9 +19,24 @@ Value: {ProjectDirectory}, TypeId: AssemblyMetadataAttribute }, + { + Key: Verify.ProjectName, + Value: EasyTestFile.Xunit.Tests, + TypeId: AssemblyMetadataAttribute + }, { Key: Verify.SolutionDirectory, Value: {SolutionDirectory}, TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.SolutionName, + Value: EasyTestFile, + TypeId: AssemblyMetadataAttribute + }, + { + Key: Verify.TargetFrameworks, + Value: , + TypeId: AssemblyMetadataAttribute } ] \ No newline at end of file diff --git a/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.cs index d1e410e..ea3f622 100644 --- a/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.cs +++ b/tests/EasyTestFile.Xunit.Tests/VerifyEmbedded.cs @@ -8,7 +8,6 @@ namespace EasyTestFileXunit.Tests; using VerifyXunit; using Xunit; -[UsesVerify] [UsesEasyTestFile] public class VerifyEmbedded {