Merge pull request #409 from TaffarelJr/master

Register new diff tools: Devart Code Compare and Perforce P4Merge
shouldly · Oct 15, 2016 · d9f4e7d · d9f4e7d
2 parents 12f0f7d + f3e2969
commit d9f4e7d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/Shouldly.Tests/ConventionTests/ApprovePublicAPI.ShouldlyApi.approved.cs b/src/Shouldly.Tests/ConventionTests/ApprovePublicAPI.ShouldlyApi.approved.cs
@@ -658,7 +658,11 @@ public class KnownDiffTools
         [JetBrains.Annotations.UsedImplicitlyAttribute()]
         public readonly Shouldly.Configuration.DiffTool BeyondCompare4;
         [JetBrains.Annotations.UsedImplicitlyAttribute()]
+        public readonly Shouldly.Configuration.DiffTool CodeCompare;
+        [JetBrains.Annotations.UsedImplicitlyAttribute()]
         public readonly Shouldly.Configuration.DiffTool KDiff3;
+        [JetBrains.Annotations.UsedImplicitlyAttribute()]
+        public readonly Shouldly.Configuration.DiffTool P4Merge;
         public KnownDiffTools() { }
         public static Shouldly.Configuration.KnownDiffTools Instance { get; }
     }

diff --git a/src/Shouldly/Configuration/KnownDiffTools.cs b/src/Shouldly/Configuration/KnownDiffTools.cs
@@ -1,4 +1,5 @@
 #if ShouldMatchApproved
+using System.IO;
 using JetBrains.Annotations;
 
 namespace Shouldly.Configuration
@@ -11,6 +12,10 @@ public class KnownDiffTools
         public readonly DiffTool BeyondCompare3 = new DiffTool("Beyond Compare 3", @"Beyond Compare 3\BCompare.exe", BeyondCompareArgs);
         [UsedImplicitly]
         public readonly DiffTool BeyondCompare4 = new DiffTool("Beyond Compare 4", @"Beyond Compare 4\BCompare.exe", BeyondCompareArgs);
+        [UsedImplicitly]
+        public readonly DiffTool CodeCompare = new DiffTool("Code Compare", @"Devart\Code Compare\CodeMerge.exe", CodeCompareArgs);
+        [UsedImplicitly]
+        public readonly DiffTool P4Merge = new DiffTool("P4Merge", @"Perforce\p4merge.exe", P4MergeArgs);
 
         public static KnownDiffTools Instance { get; } = new KnownDiffTools();
 
@@ -27,6 +32,19 @@ static string KDiffArgs(string received, string approved, bool approvedExists)
                 ? $"\"{received}\" \"{approved}\" -o \"{approved}\""
                 : $"\"{received}\" -o \"{approved}\"";
         }
+
+        static string CodeCompareArgs(string received, string approved, bool approvedExists)
+        {
+            return $"/BF=\"{approved}\" /TF=\"{approved}\" /MF=\"{received}\" /RF=\"{approved}\"";
+        }
+
+        static string P4MergeArgs(string received, string approved, bool approvedExists)
+        {
+            if (!approvedExists)
+                File.AppendAllText(approved, string.Empty);
+
+            return $"\"{approved}\" \"{approved}\" \"{received}\" \"{approved}\"";
+        }
     }
 }
 #endif
diff --git a/src/TestDiffTools/Program.cs b/src/TestDiffTools/Program.cs
@@ -65,8 +65,11 @@ public static void Main(string[] args)
                 ShouldlyConfiguration.DiffTools.RegisterDiffTool(selectedDiffTool.DiffTool);
                 var stacktrace = new StackTrace(true);
 
-                var approved = Path.Combine(Path.GetDirectoryName(stacktrace.GetFrame(0).GetFileName()),
-                    "Main.approved.txt");
+                var currentFrame = stacktrace.GetFrame(0);
+                var approved = Path.Combine(
+                    Path.GetDirectoryName(currentFrame.GetFileName()),
+                    $"{Path.GetFileNameWithoutExtension(currentFrame.GetFileName())}.{currentFrame.GetMethod().Name}.approved.txt");
+
                 switch (selectedOption)
                 {
                     case 1: