Merge pull request #185 from barbosamaatheus/master

Fix CI erros

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "test_repositories/commitfilter"]
 	path = test_repositories/commitfilter
 	url = https://github.com/rafaelmotaalves/commitfilter
+[submodule "test_repositories/SSMTeste"]
+	path = test_repositories/SSMTeste
+	url = https://github.com/barbosamaatheus/SSMTeste.git

src/main/services/dataCollectors/modifiedLinesCollector/ModifiedMethodsHelper.groovy

@@ -52,7 +52,7 @@ class ModifiedMethodsHelper {
         File ancestorFile = FileManager.getFileInCommit(project, filePath, ancestorSHA)
         File targetFile = FileManager.getFileInCommit(project, filePath, targetSHA)
 
-        List<String> diffJOutput = runDiffJ(ancestorFile, targetFile, "-brief");
+        List<String> diffJOutput = runDiffJ(ancestorFile, targetFile, "--brief");
         List<String> textualDiffOutput = runTextualDiff(ancestorFile, targetFile);
 
         targetFile.delete()
@@ -68,7 +68,7 @@ class ModifiedMethodsHelper {
         File ancestorFile = FileManager.getFileInCommit(project, filePath, ancestorSHA)
         File targetFile = FileManager.getFileInCommit(project, filePath, targetSHA)
 
-        List<String> diffJOutput = runDiffJ(ancestorFile, targetFile, "-brief");
+        List<String> diffJOutput = runDiffJ(ancestorFile, targetFile, "--brief");
         List<String> textualDiffOutput = runTextualDiff(ancestorFile, targetFile);
 
         targetFile.delete()

src/test/unit/ModifiedLinesCollectorTest.java

@@ -0,0 +1,29 @@
+package unit;
+
+import org.junit.Test;
+import project.MergeCommit;
+import project.Project;
+import services.dataCollectors.modifiedLinesCollector.ModifiedLinesCollector;
+
+import java.util.Set;
+
+import static util.Assert.assertEquals;
+
+
+public class ModifiedLinesCollectorTest {
+
+
+    private final ModifiedLinesCollector modifiedLinesCollector = new ModifiedLinesCollector("../../dependencies/");
+    Project project = new Project("project", "test_repositories/SSMTeste");
+
+    @Test
+    public void getFilesModifiedByBothParentsTest() {
+        MergeCommit mergeCommit = new MergeCommit("2199900a069e7bb82654193f001de183e2dfb99b",
+                new String[]{"f051b15e85f4d9db61c9c1f87fd2a50e8182081a",
+                        "fc789b8bc7d26a4ce9ded885cf68dd9f9567f3bb"},
+                "725d6b39edf282e1ab2922b11a66f1c091381ffe");
+        Set<String> mutuallyModifiedFiles = this.modifiedLinesCollector
+                .getFilesModifiedByBothParents(project, mergeCommit);
+        assertEquals(mutuallyModifiedFiles.size(), 1);
+    }
+}

src/test/unit/ModifiedMethodsHelperTest.java

@@ -14,15 +14,15 @@ public class ModifiedMethodsHelperTest {
 
 
     private final ModifiedMethodsHelper modifiedMethodsHelper = new ModifiedMethodsHelper("diffj.jar");
-    Project project = new Project("project", "D:/Documents/development/UFPE/SSM/Teste/");
+    Project project = new Project("project", "test_repositories/SSMTeste");
     @Test
     public void getAllModifiedMethodsTest() {
        Set<ModifiedMethod> allModifiedMethods = this.modifiedMethodsHelper
                .getAllModifiedMethods(project,
                        "src/main/java/org/example/Main.java",
                        "2199900a069e7bb82654193f001de183e2dfb99b",
                        "725d6b39edf282e1ab2922b11a66f1c091381ffe");
-       System.out.println(allModifiedMethods);
-        assertEquals(allModifiedMethods.size(),4);
+
+       assertEquals(allModifiedMethods.size(),4);
     }
 }

src/test/unit/TestSuite.groovy

@@ -10,6 +10,7 @@ import org.junit.runners.Suite.SuiteClasses
         DiffJParserTest.class,
         MethodModifiedLinesMatcherTest.class,
         ModifiedMethodsHelperTest.class,
+        ModifiedLinesCollectorTest.class,
         JarHelperTest.class
 ])
 public class TestSuite {}