From de3a770302108607092be25cedd406f880f35d31 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Mon, 31 Oct 2022 20:33:58 +1100 Subject: [PATCH 1/3] . --- docs/named-tuples.md | 4 +- docs/scrubbers.md | 12 ++-- docs/serializer-settings.md | 66 +++++++++---------- readme.md | 2 +- src/Verify.Expecto/Verifier_Stream.cs | 22 +++++++ src/Verify.MSTest/VerifyBase_Stream.cs | 14 ++++ src/Verify.NUnit/Verifier_Stream.cs | 14 ++++ src/Verify.NUnit/VerifyBase_Stream.cs | 18 +++++ ...ionTests.ByteArrayNoExtension.verified.bin | 1 + .../Serialization/SerializationTests.cs | 8 +++ src/Verify.Xunit/Verifier_Stream.cs | 14 ++++ src/Verify.Xunit/VerifyBase_Stream.cs | 18 +++++ src/Verify/Verifier/InnerVerifier_Stream.cs | 6 ++ 13 files changed, 157 insertions(+), 42 deletions(-) create mode 100644 src/Verify.Tests/Serialization/SerializationTests.ByteArrayNoExtension.verified.bin diff --git a/docs/named-tuples.md b/docs/named-tuples.md index bf4a9d1f5..741482762 100644 --- a/docs/named-tuples.md +++ b/docs/named-tuples.md @@ -19,7 +19,7 @@ Given a method that returns a named tuple: static (bool Member1, string Member2, string Member3) MethodWithNamedTuple() => (true, "A", "B"); ``` -snippet source | anchor +snippet source | anchor Can be verified: @@ -29,7 +29,7 @@ Can be verified: ```cs await VerifyTuple(() => MethodWithNamedTuple()); ``` -snippet source | anchor +snippet source | anchor Resulting in: diff --git a/docs/scrubbers.md b/docs/scrubbers.md index ecae52964..40b42e87c 100644 --- a/docs/scrubbers.md +++ b/docs/scrubbers.md @@ -59,7 +59,7 @@ For example remove lines containing `text`: ```cs verifySettings.ScrubLines(line => line.Contains("text")); ``` -snippet source | anchor +snippet source | anchor @@ -74,7 +74,7 @@ For example remove lines containing `text1` or `text2` ```cs verifySettings.ScrubLinesContaining("text1", "text2"); ``` -snippet source | anchor +snippet source | anchor Case insensitive by default (StringComparison.OrdinalIgnoreCase). @@ -86,7 +86,7 @@ Case insensitive by default (StringComparison.OrdinalIgnoreCase). ```cs verifySettings.ScrubLinesContaining(StringComparison.Ordinal, "text1", "text2"); ``` -snippet source | anchor +snippet source | anchor @@ -101,7 +101,7 @@ For example converts lines to upper case: ```cs verifySettings.ScrubLinesWithReplace(line => line.ToUpper()); ``` -snippet source | anchor +snippet source | anchor @@ -114,7 +114,7 @@ Replaces `Environment.MachineName` with `TheMachineName`. ```cs verifySettings.ScrubMachineName(); ``` -snippet source | anchor +snippet source | anchor @@ -127,7 +127,7 @@ Replaces `Environment.UserName` with `TheUserName`. ```cs verifySettings.ScrubUserName(); ``` -snippet source | anchor +snippet source | anchor diff --git a/docs/serializer-settings.md b/docs/serializer-settings.md index 087ff8f07..ea4aa8942 100644 --- a/docs/serializer-settings.md +++ b/docs/serializer-settings.md @@ -158,7 +158,7 @@ To disable this behavior globally use: ```cs VerifierSettings.DontIgnoreEmptyCollections(); ``` -snippet source | anchor +snippet source | anchor @@ -180,7 +180,7 @@ var target = new GuidTarget await Verify(target); ``` -snippet source | anchor +snippet source | anchor Results in the following: @@ -205,7 +205,7 @@ Strings containing inline Guids can also be scrubbed. To enable this behavior, u ```cs VerifierSettings.ScrubInlineGuids(); ``` -snippet source | anchor +snippet source | anchor @@ -241,7 +241,7 @@ To disable this behavior globally use: ```cs VerifierSettings.DontScrubGuids(); ``` -snippet source | anchor +snippet source | anchor @@ -269,7 +269,7 @@ var target = new DateTimeTarget await Verify(target); ``` -snippet source | anchor +snippet source | anchor Results in the following: @@ -307,7 +307,7 @@ settings.DontScrubDateTimes(); return Verify(target, settings); ``` -snippet source | anchor +snippet source | anchor Or using the fluent api use: @@ -323,7 +323,7 @@ var target = new return Verify(target) .DontScrubDateTimes(); ``` -snippet source | anchor +snippet source | anchor Or globally use: @@ -333,7 +333,7 @@ Or globally use: ```cs VerifierSettings.DontScrubDateTimes(); ``` -snippet source | anchor +snippet source | anchor @@ -476,7 +476,7 @@ public Task ScopedSerializerFluent() .AddExtraSettings(_ => _.TypeNameHandling = TypeNameHandling.All); } ``` -snippet source | anchor +snippet source | anchor Result: @@ -604,7 +604,7 @@ public Task IgnoreTypeFluent() .IgnoreMembersWithType(); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -614,7 +614,7 @@ Or globally: ```cs VerifierSettings.IgnoreMembersWithType(); ``` -snippet source | anchor +snippet source | anchor Result: @@ -751,7 +751,7 @@ public Task ScrubTypeFluent() .ScrubMembersWithType(); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -761,7 +761,7 @@ Or globally: ```cs VerifierSettings.ScrubMembersWithType(); ``` -snippet source | anchor +snippet source | anchor Result: @@ -840,7 +840,7 @@ public Task AddIgnoreInstanceFluent() .IgnoreInstance(_ => _.Property == "Ignore"); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -850,7 +850,7 @@ Or globally: ```cs VerifierSettings.IgnoreInstance(_ => _.Property == "Ignore"); ``` -snippet source | anchor +snippet source | anchor Result: @@ -912,7 +912,7 @@ public Task AddScrubInstanceFluent() .ScrubInstance(_ => _.Property == "Ignore"); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -922,7 +922,7 @@ Or globally: ```cs VerifierSettings.ScrubInstance(_ => _.Property == "Ignore"); ``` -snippet source | anchor +snippet source | anchor Result: @@ -967,7 +967,7 @@ public Task WithObsoleteProp() return Verify(target); } ``` -snippet source | anchor +snippet source | anchor Result: @@ -1015,7 +1015,7 @@ public Task WithObsoletePropIncludedFluent() .IncludeObsoletes(); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -1025,7 +1025,7 @@ Or globally: ```cs VerifierSettings.IncludeObsoletes(); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1086,7 +1086,7 @@ public Task IgnoreMemberByExpressionFluent() _ => _.PropertyThatThrows); } ``` -snippet source | anchor +snippet source | anchor Or globally @@ -1101,7 +1101,7 @@ VerifierSettings.IgnoreMembers( _ => _.GetOnlyProperty, _ => _.PropertyThatThrows); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1161,7 +1161,7 @@ public Task ScrubMemberByExpressionFluent() _ => _.PropertyThatThrows); } ``` -snippet source | anchor +snippet source | anchor Or globally @@ -1176,7 +1176,7 @@ VerifierSettings.ScrubMembers( _ => _.GetOnlyProperty, _ => _.PropertyThatThrows); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1255,7 +1255,7 @@ public Task IgnoreMemberByNameFluent() .IgnoreMember(_ => _.PropertyThatThrows); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -1275,7 +1275,7 @@ VerifierSettings.IgnoreMember("Field"); // For a specific type with expression VerifierSettings.IgnoreMember(_ => _.PropertyThatThrows); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1350,7 +1350,7 @@ public Task ScrubMemberByNameFluent() .ScrubMember(_ => _.PropertyThatThrows); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -1370,7 +1370,7 @@ VerifierSettings.ScrubMember("Field"); // For a specific type with expression VerifierSettings.ScrubMember(_ => _.PropertyThatThrows); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1421,7 +1421,7 @@ public Task CustomExceptionPropFluent() .IgnoreMembersThatThrow(); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -1431,7 +1431,7 @@ Or globally: ```cs VerifierSettings.IgnoreMembersThatThrow(); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1468,7 +1468,7 @@ public Task ExceptionMessagePropFluent() .IgnoreMembersThatThrow(_ => _.Message == "Ignore"); } ``` -snippet source | anchor +snippet source | anchor Or globally: @@ -1478,7 +1478,7 @@ Or globally: ```cs VerifierSettings.IgnoreMembersThatThrow(_ => _.Message == "Ignore"); ``` -snippet source | anchor +snippet source | anchor Result: @@ -1598,7 +1598,7 @@ public Task MemberConverterByExpression() return Verify(input); } ``` -snippet source | anchor +snippet source | anchor diff --git a/readme.md b/readme.md index edce42bfe..52aa01d08 100644 --- a/readme.md +++ b/readme.md @@ -354,7 +354,7 @@ public Task VerifyJsonJToken() return Verify(target); } ``` -snippet source | anchor +snippet source | anchor Results in: diff --git a/src/Verify.Expecto/Verifier_Stream.cs b/src/Verify.Expecto/Verifier_Stream.cs index be87e4957..ac04c772b 100644 --- a/src/Verify.Expecto/Verifier_Stream.cs +++ b/src/Verify.Expecto/Verifier_Stream.cs @@ -16,6 +16,17 @@ public static Task Verify( return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, extension, info)); } + public static Task Verify( + string name, + byte[]? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + { + var assembly = Assembly.GetCallingAssembly()!; + return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, info)); + } + public static Task Verify( string name, Task target, @@ -28,6 +39,17 @@ public static Task Verify( return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, extension, info)); } + public static Task Verify( + string name, + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + { + var assembly = Assembly.GetCallingAssembly()!; + return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, info)); + } + public static Task Verify( string name, FileStream? target, diff --git a/src/Verify.MSTest/VerifyBase_Stream.cs b/src/Verify.MSTest/VerifyBase_Stream.cs index f4f5268b6..9d5214921 100644 --- a/src/Verify.MSTest/VerifyBase_Stream.cs +++ b/src/Verify.MSTest/VerifyBase_Stream.cs @@ -10,6 +10,20 @@ public SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public SettingsTask Verify( + byte[]? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public SettingsTask Verify( Task target, string extension, diff --git a/src/Verify.NUnit/Verifier_Stream.cs b/src/Verify.NUnit/Verifier_Stream.cs index c7f160b92..3df64c798 100644 --- a/src/Verify.NUnit/Verifier_Stream.cs +++ b/src/Verify.NUnit/Verifier_Stream.cs @@ -10,6 +10,13 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public static SettingsTask Verify( + byte[]? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( Task target, string extension, @@ -18,6 +25,13 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public static SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( FileStream? target, VerifySettings? settings = null, diff --git a/src/Verify.NUnit/VerifyBase_Stream.cs b/src/Verify.NUnit/VerifyBase_Stream.cs index e1dbea6a8..4dfab5698 100644 --- a/src/Verify.NUnit/VerifyBase_Stream.cs +++ b/src/Verify.NUnit/VerifyBase_Stream.cs @@ -62,6 +62,15 @@ public SettingsTask Verify( return Verifier.Verify(target, extension, settings, info, sourceFile); } + public SettingsTask Verify( + byte[]? target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( Task target, string extension, @@ -71,4 +80,13 @@ public SettingsTask Verify( settings ??= this.settings; return Verifier.Verify(target, extension, settings, info, sourceFile); } + + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } } \ No newline at end of file diff --git a/src/Verify.Tests/Serialization/SerializationTests.ByteArrayNoExtension.verified.bin b/src/Verify.Tests/Serialization/SerializationTests.ByteArrayNoExtension.verified.bin new file mode 100644 index 000000000..6b2aaa764 --- /dev/null +++ b/src/Verify.Tests/Serialization/SerializationTests.ByteArrayNoExtension.verified.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Verify.Tests/Serialization/SerializationTests.cs b/src/Verify.Tests/Serialization/SerializationTests.cs index ee3b51b8f..4ad1bd05e 100644 --- a/src/Verify.Tests/Serialization/SerializationTests.cs +++ b/src/Verify.Tests/Serialization/SerializationTests.cs @@ -657,6 +657,14 @@ public Task ByteArray() => }, "bin"); + [Fact] + public Task ByteArrayNoExtension() => + Verify( + new byte[] + { + 1 + }); + [Fact] public Task NestedByteArray() => Verify( diff --git a/src/Verify.Xunit/Verifier_Stream.cs b/src/Verify.Xunit/Verifier_Stream.cs index 766602cb1..c5d938fab 100644 --- a/src/Verify.Xunit/Verifier_Stream.cs +++ b/src/Verify.Xunit/Verifier_Stream.cs @@ -50,6 +50,13 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public static SettingsTask Verify( + byte[]? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( Task target, string extension, @@ -57,4 +64,11 @@ public static SettingsTask Verify( object? info = null, [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + + public static SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); } \ No newline at end of file diff --git a/src/Verify.Xunit/VerifyBase_Stream.cs b/src/Verify.Xunit/VerifyBase_Stream.cs index e8555c4a9..492758def 100644 --- a/src/Verify.Xunit/VerifyBase_Stream.cs +++ b/src/Verify.Xunit/VerifyBase_Stream.cs @@ -52,6 +52,15 @@ public SettingsTask Verify( return Verifier.Verify(targets, extension, settings, info, sourceFile); } + public SettingsTask Verify( + byte[]? target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( byte[]? target, string extension, @@ -71,4 +80,13 @@ public SettingsTask Verify( settings ??= this.settings; return Verifier.Verify(target, extension, settings, info, sourceFile); } + + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } } \ No newline at end of file diff --git a/src/Verify/Verifier/InnerVerifier_Stream.cs b/src/Verify/Verifier/InnerVerifier_Stream.cs index f542be77e..11bca64cc 100644 --- a/src/Verify/Verifier/InnerVerifier_Stream.cs +++ b/src/Verify/Verifier/InnerVerifier_Stream.cs @@ -21,6 +21,9 @@ public async Task VerifyStream(Task task, object? info return await VerifyStream(stream, info); } + public Task VerifyStream(byte[]? bytes, object? info) => + VerifyStream(bytes, "bin", info); + public Task VerifyStream(byte[]? bytes, string extension, object? info) { if (bytes is null) @@ -36,6 +39,9 @@ public Task VerifyStream(byte[]? bytes, string extension, object? return VerifyStream(new MemoryStream(bytes), extension, info); } + public Task VerifyStream(Task task, object? info) => + VerifyStream(task, "bin", info); + public async Task VerifyStream(Task task, string extension, object? info) { var bytes = await task; From 3df03bdcda5d7f60bfdcefc3bf088820adb89f66 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Mon, 31 Oct 2022 20:43:11 +1100 Subject: [PATCH 2/3] . --- ...ionTests.ByteArrayNoExtension.verified.bin | 1 + src/Verify.Expecto/Verifier_Stream.cs | 23 +++++++++++++++++++ src/Verify.MSTest/VerifyBase_Stream.cs | 15 ++++++++++++ src/Verify.NUnit/Verifier_Stream.cs | 15 ++++++++++++ src/Verify.NUnit/VerifyBase_Stream.cs | 19 +++++++++++++++ src/Verify.Tests/Tests.cs | 2 +- src/Verify.Xunit/Verifier_Stream.cs | 15 ++++++++++++ src/Verify.Xunit/VerifyBase_Stream.cs | 19 +++++++++++++++ src/Verify/Verifier/InnerVerifier_Stream.cs | 7 ++++++ 9 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/StrictJsonTests/SerializationTests.ByteArrayNoExtension.verified.bin diff --git a/src/StrictJsonTests/SerializationTests.ByteArrayNoExtension.verified.bin b/src/StrictJsonTests/SerializationTests.ByteArrayNoExtension.verified.bin new file mode 100644 index 000000000..6b2aaa764 --- /dev/null +++ b/src/StrictJsonTests/SerializationTests.ByteArrayNoExtension.verified.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Verify.Expecto/Verifier_Stream.cs b/src/Verify.Expecto/Verifier_Stream.cs index ac04c772b..3bc6c56a1 100644 --- a/src/Verify.Expecto/Verifier_Stream.cs +++ b/src/Verify.Expecto/Verifier_Stream.cs @@ -72,6 +72,17 @@ public static Task Verify( return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, info)); } + public static Task Verify( + string name, + Stream? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + { + var assembly = Assembly.GetCallingAssembly()!; + return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, info)); + } + public static Task Verify( string name, Stream? target, @@ -97,6 +108,18 @@ public static Task Verify( return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, extension, info)); } + public static Task Verify( + string name, + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + where T : Stream + { + var assembly = Assembly.GetCallingAssembly()!; + return Verify(settings, assembly, sourceFile, name, _ => _.VerifyStream(target, info)); + } + public static Task Verify( string name, IEnumerable targets, diff --git a/src/Verify.MSTest/VerifyBase_Stream.cs b/src/Verify.MSTest/VerifyBase_Stream.cs index 9d5214921..f0340cbf2 100644 --- a/src/Verify.MSTest/VerifyBase_Stream.cs +++ b/src/Verify.MSTest/VerifyBase_Stream.cs @@ -54,6 +54,13 @@ public SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public SettingsTask Verify( + Stream? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public SettingsTask Verify( Task target, string extension, @@ -63,6 +70,14 @@ public SettingsTask Verify( where T : Stream => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + where T : Stream => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public SettingsTask Verify( IEnumerable targets, string extension, diff --git a/src/Verify.NUnit/Verifier_Stream.cs b/src/Verify.NUnit/Verifier_Stream.cs index 3df64c798..427fc2294 100644 --- a/src/Verify.NUnit/Verifier_Stream.cs +++ b/src/Verify.NUnit/Verifier_Stream.cs @@ -46,6 +46,13 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( + Stream? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( Stream? target, string extension, @@ -54,6 +61,14 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public static SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + where T : Stream => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( Task target, string extension, diff --git a/src/Verify.NUnit/VerifyBase_Stream.cs b/src/Verify.NUnit/VerifyBase_Stream.cs index 4dfab5698..f6882e65c 100644 --- a/src/Verify.NUnit/VerifyBase_Stream.cs +++ b/src/Verify.NUnit/VerifyBase_Stream.cs @@ -30,6 +30,15 @@ public SettingsTask Verify( return Verifier.Verify(target, extension, settings, info, sourceFile); } + public SettingsTask Verify( + Stream? target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( IEnumerable targets, string extension, @@ -52,6 +61,16 @@ public SettingsTask Verify( return Verifier.Verify(target, extension, settings, info, sourceFile); } + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null) + where T : Stream + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( byte[]? target, string extension, diff --git a/src/Verify.Tests/Tests.cs b/src/Verify.Tests/Tests.cs index c8734e85f..216e18926 100644 --- a/src/Verify.Tests/Tests.cs +++ b/src/Verify.Tests/Tests.cs @@ -358,7 +358,7 @@ public Task StreamNotAtStart() 4 }); stream.Position = 2; - return Verify(stream, "bin"); + return Verify(stream); } [Fact] diff --git a/src/Verify.Xunit/Verifier_Stream.cs b/src/Verify.Xunit/Verifier_Stream.cs index c5d938fab..8affb1159 100644 --- a/src/Verify.Xunit/Verifier_Stream.cs +++ b/src/Verify.Xunit/Verifier_Stream.cs @@ -16,6 +16,13 @@ public static SettingsTask Verify( [CallerFilePath] string sourceFile = "") => Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( + Stream? target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( Stream? target, string extension, @@ -33,6 +40,14 @@ public static SettingsTask Verify( where T : Stream => Verify(settings, sourceFile, _ => _.VerifyStream(target, extension, info)); + public static SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null, + [CallerFilePath] string sourceFile = "") + where T : Stream => + Verify(settings, sourceFile, _ => _.VerifyStream(target, info)); + public static SettingsTask Verify( IEnumerable targets, string extension, diff --git a/src/Verify.Xunit/VerifyBase_Stream.cs b/src/Verify.Xunit/VerifyBase_Stream.cs index 492758def..e37b523a2 100644 --- a/src/Verify.Xunit/VerifyBase_Stream.cs +++ b/src/Verify.Xunit/VerifyBase_Stream.cs @@ -30,6 +30,15 @@ public SettingsTask Verify( return Verifier.Verify(target, extension, settings, info, sourceFile); } + public SettingsTask Verify( + Stream? target, + VerifySettings? settings = null, + object? info = null) + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( Task target, string extension, @@ -41,6 +50,16 @@ public SettingsTask Verify( return Verifier.Verify(target, extension, settings, info, sourceFile); } + public SettingsTask Verify( + Task target, + VerifySettings? settings = null, + object? info = null) + where T : Stream + { + settings ??= this.settings; + return Verifier.Verify(target, settings, info, sourceFile); + } + public SettingsTask Verify( IEnumerable targets, string extension, diff --git a/src/Verify/Verifier/InnerVerifier_Stream.cs b/src/Verify/Verifier/InnerVerifier_Stream.cs index 11bca64cc..991c190df 100644 --- a/src/Verify/Verifier/InnerVerifier_Stream.cs +++ b/src/Verify/Verifier/InnerVerifier_Stream.cs @@ -48,6 +48,10 @@ public async Task VerifyStream(Task task, string extension return await VerifyStream(bytes, extension, info); } + public Task VerifyStream(Task task, object? info) + where T : Stream => + VerifyStream(task, "bin", info); + public async Task VerifyStream(Task task, string extension, object? info) where T : Stream { @@ -62,6 +66,9 @@ public async Task VerifyStreams(IEnumerable streams, string return await VerifyInner(targets); } + public Task VerifyStream(Stream? stream, object? info) => + VerifyStream(stream, "bin", info); + public async Task VerifyStream(Stream? stream, string extension, object? info) { if (stream is null) From 3b2cec2df13a16ee0f068497bc320ce327c40b28 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Mon, 31 Oct 2022 20:44:31 +1100 Subject: [PATCH 3/3] Update Directory.Build.props --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 898a0febb..bd7306909 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;xUnit1026;xUnit1013;msb3277;CS0436;CS1573 - 18.1.1 + 18.2.0 enable preview true