cleanup

src/ApprovalTests/Reporters/DiffToolReporter.cs

@@ -3,16 +3,11 @@
 
 namespace ApprovalTests.Reporters;
 
-public class DiffToolReporter : IEnvironmentAwareReporter
+public class DiffToolReporter(DiffTool diffTool) : IEnvironmentAwareReporter
 {
-    DiffTool diffTool;
-
-    public DiffToolReporter(DiffTool diffTool) =>
-        this.diffTool = diffTool;
-
     public void Report(string approved, string received) =>
         DiffRunner.Launch(diffTool, received, approved);
 
     public bool IsWorkingInThisEnvironment(string forFile) =>
-        DiffTools.IsDetectedFor(diffTool, forFile);
+        DiffTools.IsDetectedForFile(diffTool, forFile);
 }

src/ApprovalTests/Reporters/ExecutableQueryFailure.cs

@@ -3,18 +3,11 @@
 
 namespace ApprovalTests.Reporters;
 
-public class ExecutableQueryFailure : IApprovalFailureReporter, IApprovalReporterWithCleanUp
+public class ExecutableQueryFailure(IExecutableQuery query, IApprovalFailureReporter reporter) :
+    IApprovalFailureReporter, IApprovalReporterWithCleanUp
 {
     const string FileNameSuffix = ".queryresults.txt";
     const string Header = "\t\tDo NOT approve\n\t\tThis File will be Deleted\n\t\tit is for feedback purposes only.\n\t\tAn additional file has been opened with only the query which you can approve.\n";
-    readonly IExecutableQuery query;
-    readonly IApprovalFailureReporter reporter;
-
-    public ExecutableQueryFailure(IExecutableQuery query, IApprovalFailureReporter reporter)
-    {
-        this.query = query;
-        this.reporter = reporter;
-    }
 
     public void CleanUp(string approved, string received)
     {

src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs

@@ -1,15 +1,11 @@
 using ApprovalTests.Core;
 using ApprovalTests.Reporters;
 
-public class FileLauncherWithDelayReporter : IApprovalFailureReporter
+public class FileLauncherWithDelayReporter(int seconds = 2) :
+    IApprovalFailureReporter
 {
     public static readonly FileLauncherWithDelayReporter INSTANCE = new();
 
-    readonly int seconds;
-
-    public FileLauncherWithDelayReporter(int seconds = 2) =>
-        this.seconds = seconds;
-
     public void Report(string approved, string received)
     {
         FileLauncherReporter.INSTANCE.Report(approved, received);

src/ApprovalTests/Reporters/FirstWorkingReporter.cs

@@ -2,19 +2,17 @@
 
 namespace ApprovalTests.Reporters;
 
-public class FirstWorkingReporter : IEnvironmentAwareReporter, IApprovalReporterWithCleanUp
+public class FirstWorkingReporter(IEnumerable<IEnvironmentAwareReporter> reporters) :
+    IEnvironmentAwareReporter, IApprovalReporterWithCleanUp
 {
-    public IEnumerable<IEnvironmentAwareReporter> Reporters { get; }
+    public IEnumerable<IEnvironmentAwareReporter> Reporters { get; } = reporters;
 
     public FirstWorkingReporter(params IEnvironmentAwareReporter[] reporters) :
         this((IEnumerable<IEnvironmentAwareReporter>) reporters)
     {
 
     }
 
-    public FirstWorkingReporter(IEnumerable<IEnvironmentAwareReporter> reporters) =>
-        Reporters = reporters;
-
     public void Report(string approved, string received)
     {
         var r = Reporters.FirstOrDefault(_ => _.IsWorkingInThisEnvironment(received));

src/ApprovalTests/Reporters/IgnoreLineEndingsAttribute.cs

@@ -1,9 +1,7 @@
 namespace ApprovalTests.Reporters;
 
-public class IgnoreLineEndingsAttribute : Attribute
+public class IgnoreLineEndingsAttribute(bool ignoreLineEndings) :
+    Attribute
 {
-    public IgnoreLineEndingsAttribute(bool ignoreLineEndings) =>
-        IgnoreLineEndings = ignoreLineEndings;
-
-    public bool IgnoreLineEndings { get; }
+    public bool IgnoreLineEndings { get; } = ignoreLineEndings;
 }

src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs

@@ -2,13 +2,9 @@
 
 namespace ApprovalTests.Reporters;
 
-public class InvalidReporterConfiguration : IEnvironmentAwareReporter
+public class InvalidReporterConfiguration(Type reporter) :
+    IEnvironmentAwareReporter
 {
-    readonly Type reporter;
-
-    public InvalidReporterConfiguration(Type reporter) =>
-        this.reporter = reporter;
-
     public void Report(string approved, string received) =>
         throw BuildException();
 

src/ApprovalTests/Reporters/TestFrameworks/AssertReporter.cs

@@ -5,24 +5,16 @@
 
 namespace ApprovalTests.Reporters.TestFrameworks;
 
-public class AssertReporter : IEnvironmentAwareReporter
+public class AssertReporter(string assertClass, string areEqual, string frameworkAttribute)
+    : IEnvironmentAwareReporter
 {
-    protected readonly string areEqual;
-    readonly string assertClass;
-    readonly string frameworkAttribute;
-
-    public AssertReporter(string assertClass, string areEqual, string frameworkAttribute)
-    {
-        this.assertClass = assertClass;
-        this.areEqual = areEqual;
-        this.frameworkAttribute = frameworkAttribute;
-    }
+    protected readonly string areEqual = areEqual;
 
     public virtual void Report(string approved, string received) =>
         AssertFileContents(approved, received);
 
     public virtual bool IsWorkingInThisEnvironment(string forFile) =>
-        FileExtensions.IsText(forFile) && IsFrameworkUsed();
+        FileExtensions.IsTextFile(forFile) && IsFrameworkUsed();
 
     public bool IsFrameworkUsed() =>
         AttributeStackTraceParser.GetFirstFrameForAttribute(Approvals.CurrentCaller, frameworkAttribute) !=

src/ApprovalTests/Reporters/Tools/AraxisMergeReporter.cs

@@ -2,12 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class AraxisMergeReporter : DiffToolReporter
+public class AraxisMergeReporter() :
+    DiffToolReporter(DiffTool.AraxisMerge)
 {
     public static readonly AraxisMergeReporter INSTANCE = new();
-
-    public AraxisMergeReporter()
-        : base(DiffTool.AraxisMerge)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/BeyondCompareReporter.cs

@@ -2,12 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class BeyondCompareReporter : DiffToolReporter
+public class BeyondCompareReporter() :
+    DiffToolReporter(DiffTool.BeyondCompare)
 {
     public static readonly BeyondCompareReporter INSTANCE = new();
-
-    public BeyondCompareReporter()
-        : base(DiffTool.BeyondCompare)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/KDiff3Reporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class KDiff3Reporter : DiffToolReporter
+public class KDiff3Reporter() :
+    DiffToolReporter(DiffTool.KDiff3)
 {
     public static readonly KDiff3Reporter INSTANCE = new();
-
-    public KDiff3Reporter() : base(DiffTool.KDiff3)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/KaleidoscopeDiffReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class KaleidoscopeDiffReporter : DiffToolReporter
+public class KaleidoscopeDiffReporter() :
+    DiffToolReporter(DiffTool.Kaleidoscope)
 {
     public static readonly KaleidoscopeDiffReporter INSTANCE = new();
-
-    public KaleidoscopeDiffReporter() : base(DiffTool.Kaleidoscope)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/MeldReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class MeldReporter : DiffToolReporter
+public class MeldReporter() :
+    DiffToolReporter(DiffTool.Meld)
 {
     public static readonly MeldReporter INSTANCE = new();
-
-    public MeldReporter() : base(DiffTool.Meld)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/P4MergeReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class P4MergeReporter : DiffToolReporter
+public class P4MergeReporter() :
+    DiffToolReporter(DiffTool.P4Merge)
 {
     public static readonly P4MergeReporter INSTANCE = new();
-
-    public P4MergeReporter() : base(DiffTool.P4Merge)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/RiderReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class RiderReporter : DiffToolReporter
+public class RiderReporter() :
+    DiffToolReporter(DiffTool.Rider)
 {
     public static readonly RiderReporter INSTANCE = new();
-
-    public RiderReporter() : base(DiffTool.Rider)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/TkDiffReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class TkDiffReporter : DiffToolReporter
+public class TkDiffReporter() :
+    DiffToolReporter(DiffTool.TkDiff)
 {
     public static readonly TkDiffReporter INSTANCE = new();
-
-    public TkDiffReporter() : base(DiffTool.TkDiff)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/TortoiseDiffReporter.cs

@@ -4,7 +4,8 @@ public class TortoiseDiffReporter : FirstWorkingReporter
 {
     public static readonly TortoiseDiffReporter INSTANCE = new();
 
-    public TortoiseDiffReporter() : base(TortoiseTextDiffReporter.INSTANCE, TortoiseGitTextDiffReporter.INSTANCE, TortoiseImageDiffReporter.INSTANCE)
+    public TortoiseDiffReporter() :
+        base(TortoiseTextDiffReporter.INSTANCE, TortoiseGitTextDiffReporter.INSTANCE, TortoiseImageDiffReporter.INSTANCE)
     {
     }
 }

src/ApprovalTests/Reporters/Tools/TortoiseGitTextDiffReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class TortoiseGitTextDiffReporter : DiffToolReporter
+public class TortoiseGitTextDiffReporter() :
+    DiffToolReporter(DiffTool.TortoiseGitMerge)
 {
     public static readonly TortoiseGitTextDiffReporter INSTANCE = new();
-
-    public TortoiseGitTextDiffReporter() : base(DiffTool.TortoiseGitMerge)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/TortoiseImageDiffReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class TortoiseImageDiffReporter : DiffToolReporter
+public class TortoiseImageDiffReporter() :
+    DiffToolReporter(DiffTool.TortoiseIDiff)
 {
     public static readonly TortoiseImageDiffReporter INSTANCE = new();
-
-    public TortoiseImageDiffReporter() : base(DiffTool.TortoiseIDiff)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/TortoiseTextDiffReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class TortoiseTextDiffReporter : DiffToolReporter
+public class TortoiseTextDiffReporter() :
+    DiffToolReporter(DiffTool.TortoiseMerge)
 {
     public static readonly TortoiseTextDiffReporter INSTANCE = new();
-
-    public TortoiseTextDiffReporter() : base(DiffTool.TortoiseMerge)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/VisualStudioReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class VisualStudioReporter : DiffToolReporter
+public class VisualStudioReporter() :
+    DiffToolReporter(DiffTool.VisualStudio)
 {
     public static readonly VisualStudioReporter INSTANCE = new();
-
-    public VisualStudioReporter() : base(DiffTool.VisualStudio)
-    {
-    }
 }

src/ApprovalTests/Reporters/Tools/WinMergeReporter.cs

@@ -2,11 +2,8 @@
 
 namespace ApprovalTests.Reporters;
 
-public class WinMergeReporter : DiffToolReporter
+public class WinMergeReporter() :
+    DiffToolReporter(DiffTool.WinMerge)
 {
     public static readonly WinMergeReporter INSTANCE = new();
-
-    public WinMergeReporter() : base(DiffTool.WinMerge)
-    {
-    }
 }