Merge pull request #356 from JakeGinnivan/ShouldMatchApprovedShouldIn…

…cludeClassName Fixed approval defaults to include class name in filename.
shouldly · Jan 30, 2016 · ff544d0 · ff544d0
2 parents 900072b + ba204c7
commit ff544d0
Show file tree

Hide file tree

Showing 57 changed files with 55 additions and 26 deletions.
diff --git a/...es/BooleanExample.codeSample.approved.txt → ...es.BooleanExample.codeSample.approved.txt b/...es/BooleanExample.codeSample.approved.txt → ...es.BooleanExample.codeSample.approved.txt
diff --git a/...BooleanExample.exceptionText.approved.txt → ...BooleanExample.exceptionText.approved.txt b/...BooleanExample.exceptionText.approved.txt → ...BooleanExample.exceptionText.approved.txt
diff --git a/...Examples/DateTime.codeSample.approved.txt → ...Examples.DateTime.codeSample.approved.txt b/...Examples/DateTime.codeSample.approved.txt → ...Examples.DateTime.codeSample.approved.txt
diff --git a/...mples/DateTime.exceptionText.approved.txt → ...mples.DateTime.exceptionText.approved.txt b/...mples/DateTime.exceptionText.approved.txt → ...mples.DateTime.exceptionText.approved.txt
diff --git a/...mples/Enumerables.codeSample.approved.txt → ...mples.Enumerables.codeSample.approved.txt b/...mples/Enumerables.codeSample.approved.txt → ...mples.Enumerables.codeSample.approved.txt
diff --git a/...es/Enumerables.exceptionText.approved.txt → ...es.Enumerables.exceptionText.approved.txt b/...es/Enumerables.exceptionText.approved.txt → ...es.Enumerables.exceptionText.approved.txt
diff --git a/...erablesOfNumerics.codeSample.approved.txt → ...erablesOfNumerics.codeSample.approved.txt b/...erablesOfNumerics.codeSample.approved.txt → ...erablesOfNumerics.codeSample.approved.txt
diff --git a/...blesOfNumerics.exceptionText.approved.txt → ...blesOfNumerics.exceptionText.approved.txt b/...blesOfNumerics.exceptionText.approved.txt → ...blesOfNumerics.exceptionText.approved.txt
diff --git a/...eExamples/Numeric.codeSample.approved.txt → ...eExamples.Numeric.codeSample.approved.txt b/...eExamples/Numeric.codeSample.approved.txt → ...eExamples.Numeric.codeSample.approved.txt
diff --git a/...amples/Numeric.exceptionText.approved.txt → ...amples.Numeric.exceptionText.approved.txt b/...amples/Numeric.exceptionText.approved.txt → ...amples.Numeric.exceptionText.approved.txt
diff --git a/...eExamples/Objects.codeSample.approved.txt → ...eExamples.Objects.codeSample.approved.txt b/...eExamples/Objects.codeSample.approved.txt → ...eExamples.Objects.codeSample.approved.txt
diff --git a/...amples/Objects.exceptionText.approved.txt → ...amples.Objects.exceptionText.approved.txt b/...amples/Objects.exceptionText.approved.txt → ...amples.Objects.exceptionText.approved.txt
diff --git a/...s/TimeSpanExample.codeSample.approved.txt → ...s.TimeSpanExample.codeSample.approved.txt b/...s/TimeSpanExample.codeSample.approved.txt → ...s.TimeSpanExample.codeSample.approved.txt
diff --git a/...imeSpanExample.exceptionText.approved.txt → ...imeSpanExample.exceptionText.approved.txt b/...imeSpanExample.exceptionText.approved.txt → ...imeSpanExample.exceptionText.approved.txt
diff --git a/...ples/ShouldBeNull.codeSample.approved.txt → ...ples.ShouldBeNull.codeSample.approved.txt b/...ples/ShouldBeNull.codeSample.approved.txt → ...ples.ShouldBeNull.codeSample.approved.txt
diff --git a/...s/ShouldBeNull.exceptionText.approved.txt → ...s.ShouldBeNull.exceptionText.approved.txt b/...s/ShouldBeNull.exceptionText.approved.txt → ...s.ShouldBeNull.exceptionText.approved.txt
diff --git a/...s/ShouldNotBeNull.codeSample.approved.txt → ...s.ShouldNotBeNull.codeSample.approved.txt b/...s/ShouldNotBeNull.codeSample.approved.txt → ...s.ShouldNotBeNull.codeSample.approved.txt
diff --git a/...houldNotBeNull.exceptionText.approved.txt → ...houldNotBeNull.exceptionText.approved.txt b/...houldNotBeNull.exceptionText.approved.txt → ...houldNotBeNull.exceptionText.approved.txt
diff --git a/...les/ShouldBeFalse.codeSample.approved.txt → ...les.ShouldBeFalse.codeSample.approved.txt b/...les/ShouldBeFalse.codeSample.approved.txt → ...les.ShouldBeFalse.codeSample.approved.txt
diff --git a/.../ShouldBeFalse.exceptionText.approved.txt → ....ShouldBeFalse.exceptionText.approved.txt b/.../ShouldBeFalse.exceptionText.approved.txt → ....ShouldBeFalse.exceptionText.approved.txt
diff --git a/...ples/ShouldBeTrue.codeSample.approved.txt → ...ples.ShouldBeTrue.codeSample.approved.txt b/...ples/ShouldBeTrue.codeSample.approved.txt → ...ples.ShouldBeTrue.codeSample.approved.txt
diff --git a/...s/ShouldBeTrue.exceptionText.approved.txt → ...s.ShouldBeTrue.exceptionText.approved.txt b/...s/ShouldBeTrue.exceptionText.approved.txt → ...s.ShouldBeTrue.exceptionText.approved.txt
diff --git a/...dFileDoesNotExist.codeSample.approved.txt → ...dFileDoesNotExist.codeSample.approved.txt b/...dFileDoesNotExist.codeSample.approved.txt → ...dFileDoesNotExist.codeSample.approved.txt
diff --git a/...eExamples/ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.exceptionText.approved.txt b/...eExamples/ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.exceptionText.approved.txt
@@ -0,0 +1,6 @@
+To approve the changes run this command:
+copy /Y "C:\PathToCode\shouldly\src\DocumentationExamples\ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.received.txt" "C:\PathToCode\shouldly\src\DocumentationExamples\ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.approved.txt"
+----------------------------
+
+Approval file C:\PathToCode\shouldly\src\DocumentationExamples\ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.approved.txt
+    does not exist
diff --git a/...edFileIsDifferent.codeSample.approved.txt → ...edFileIsDifferent.codeSample.approved.txt b/...edFileIsDifferent.codeSample.approved.txt → ...edFileIsDifferent.codeSample.approved.txt
diff --git a/...ileIsDifferent.exceptionText.approved.txt → ...ileIsDifferent.exceptionText.approved.txt b/...ileIsDifferent.exceptionText.approved.txt → ...ileIsDifferent.exceptionText.approved.txt
@@ -1,5 +1,5 @@
 To approve the changes run this command:
-copy /Y "C:\PathToCode\shouldly\src\DocumentationExamples\Document.Different.received.txt" "C:\PathToCode\shouldly\src\DocumentationExamples\ApprovedFileIsDifferent.approved.txt"
+copy /Y "C:\PathToCode\shouldly\src\DocumentationExamples\ShouldMatchApprovedExamples.ApprovedFileIsDifferent.received.txt" "C:\PathToCode\shouldly\src\DocumentationExamples\ShouldMatchApprovedExamples.ApprovedFileIsDifferent.approved.txt"
 ----------------------------
 
 simpsonsQuote

diff --git a/...vedExamples/Usage.codeSample.approved.txt → ...provedUsage.Usage.codeSample.approved.txt b/...vedExamples/Usage.codeSample.approved.txt → ...provedUsage.Usage.codeSample.approved.txt
diff --git a/...atchApprovedUsage.codeSample.approved.txt → ...atchApprovedUsage.codeSample.approved.txt b/...atchApprovedUsage.codeSample.approved.txt → ...atchApprovedUsage.codeSample.approved.txt
diff --git a/...hApprovedUsage.exceptionText.approved.txt → ...hApprovedUsage.exceptionText.approved.txt b/...hApprovedUsage.exceptionText.approved.txt → ...hApprovedUsage.exceptionText.approved.txt
diff --git a/...eExamples/ShouldMatchApprovedExamples/ApprovedFileDoesNotExist.exceptionText.approved.txt b/...eExamples/ShouldMatchApprovedExamples/ApprovedFileDoesNotExist.exceptionText.approved.txt
diff --git a/...Examples/DateTime.codeSample.approved.txt → ...Examples.DateTime.codeSample.approved.txt b/...Examples/DateTime.codeSample.approved.txt → ...Examples.DateTime.codeSample.approved.txt
diff --git a/...mples/DateTime.exceptionText.approved.txt → ...mples.DateTime.exceptionText.approved.txt b/...mples/DateTime.exceptionText.approved.txt → ...mples.DateTime.exceptionText.approved.txt
diff --git a/...amples/NumericInt.codeSample.approved.txt → ...amples.NumericInt.codeSample.approved.txt b/...amples/NumericInt.codeSample.approved.txt → ...amples.NumericInt.codeSample.approved.txt
diff --git a/...les/NumericInt.exceptionText.approved.txt → ...les.NumericInt.exceptionText.approved.txt b/...les/NumericInt.exceptionText.approved.txt → ...les.NumericInt.exceptionText.approved.txt
diff --git a/...mples/NumericLong.codeSample.approved.txt → ...mples.NumericLong.codeSample.approved.txt b/...mples/NumericLong.codeSample.approved.txt → ...mples.NumericLong.codeSample.approved.txt
diff --git a/...es/NumericLong.exceptionText.approved.txt → ...es.NumericLong.exceptionText.approved.txt b/...es/NumericLong.exceptionText.approved.txt → ...es.NumericLong.exceptionText.approved.txt
diff --git a/...eExamples/Objects.codeSample.approved.txt → ...eExamples.Objects.codeSample.approved.txt b/...eExamples/Objects.codeSample.approved.txt → ...eExamples.Objects.codeSample.approved.txt
diff --git a/...amples/Objects.exceptionText.approved.txt → ...amples.Objects.exceptionText.approved.txt b/...amples/Objects.exceptionText.approved.txt → ...amples.Objects.exceptionText.approved.txt
diff --git a/...s/TimeSpanExample.codeSample.approved.txt → ...s.TimeSpanExample.codeSample.approved.txt b/...s/TimeSpanExample.codeSample.approved.txt → ...s.TimeSpanExample.codeSample.approved.txt
diff --git a/...imeSpanExample.exceptionText.approved.txt → ...imeSpanExample.exceptionText.approved.txt b/...imeSpanExample.exceptionText.approved.txt → ...imeSpanExample.exceptionText.approved.txt
diff --git a/...nExamples/Document.Different.approved.txt → ...pleWriter.Document.Different.approved.txt b/...nExamples/Document.Different.approved.txt → ...pleWriter.Document.Different.approved.txt
diff --git a/src/DocumentationExamples/DocExampleWriter.cs b/src/DocumentationExamples/DocExampleWriter.cs
@@ -60,7 +60,6 @@ public static void Document(Action shouldMethod, ITestOutputHelper testOutputHel
             testOutputHelper.WriteLine("");
             testOutputHelper.WriteLine(exceptionText);
 
-            var approvedFileFolder = $"CodeExamples/{callerMethod.DeclaringType.Name}";
             Func<string, string> scrubber = v => Regex.Replace(v, @"\w:.+?shouldly\\src", "C:\\PathToCode\\shouldly\\src");
             try
             {
@@ -69,7 +68,7 @@ public static void Document(Action shouldMethod, ITestOutputHelper testOutputHel
                     configurationBuilder
                         .WithDescriminator("codeSample")
                         .UseCallerLocation()
-                        .SubFolder(approvedFileFolder)
+                        .SubFolder("CodeExamples")
                         .WithScrubber(scrubber);
 
                     additionConfig?.Invoke(configurationBuilder);
@@ -82,7 +81,7 @@ public static void Document(Action shouldMethod, ITestOutputHelper testOutputHel
                     configurationBuilder
                         .WithDescriminator("exceptionText")
                         .UseCallerLocation()
-                        .SubFolder(approvedFileFolder)
+                        .SubFolder("CodeExamples")
                         .WithScrubber(scrubber);
 
                     additionConfig?.Invoke(configurationBuilder);

diff --git a/src/DocumentationExamples/ShouldMatchApprovedExamples.cs b/src/DocumentationExamples/ShouldMatchApprovedExamples.cs
@@ -22,7 +22,8 @@ public void ApprovedFileDoesNotExist()
                 simpsonsQuote.ShouldMatchApproved(c => c.NoDiff());
             }, _testOutputHelper, c =>
             {
-                c.WithScrubber(s => s.Replace("Document.approved.txt", "ApprovedFileDoesNotExist.approved.txt"));
+                c.WithScrubber(s => s.Replace("DocExampleWriter.Document.approved.txt", "ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.approved.txt"));
+                c.WithScrubber(s => s.Replace("DocExampleWriter.Document.received.txt", "ShouldMatchApprovedExamples.ApprovedFileDoesNotExist.received.txt"));
                 c.WithScrubber(s => s.Replace("c => c.NoDiff()", string.Empty));
             });
         }
@@ -37,9 +38,9 @@ public void ApprovedFileIsDifferent()
             }, _testOutputHelper, c =>
             {
                 // Scrubbing the generated docs is easier than altering the infrastructure to support this scenario
-                c.WithScrubber(s => s
-                    .Replace("c => c.NoDiff().WithDescriminator(\"Different\")", string.Empty)
-                    .Replace("Document.Different.approved.txt", "ApprovedFileIsDifferent.approved.txt"));
+                c.WithScrubber(s => s.Replace("c => c.NoDiff().WithDescriminator(\"Different\")", string.Empty));
+                c.WithScrubber(s => s.Replace("DocExampleWriter.Document.Different.approved.txt", "ShouldMatchApprovedExamples.ApprovedFileIsDifferent.approved.txt"));
+                c.WithScrubber(s => s.Replace("DocExampleWriter.Document.Different.received.txt", "ShouldMatchApprovedExamples.ApprovedFileIsDifferent.received.txt"));
             });
         }
     }

diff --git a/src/Shouldly.Shared/Configuration/ShouldMatchConfiguration.cs b/src/Shouldly.Shared/Configuration/ShouldMatchConfiguration.cs
@@ -1,8 +1,12 @@
 using System;
 
 #if !PORTABLE
+
 namespace Shouldly.Configuration
 {
+    public delegate string FilenameGenerator(
+        TestMethodInfo testMethodInfo, string descriminator, string fileType, string fileExtension);
+
     public class ShouldMatchConfiguration
     {
         public ShouldMatchConfiguration()
@@ -18,24 +22,30 @@ public ShouldMatchConfiguration(ShouldMatchConfiguration initialConfig)
             TestMethodFinder = initialConfig.TestMethodFinder;
             ApprovalFileSubFolder = initialConfig.ApprovalFileSubFolder;
             Scrubber = initialConfig.Scrubber;
+            FilenameGenerator = initialConfig.FilenameGenerator;
         }
 
         public StringCompareShould StringCompareOptions { get; set; }
         public string FilenameDescriminator { get; set; }
         public bool PreventDiff { get; set; }
+
         /// <summary>
         /// File extension without the .
         /// </summary>
         public string FileExtension { get; set; }
 
         public ITestMethodFinder TestMethodFinder { get; set; }
         public string ApprovalFileSubFolder { get; set; }
+
         /// <summary>
         /// Scrubbers allow you to alter the received document before comparing it to approved.
         /// 
         /// This is useful for replacing dates or dynamic data with fixed data
         /// </summary>
         public Func<string, string> Scrubber { get; set; }
+
+        public FilenameGenerator FilenameGenerator { get; set; }
     }
 }
+
 #endif
diff --git a/src/Shouldly.Shared/Configuration/ShouldMatchConfigurationBuilder.cs b/src/Shouldly.Shared/Configuration/ShouldMatchConfigurationBuilder.cs
@@ -32,6 +32,11 @@ public ShouldMatchConfigurationBuilder WithFileExtension(string fileExtension)
             return Configure(c => c.FileExtension = fileExtension.TrimStart('.'));
         }
 
+        public ShouldMatchConfigurationBuilder WithFilenameGenerator(FilenameGenerator filenameGenerator)
+        {
+            return Configure(c => c.FilenameGenerator = filenameGenerator);
+        }
+
         /// <summary>
         /// Default is to ignore line endings
         /// </summary>

diff --git a/src/Shouldly.Shared/Configuration/TestMethodInfo.cs b/src/Shouldly.Shared/Configuration/TestMethodInfo.cs
@@ -11,7 +11,9 @@ public class TestMethodInfo
         public TestMethodInfo(StackFrame callingFrame)
         {
             SourceFileDirectory = Path.GetDirectoryName(callingFrame.GetFileName());
-            MethodName = GetRealMethod(callingFrame.GetMethod()).Name;
+            var realMethod = GetRealMethod(callingFrame.GetMethod());
+            MethodName = realMethod.Name;
+            DeclaringTypeName = realMethod.DeclaringType?.Name;
         }
 
         static MethodBase GetRealMethod(MethodBase method)
@@ -58,6 +60,7 @@ static bool ContainsAttribute(object[] attributes, string attributeName)
 
         public string SourceFileDirectory { get; private set; }
         public string MethodName { get; private set; }
+        public string DeclaringTypeName { get; private set; }
     }
 }
 #endif
diff --git a/src/Shouldly.Shared/ShouldlyConfiguration.cs b/src/Shouldly.Shared/ShouldlyConfiguration.cs
@@ -26,7 +26,9 @@ static ShouldlyConfiguration()
             {
                 StringCompareOptions = StringCompareShould.IgnoreLineEndings,
                 TestMethodFinder = new FirstNonShouldlyMethodFinder(),
-                FileExtension = "txt"
+                FileExtension = "txt",
+                FilenameGenerator = (testMethodInfo, descriminator, type, extension)
+                    => $"{testMethodInfo.DeclaringTypeName}.{testMethodInfo.MethodName}{descriminator}.{type}.{extension}"
             });
 
         /// <summary>

diff --git a/src/Shouldly.Shared/ShouldlyExtensionMethods/ShouldMatchApprovedTestExtensions.cs b/src/Shouldly.Shared/ShouldlyExtensionMethods/ShouldMatchApprovedTestExtensions.cs
@@ -55,8 +55,8 @@ public static void ShouldMatchApproved(this string actual, Func<string> customMe
                 Directory.CreateDirectory(outputFolder);
             }
 
-            var approvedFile = Path.Combine(outputFolder, $"{testMethodInfo.MethodName}{descriminator}.approved.{config.FileExtension}");
-            var receivedFile = Path.Combine(outputFolder, $"{testMethodInfo.MethodName}{descriminator}.received.{config.FileExtension}");
+            var approvedFile = Path.Combine(outputFolder, config.FilenameGenerator(testMethodInfo, descriminator, "approved", config.FileExtension));
+            var receivedFile = Path.Combine(outputFolder, config.FilenameGenerator(testMethodInfo, descriminator, "received", config.FileExtension));
             File.WriteAllText(receivedFile, actual);
 
             if (!File.Exists(approvedFile))

diff --git a/...cesUseShouldlyMessages.net35.approved.txt → ...cesUseShouldlyMessages.net35.approved.txt b/...cesUseShouldlyMessages.net35.approved.txt → ...cesUseShouldlyMessages.net35.approved.txt
diff --git a/...cesUseShouldlyMessages.net40.approved.txt → ...cesUseShouldlyMessages.net40.approved.txt b/...cesUseShouldlyMessages.net40.approved.txt → ...cesUseShouldlyMessages.net40.approved.txt
diff --git a/...cesUseShouldlyMessages.net45.approved.txt → ...cesUseShouldlyMessages.net45.approved.txt b/...cesUseShouldlyMessages.net45.approved.txt → ...cesUseShouldlyMessages.net45.approved.txt
diff --git a/...ldMatchApproved/HandlesAsync.approved.txt → ...provedScenarios.HandlesAsync.approved.txt b/...ldMatchApproved/HandlesAsync.approved.txt → ...provedScenarios.HandlesAsync.approved.txt
diff --git a/...ldMatchApproved/Simple.net35.approved.txt → ...provedScenarios.Simple.net35.approved.txt b/...ldMatchApproved/Simple.net35.approved.txt → ...provedScenarios.Simple.net35.approved.txt
diff --git a/...ldMatchApproved/Simple.net40.approved.txt → ...provedScenarios.Simple.net40.approved.txt b/...ldMatchApproved/Simple.net40.approved.txt → ...provedScenarios.Simple.net40.approved.txt
diff --git a/...ldMatchApproved/Simple.net45.approved.txt → ...provedScenarios.Simple.net45.approved.txt b/...ldMatchApproved/Simple.net45.approved.txt → ...provedScenarios.Simple.net45.approved.txt
diff --git a/src/Shouldly.Tests.Shared/ShouldMatchApproved/ShouldMatchApprovedScenarios.cs b/src/Shouldly.Tests.Shared/ShouldMatchApproved/ShouldMatchApprovedScenarios.cs
@@ -37,10 +37,10 @@ public void Simple()
         public void MissingApprovedFile()
         {
             var errorMsg = $@"To approve the changes run this command:
-copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\MissingApprovedFile.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\MissingApprovedFile.{targetDescriminator}.approved.txt""
+copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.MissingApprovedFile.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.MissingApprovedFile.{targetDescriminator}.approved.txt""
 ----------------------------
 
-Approval file C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\MissingApprovedFile.{targetDescriminator}.approved.txt
+Approval file C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.MissingApprovedFile.{targetDescriminator}.approved.txt
     does not exist";
             Verify.ShouldFail(() =>
 "Bar".ShouldMatchApproved(c => c.WithDescriminator(targetDescriminator).NoDiff()),
@@ -59,7 +59,7 @@ public void DifferencesUseShouldlyMessages()
 
 errorWithSource:
 $@"To approve the changes run this command:
-copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\DifferencesUseShouldlyMessages.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\DifferencesUseShouldlyMessages.{targetDescriminator}.approved.txt""
+copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.DifferencesUseShouldlyMessages.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.DifferencesUseShouldlyMessages.{targetDescriminator}.approved.txt""
 ----------------------------
 
 str
@@ -78,7 +78,7 @@ but was
 
 errorWithoutSource:
 $@"To approve the changes run this command:
-copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\DifferencesUseShouldlyMessages.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\DifferencesUseShouldlyMessages.{targetDescriminator}.approved.txt""
+copy /Y ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.DifferencesUseShouldlyMessages.{targetDescriminator}.received.txt"" ""C:\PathToCode\shouldly\src\Shouldly.Tests.Shared\ShouldMatchApproved\ShouldMatchApprovedScenarios.DifferencesUseShouldlyMessages.{targetDescriminator}.approved.txt""
 ----------------------------
 
 ""Foo""
@@ -125,12 +125,17 @@ public void IgnoresLineEndingsByDefault()
         {
             var stacktrace = new StackTrace(true);
             var sourceFileDir = Path.GetDirectoryName(stacktrace.GetFrame(0).GetFileName());
-            var approved = Path.Combine(sourceFileDir, $"IgnoresLineEndingsByDefault.{targetDescriminator}.approved.txt");
+            var approved = Path.Combine(sourceFileDir, $"ShouldMatchApprovedScenarios.IgnoresLineEndingsByDefault.{targetDescriminator}.approved.txt");
             File.WriteAllText(approved, "Different\nStyle\nLine\nBreaks");
 
-            "Different\r\nStyle\r\nLine\r\nBreaks".ShouldMatchApproved(c => c.WithDescriminator(targetDescriminator));
-
-            File.Delete(approved);
+            try
+            {
+                "Different\r\nStyle\r\nLine\r\nBreaks".ShouldMatchApproved(c => c.WithDescriminator(targetDescriminator));
+            }
+            finally
+            {
+                File.Delete(approved);
+            }
         }
 
         [Fact]

diff --git a/...yConvention.Tests/ShouldlyApi.approved.cs → .../ApprovePublicAPI.ShouldlyApi.approved.cs b/...yConvention.Tests/ShouldlyApi.approved.cs → .../ApprovePublicAPI.ShouldlyApi.approved.cs
@@ -582,6 +582,7 @@ public class DoNotLaunchWhenEnvVariableIsPresent : Shouldly.Configuration.IShoul
         public DoNotLaunchWhenEnvVariableIsPresent(string environmentalVariable) { }
         public bool ShouldNotLaunch() { }
     }
+    public delegate string FilenameGenerator(Shouldly.Configuration.TestMethodInfo testMethodInfo, string descriminator, string fileType, string fileExtension);
     public class FirstNonShouldlyMethodFinder : Shouldly.Configuration.ITestMethodFinder
     {
         public FirstNonShouldlyMethodFinder() { }
@@ -624,6 +625,7 @@ public class ShouldMatchConfiguration
         public string ApprovalFileSubFolder { get; set; }
         public string FileExtension { get; set; }
         public string FilenameDescriminator { get; set; }
+        public Shouldly.Configuration.FilenameGenerator FilenameGenerator { get; set; }
         public bool PreventDiff { get; set; }
         public System.Func<string, string> Scrubber { get; set; }
         public Shouldly.StringCompareShould StringCompareOptions { get; set; }
@@ -640,12 +642,14 @@ public class ShouldMatchConfigurationBuilder
         public Shouldly.Configuration.ShouldMatchConfigurationBuilder UseCallerLocation() { }
         public Shouldly.Configuration.ShouldMatchConfigurationBuilder WithDescriminator(string fileDescriminator) { }
         public Shouldly.Configuration.ShouldMatchConfigurationBuilder WithFileExtension(string fileExtension) { }
+        public Shouldly.Configuration.ShouldMatchConfigurationBuilder WithFilenameGenerator(Shouldly.Configuration.FilenameGenerator filenameGenerator) { }
         public Shouldly.Configuration.ShouldMatchConfigurationBuilder WithScrubber(System.Func<string, string> scrubber) { }
         public Shouldly.Configuration.ShouldMatchConfigurationBuilder WithStringCompareOptions(Shouldly.StringCompareShould stringCompareOptions) { }
     }
     public class TestMethodInfo
     {
         public TestMethodInfo(System.Diagnostics.StackFrame callingFrame) { }
+        public string DeclaringTypeName { get; }
         public string MethodName { get; }
         public string SourceFileDirectory { get; }
     }