add CurrentFile

Author: SimonCropp

src/Verify.Tests/Converters/ExtensionConverterTests.cs

@@ -154,15 +154,9 @@ await Assert.ThrowsAsync<VerifyException>(
             () => Verify(File.OpenRead("sample2.png"))
                 .UseExtension("WithInfoAndBinary")
                 .DisableRequireUniquePrefix().DisableDiff());
-        AsserFileExists();
+        var file = CurrentFile.Relative($"ExtensionConverterTests.WithInfoAndModifiedBinary.{Namer.RuntimeAndVersion}.01.received.png");
+        Assert.True(File.Exists(file));
     }
 
 #endif
-
-    static void AsserFileExists([CallerFilePath] string sourceFile = "")
-    {
-        var directory = Path.GetDirectoryName(sourceFile)!;
-        var file = Path.Combine(directory, $"ExtensionConverterTests.WithInfoAndModifiedBinary.{Namer.RuntimeAndVersion}.01.received.png");
-        Assert.True(File.Exists(file));
-    }
 }

src/Verify.Tests/FileEx.cs

@@ -32,9 +32,6 @@ public static string GetProjectDirectory([CallerFilePath] string file = "") =>
     public static string GetSolutionDirectory([CallerFilePath] string file = "") =>
         FindDirectory(file, "*.sln");
 
-    public static string GetFileDirectory([CallerFilePath] string file = "") =>
-        new FileInfo(file).Directory!.FullName;
-
     static string FindDirectory(string file, string extension)
     {
         var currentDirectory = new FileInfo(file).Directory!.FullName;

src/Verify.Tests/Tests.cs

@@ -405,7 +405,7 @@ public Task Newlines() =>
     [Fact]
     public async Task TrailingNewlinesRaw()
     {
-        var file = Path.Combine(FileEx.GetFileDirectory(), "Tests.TrailingNewlinesRaw.verified.txt");
+        var file = CurrentFile.Relative("Tests.TrailingNewlinesRaw.verified.txt");
         File.Delete(file);
         var settings = new VerifySettings();
         settings.DisableRequireUniquePrefix();
@@ -434,7 +434,7 @@ public async Task TrailingNewlinesRaw()
     [Fact(Skip = "TODO")]
     public async Task TrailingNewlinesObject()
     {
-        var file = Path.Combine(FileEx.GetFileDirectory(), "Tests.TrailingNewlinesObject.verified.txt");
+        var file = CurrentFile.Relative("Tests.TrailingNewlinesObject.verified.txt");
         var settings = new VerifySettings();
         settings.DisableRequireUniquePrefix();
         var target = new
@@ -457,9 +457,8 @@ public async Task TrailingNewlinesObject()
     [Fact]
     public async Task DanglingFiles()
     {
-        var directory = FileEx.GetFileDirectory();
-        var receivedFile = Path.Combine(directory, $"Tests.DanglingFiles.{Namer.RuntimeAndVersion}.received.txt");
-        var verifiedFile = Path.Combine(directory, $"Tests.DanglingFiles.{Namer.RuntimeAndVersion}.01.verified.txt");
+        var receivedFile = CurrentFile.Relative($"Tests.DanglingFiles.{Namer.RuntimeAndVersion}.received.txt");
+        var verifiedFile = CurrentFile.Relative($"Tests.DanglingFiles.{Namer.RuntimeAndVersion}.01.verified.txt");
         File.WriteAllText(receivedFile, "");
         File.WriteAllText(verifiedFile, "");
         await Verify("value")
@@ -473,9 +472,8 @@ await Verify("value")
     [InlineData("param")]
     public async Task DanglingFilesIgnoreParametersForVerified(string param)
     {
-        var directory = FileEx.GetFileDirectory();
-        var receivedFile = Path.Combine(directory, $"Tests.DanglingFilesIgnoreParametersForVerified_param=param.{Namer.RuntimeAndVersion}.01.received.txt");
-        var verifiedFile = Path.Combine(directory, $"Tests.DanglingFilesIgnoreParametersForVerified.{Namer.RuntimeAndVersion}.01.verified.txt");
+        var receivedFile = CurrentFile.Relative($"Tests.DanglingFilesIgnoreParametersForVerified_param=param.{Namer.RuntimeAndVersion}.01.received.txt");
+        var verifiedFile = CurrentFile.Relative($"Tests.DanglingFilesIgnoreParametersForVerified.{Namer.RuntimeAndVersion}.01.verified.txt");
         File.WriteAllText(receivedFile, "");
         File.WriteAllText(verifiedFile, "");
         await Verify("value")
@@ -690,26 +688,21 @@ public Task VerifyBytesAsync()
 #endif
 
 #if NET6_0
+
     [Fact]
     public async Task VerifyFilePath()
     {
         await VerifyFile("sample.txt");
         Assert.False(FileEx.IsFileLocked("sample.txt"));
     }
+
 #endif
 
     [Fact]
     public Task VerifyFileWithAppend() =>
         VerifyFile("sample.txt")
             .AppendValue("key", "value");
 
-    #region GetFilePath
-
-    string GetFilePath([CallerFilePath] string sourceFile = "") =>
-        sourceFile;
-
-    #endregion
-
     //[Fact(Skip = "explicit")]
     //public async Task ShouldUseExtraSettings()
     //{

src/Verify/CurrentFile.cs

@@ -0,0 +1,16 @@
+namespace VerifyTests;
+
+public static class CurrentFile
+{
+    public static string Path([CallerFilePath] string file = "") =>
+        file;
+
+    public static string Directory([CallerFilePath] string file = "") =>
+        System.IO.Path.GetDirectoryName(file)!;
+
+    public static string Relative(string relative, [CallerFilePath] string file = "")
+    {
+        var directory = System.IO.Path.GetDirectoryName(file)!;
+        return System.IO.Path.Combine(directory, relative);
+    }
+}