feat: add diff3 runner to MergirafAndSepMergeModule experiment

Author: leonardoAnjos16

src/main/services/dataCollectors/MergirafAndSepMergeCollector/MergesCollector.groovy

@@ -6,11 +6,13 @@ import interfaces.DataCollector
 import project.MergeCommit
 import project.Project
 import services.dataCollectors.MergirafAndSepMergeCollector.mergeToolRunners.*
+import services.dataCollectors.S3MWithCSDiffCollector.mergeToolRunners.Diff3Runner
 import services.dataCollectors.S3MMergesCollector.MergeScenarioCollector
 import services.util.MergeToolRunner
 
 class MergesCollector implements DataCollector {
     private static final List<MergeToolRunner> RUNNERS = [
+        new Diff3Runner(),
         new MergirafRunner(),
         new SepMergeRunner(false),
         new SepMergeRunner(true)

src/main/services/dataCollectors/MergirafAndSepMergeCollector/mergeToolRunners/MergirafRunner.groovy

@@ -20,7 +20,13 @@ class MergirafRunner extends MergeToolRunner {
 
     protected List<String> buildParameters(Path leftFile, Path baseFile, Path rightFile) {
         String binaryFileCommand = "./${MERGIRAF_PATH.getFileName().toString()}"
-        List<String> parameters = [binaryFileCommand, 'merge']
+        List<String> parameters = [
+            binaryFileCommand, 'merge',
+            '-s', DEFAULT_BASE_MARKER_NAME,
+            '-x', DEFAULT_LEFT_MARKER_NAME,
+            '-y', DEFAULT_RIGHT_MARKER_NAME
+        ]
+
         parameters.addAll(baseFile.toString(), leftFile.toString(), rightFile.toString())
 
         Path filesQuadruplePath = baseFile.getParent()

src/main/services/dataCollectors/S3MWithCSDiffCollector/mergeToolRunners/Diff3Runner.groovy

@@ -7,16 +7,13 @@ import services.util.MergeToolRunner
 import java.nio.file.Path
 
 class Diff3Runner extends MergeToolRunner {
-
-    private static final String MERGE_FILE_NAME = "merge"
-
     Diff3Runner() {
         this.mergeToolName = 'Diff3'
     }
 
     protected ProcessBuilder buildProcess(Path leftFile, Path baseFile, Path rightFile) {
         Path filesQuadruplePath = baseFile.getParent()
-        Path outputPath = getOutputPath(filesQuadruplePath, MERGE_FILE_NAME)
+        Path outputPath = getOutputPath(filesQuadruplePath, DEFAULT_MERGE_FILE_NAME)
 
         ProcessBuilder processBuilder = new ProcessBuilder()
         processBuilder.redirectOutput(outputPath.toFile())
@@ -25,7 +22,14 @@ class Diff3Runner extends MergeToolRunner {
     }
 
     protected List<String> buildParameters(Path leftFile, Path baseFile, Path rightFile) {
-        List<String> parameters = ['diff3', '-E', '-L', 'MINE', '-L', 'BASE', '-L', 'YOURS', '-m']
+        List<String> parameters = [
+            'diff3', '-E',
+            '-L', DEFAULT_LEFT_MARKER_NAME,
+            '-L', DEFAULT_BASE_MARKER_NAME,
+            '-L', DEFAULT_RIGHT_MARKER_NAME,
+            '-m'
+        ]
+
         parameters.addAll(leftFile.toString(), baseFile.toString(), rightFile.toString())
         return parameters
     }

src/main/services/util/MergeToolRunner.groovy

@@ -7,6 +7,9 @@ import java.nio.file.Path
 
 abstract class MergeToolRunner {
     static String DEFAULT_MERGE_FILE_NAME = 'merge'
+    static String DEFAULT_BASE_MARKER_NAME = 'BASE'
+    static String DEFAULT_LEFT_MARKER_NAME = 'MINE'
+    static String DEFAULT_RIGHT_MARKER_NAME = 'YOURS'
 
     protected String mergeToolName