better dir trimming

VerifyTests · Nov 26, 2020 · 43bb009 · 43bb009
1 parent ad950d6
commit 43bb009
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 29 deletions.
diff --git a/docs/build-server.md b/docs/build-server.md
@@ -21,7 +21,7 @@ Use a [on_failure build step](https://www.appveyor.com/docs/build-configuration/
 on_failure:
   - ps: Get-ChildItem *.received.* -recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 ```
-<sup><a href='/src/appveyor.yml#L9-L12' title='Snippet source file'>snippet source</a> | <a href='#snippet-appveyorartifacts' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/appveyor.yml#L10-L13' title='Snippet source file'>snippet source</a> | <a href='#snippet-appveyorartifacts' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 See also [Pushing artifacts from scripts](https://www.appveyor.com/docs/packaging-artifacts/#pushing-artifacts-from-scripts).

diff --git a/docs/serializer-settings.md b/docs/serializer-settings.md
@@ -360,7 +360,7 @@ public Task ScopedSerializerFluent()
             _ => { _.TypeNameHandling = TypeNameHandling.All; });
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1181-L1210' title='Snippet source file'>snippet source</a> | <a href='#snippet-scopedserializer' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1187-L1216' title='Snippet source file'>snippet source</a> | <a href='#snippet-scopedserializer' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -423,7 +423,7 @@ public async Task IgnoreTypeFluent()
 
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L727-L767' title='Snippet source file'>snippet source</a> | <a href='#snippet-addignoretype' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L733-L773' title='Snippet source file'>snippet source</a> | <a href='#snippet-addignoretype' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -487,7 +487,7 @@ public async Task AddIgnoreInstanceFluent()
             _ => { _.IgnoreInstance<Instance>(x => x.Property == "Ignore"); });
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L673-L714' title='Snippet source file'>snippet source</a> | <a href='#snippet-addignoreinstance' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L679-L720' title='Snippet source file'>snippet source</a> | <a href='#snippet-addignoreinstance' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -529,7 +529,7 @@ public Task WithObsoleteProp()
     return Verifier.Verify(target);
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1145-L1164' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoleteprop' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1151-L1170' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoleteprop' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -577,7 +577,7 @@ public Task WithObsoletePropIncludedFluent()
         .ModifySerialization(_ => { _.IncludeObsoletes(); });
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1116-L1143' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincluded' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1122-L1149' title='Snippet source file'>snippet source</a> | <a href='#snippet-withobsoletepropincluded' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -640,7 +640,7 @@ public async Task IgnoreMemberByExpressionFluent()
         });
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L855-L896' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorememberbyexpression' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L861-L902' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorememberbyexpression' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -708,7 +708,7 @@ public async Task IgnoreMemberByNameFluent()
         });
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L941-L988' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorememberbyname' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L947-L994' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignorememberbyname' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -754,7 +754,7 @@ public async Task CustomExceptionPropFluent()
         .ModifySerialization(_ => _.IgnoreMembersThatThrow<CustomException>());
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1016-L1035' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrow' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L1022-L1041' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrow' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:
@@ -794,7 +794,7 @@ public async Task ExceptionMessagePropFluent()
             _ => _.IgnoreMembersThatThrow<Exception>(x => x.Message == "Ignore"));
 }
 ```
-<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L619-L643' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrowexpression' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Serialization/SerializationTests.cs#L625-L649' title='Snippet source file'>snippet source</a> | <a href='#snippet-ignoremembersthatthrowexpression' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Result:

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;xUnit1026</NoWarn>
-    <Version>8.7.1</Version>
+    <Version>8.7.2</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Json, Testing, Verify, Snapshot, Approvals</PackageTags>
     <Description>Enables verification of complex models and documents.</Description>

diff --git a/src/Verify.Tests/Serialization/SerializationTests.ShouldScrubProjectDirectory.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.ShouldScrubProjectDirectory.verified.txt
@@ -1,4 +1,6 @@
 {
-  combine: ProjectDirectory\Foo,
-  alt: ProjectDirectory/Foo
+  path: {ProjectDirectory}Foo,
+  trimmed: {ProjectDirectory}Foo,
+  altPath: {ProjectDirectory}Foo,
+  altPathTrimmed: {ProjectDirectory}Foo
 }
diff --git a/src/Verify.Tests/Serialization/SerializationTests.ShouldScrubSolutionDirectory.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.ShouldScrubSolutionDirectory.verified.txt
@@ -1,4 +1,6 @@
 {
-  combine: SolutionDirectory\Foo,
-  alt: SolutionDirectory/Foo
+  path: {SolutionDirectory}Foo,
+  trimmed: {SolutionDirectory}Foo,
+  altPath: {SolutionDirectory}Foo,
+  altPathTrimmed: {SolutionDirectory}Foo
 }
diff --git a/src/Verify.Tests/Serialization/SerializationTests.cs b/src/Verify.Tests/Serialization/SerializationTests.cs
@@ -483,12 +483,15 @@ public Task ShouldIgnoreGuidDefaults()
     public Task ShouldScrubProjectDirectory()
     {
         var projectDirectory = GetProjectDirectory();
-        var combine = Path.GetFullPath(Path.Combine(projectDirectory, "Foo"));
+        var path = Path.GetFullPath(Path.Combine(projectDirectory, "Foo"));
+        var altPath = path.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         return Verifier.Verify(
             new
             {
-                combine,
-                alt = combine.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                path,
+                trimmed = path.TrimEnd('/', '\\'),
+                altPath,
+                altPathTrimmed = altPath.TrimEnd('/', '\\'),
             });
     }
 
@@ -501,12 +504,15 @@ string GetProjectDirectory([CallerFilePath] string file = "")
     public Task ShouldScrubSolutionDirectory()
     {
         var solutionDirectory = GetSolutionDirectory();
-        var combine = Path.GetFullPath(Path.Combine(solutionDirectory,"Foo"));
+        var path = Path.GetFullPath(Path.Combine(solutionDirectory, "Foo"));
+        var altPath = path.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
         return Verifier.Verify(
             new
             {
-                combine,
-                alt = combine.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+                path,
+                trimmed = path.TrimEnd('/', '\\'),
+                altPath,
+                altPathTrimmed = altPath.TrimEnd('/', '\\'),
             });
     }
 

diff --git a/src/Verify/Verifier/InnerVerifier.cs b/src/Verify/Verifier/InnerVerifier.cs
@@ -25,26 +25,34 @@ public static void Init(Func<string, Exception> exceptionBuilder)
 
         public InnerVerifier(string testName, string sourceFile, Assembly assembly, VerifySettings settings)
         {
-            var projectDirectory = AttributeReader.GetProjectDirectory(assembly).TrimEnd('/', '\\');
+            var projectDirectory = AttributeReader.GetProjectDirectory(assembly);
             directory = VerifierSettings.DeriveDirectory(sourceFile, projectDirectory);
             this.testName = testName;
             this.assembly = assembly;
             this.settings = settings;
             if (AttributeReader.TryGetSolutionDirectory(assembly, out var solutionDirectory))
             {
-                solutionDirectory = solutionDirectory!.TrimEnd('/', '\\');
-                var altSolutionDirectory = solutionDirectory.Replace(Path.DirectorySeparatorChar,Path.AltDirectorySeparatorChar);
+                var altSolutionDirectory = solutionDirectory!.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                var altSolutionDirectoryTrimmed = altSolutionDirectory.TrimEnd('/', '\\');
+                var solutionDirectoryTrimmed = solutionDirectory.TrimEnd('/', '\\');
                 settings.AddScrubber(builder =>
                 {
-                    builder.Replace(solutionDirectory, "SolutionDirectory");
-                    builder.Replace(altSolutionDirectory, "SolutionDirectory");
+                    builder.Replace(solutionDirectory, "{SolutionDirectory}");
+                    builder.Replace(solutionDirectoryTrimmed, "{SolutionDirectory}");
+                    builder.Replace(altSolutionDirectory, "{SolutionDirectory}");
+                    builder.Replace(altSolutionDirectoryTrimmed, "{SolutionDirectory}");
                 });
             }
-            var altProjectDirectory = projectDirectory.Replace(Path.DirectorySeparatorChar,Path.AltDirectorySeparatorChar);
+
+            var altProjectDirectory = projectDirectory.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            var altProjectDirectoryTrimmed = altProjectDirectory.TrimEnd('/', '\\');
+            var projectDirectoryTrimmed = projectDirectory.TrimEnd('/', '\\');
             settings.AddScrubber(builder =>
             {
-                builder.Replace(projectDirectory, "ProjectDirectory");
-                builder.Replace(altProjectDirectory, "ProjectDirectory");
+                builder.Replace(projectDirectory, "{ProjectDirectory}");
+                builder.Replace(projectDirectoryTrimmed, "{ProjectDirectory}");
+                builder.Replace(altProjectDirectory, "{ProjectDirectory}");
+                builder.Replace(altProjectDirectoryTrimmed, "{ProjectDirectory}");
             });
 
             CounterContext.Start();