add xml overloads (#720)

VerifyTests · Nov 13, 2022 · fbaa8e7 · fbaa8e7
1 parent d93bde0
commit fbaa8e7
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 30 deletions.
diff --git a/src/Verify.Expecto/Verifier_Xml.cs b/src/Verify.Expecto/Verifier_Xml.cs
@@ -8,19 +8,41 @@ public static partial class Verifier
         string name,
         string? target,
         VerifySettings? settings = null,
-        [CallerFilePath] string sourceFile = "")
-    {
-        var assembly = Assembly.GetCallingAssembly()!;
-        return Verify(settings, assembly, sourceFile, name, _ => _.VerifyXml(target));
-    }
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
+
+    public static Task<VerifyResult> VerifyXml(
+        string name,
+        Task<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
+
+    public static Task<VerifyResult> VerifyXml(
+        string name,
+        ValueTask<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
 
     public static Task<VerifyResult> VerifyXml(
         string name,
         Stream? target,
         VerifySettings? settings = null,
-        [CallerFilePath] string sourceFile = "")
-    {
-        var assembly = Assembly.GetCallingAssembly()!;
-        return Verify(settings, assembly, sourceFile, name, _ => _.VerifyXml(target));
-    }
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
+
+    public static Task<VerifyResult> VerifyXml(
+        string name,
+        Task<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
+
+    public static Task<VerifyResult> VerifyXml(
+        string name,
+        ValueTask<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, Assembly.GetCallingAssembly()!, sourceFile, name, _ => _.VerifyXml(target));
 }
diff --git a/src/Verify.MSTest/VerifyBase_Xml.cs b/src/Verify.MSTest/VerifyBase_Xml.cs
@@ -8,9 +8,33 @@ public partial class VerifyBase
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
 
+    public SettingsTask VerifyXml(
+        Task<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public SettingsTask VerifyXml(
+        ValueTask<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
     public SettingsTask VerifyXml(
         Stream? target,
         VerifySettings? settings = null,
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public SettingsTask VerifyXml(
+        Task<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public SettingsTask VerifyXml(
+        ValueTask<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
 }
diff --git a/src/Verify.NUnit/Verifier_Xml.cs b/src/Verify.NUnit/Verifier_Xml.cs
@@ -8,9 +8,33 @@ public static partial class Verifier
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
 
+    public static SettingsTask VerifyXml(
+        Task<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        ValueTask<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
     public static SettingsTask VerifyXml(
         Stream? target,
         VerifySettings? settings = null,
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        Task<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        ValueTask<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
 }
diff --git a/src/Verify.NUnit/VerifyBase_Xml.cs b/src/Verify.NUnit/VerifyBase_Xml.cs
@@ -4,17 +4,31 @@ public partial class VerifyBase
 {
     public SettingsTask VerifyXml(
         string? target,
-        VerifySettings? settings = null)
-    {
-        settings ??= this.settings;
-        return Verifier.VerifyXml(target, settings, sourceFile);
-    }
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        Task<string> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        ValueTask<string> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
 
     public SettingsTask VerifyXml(
         Stream? target,
-        VerifySettings? settings = null)
-    {
-        settings ??= this.settings;
-        return Verifier.VerifyXml(target, settings, sourceFile);
-    }
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        Task<Stream> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        ValueTask<Stream> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
 }
diff --git a/src/Verify.Xunit/Verifier_Xml.cs b/src/Verify.Xunit/Verifier_Xml.cs
@@ -8,9 +8,33 @@ public static partial class Verifier
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
 
+    public static SettingsTask VerifyXml(
+        Task<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        ValueTask<string> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
     public static SettingsTask VerifyXml(
         Stream? target,
         VerifySettings? settings = null,
         [CallerFilePath] string sourceFile = "") =>
         Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        Task<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
+
+    public static SettingsTask VerifyXml(
+        ValueTask<Stream> target,
+        VerifySettings? settings = null,
+        [CallerFilePath] string sourceFile = "") =>
+        Verify(settings, sourceFile, _ => _.VerifyXml(target));
 }
diff --git a/src/Verify.Xunit/VerifyBase_Xml.cs b/src/Verify.Xunit/VerifyBase_Xml.cs
@@ -4,17 +4,31 @@ public partial class VerifyBase
 {
     public SettingsTask VerifyXml(
         string? target,
-        VerifySettings? settings = null)
-    {
-        settings ??= this.settings;
-        return Verifier.VerifyXml(target, settings, sourceFile);
-    }
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        Task<string> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        ValueTask<string> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
 
     public SettingsTask VerifyXml(
         Stream? target,
-        VerifySettings? settings = null)
-    {
-        settings ??= this.settings;
-        return Verifier.VerifyXml(target, settings, sourceFile);
-    }
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        Task<Stream> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
+
+    public SettingsTask VerifyXml(
+        ValueTask<Stream> target,
+        VerifySettings? settings = null) =>
+        Verifier.VerifyXml(target, settings ?? this.settings, sourceFile);
 }
diff --git a/src/Verify/Verifier/InnerVerifier_Xml.cs b/src/Verify/Verifier/InnerVerifier_Xml.cs
@@ -1,5 +1,11 @@
 partial class InnerVerifier
 {
+    public async Task<VerifyResult> VerifyXml(Task<string> target) =>
+        await VerifyXml(await target);
+
+    public async Task<VerifyResult> VerifyXml(ValueTask<string> target) =>
+        await VerifyXml(await target);
+
     public Task<VerifyResult> VerifyXml(string? target)
     {
         if (target is null)
@@ -10,6 +16,12 @@ public Task<VerifyResult> VerifyXml(string? target)
         return VerifyXml(XDocument.Parse(target));
     }
 
+    public async Task<VerifyResult> VerifyXml(Task<Stream> target) =>
+        await VerifyXml(await target);
+
+    public async Task<VerifyResult> VerifyXml(ValueTask<Stream> target) =>
+        await VerifyXml(await target);
+
     public async Task<VerifyResult> VerifyXml(Stream? target)
     {
         if (target is null)