cleanup

VerifyTests · May 27, 2023 · 7e4a189 · 7e4a189
1 parent 45a060f
commit 7e4a189
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/src/Verify/Verifier/InnerVerifier.cs b/src/Verify/Verifier/InnerVerifier.cs
@@ -48,15 +48,8 @@ public static void ThrowIfVerifyHasBeenRun()
         var namer = settings.Namer;
 
         directory = ResolveDirectory(sourceFile, settings, pathInfo);
-        counter = Counter.Start(
-#if NET6_0_OR_GREATER
-            settings.namedDates,
-            settings.namedTimes,
-#endif
-            settings.namedDateTimes,
-            settings.namedGuids,
-            settings.namedDateTimeOffsets
-        );
+
+        counter = StartCounter(settings);
 
         IoHelpers.CreateDirectory(directory);
 
@@ -82,31 +75,39 @@ public InnerVerifier(string sourceFile, VerifySettings settings)
         this.settings = settings;
         directory = ResolveDirectory(sourceFile, settings, new());
 
-        counter = Counter.Start(
-#if NET6_0_OR_GREATER
-            settings.namedDates,
-            settings.namedTimes,
-#endif
-            settings.namedDateTimes,
-            settings.namedGuids,
-            settings.namedDateTimeOffsets
-        );
+        counter = StartCounter(settings);
 
         IoHelpers.CreateDirectory(directory);
 
         ValidatePrefix(settings, directory);
 
-        verifiedFiles = new List<string> { Path.Combine(directory, $"{Path.GetFileNameWithoutExtension(sourceFile)}.verified.{FileExtensions.GetExtension(sourceFile)}") };
+        var withoutExtension = Path.GetFileNameWithoutExtension(sourceFile);
+        verifiedFiles = new List<string>
+        {
+            Path.Combine(directory, $"{withoutExtension}.verified.{FileExtensions.GetExtension(sourceFile)}")
+        };
 
-        getFileNames = target => new(
-            target.Extension,
-            sourceFile,
-            Path.Combine(directory, $"{Path.GetFileNameWithoutExtension(sourceFile)}.verified.{target.Extension}")
-        );
+        getFileNames = target =>
+            new(
+                target.Extension,
+                sourceFile,
+                Path.Combine(directory, $"{withoutExtension}.verified.{target.Extension}")
+            );
 
         getIndexedFileNames = (_, _) => throw new NotImplementedException();
     }
 
+    static Counter StartCounter(VerifySettings settings) =>
+        Counter.Start(
+#if NET6_0_OR_GREATER
+            settings.namedDates,
+            settings.namedTimes,
+#endif
+            settings.namedDateTimes,
+            settings.namedGuids,
+            settings.namedDateTimeOffsets
+        );
+
     void InitForDirectoryConvention(Namer namer, string typeAndMethod, string parameters)
     {
         var verifiedPrefix = PrefixForDirectoryConvention(namer, typeAndMethod, parameters);