Fix motivating pr

pom.xml

@@ -13,9 +13,9 @@
 			<url>https://maven.pkg.github.com/spgroup/soot/</url>
 		</repository>
 		<repository>
-			<id>rbonifacio</id>
+			<id>svfa-scala</id>
 			<name>Temporary repository for the SVFA library</name>
-			<url>https://maven.pkg.github.com/rbonifacio/svfa-scala/</url>
+			<url>https://maven.pkg.github.com/spgroup/svfa-scala/</url>
 		</repository>
 	</repositories>
 
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>br.unb.cic</groupId>
 			<artifactId>svfa-scala_2.12</artifactId>
-			<version>0.5.9</version>
+			<version>0.5.10</version>
 		</dependency>
 
 		<dependency>

src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisBaseTest.java

@@ -26,7 +26,7 @@ public void configure() {
             protected Map<String, List<Integer>> sourceDefinitions() {
                 Map<String, List<Integer>> res = new HashMap<>();
                 List<Integer> lines = new ArrayList<>();
-                lines.add(11);
+                lines.add(15);
                 res.put("br.unb.cic.analysis.samples.DFPBaseSample", lines);
                 return res;
             }
@@ -35,7 +35,7 @@ protected Map<String, List<Integer>> sourceDefinitions() {
             protected Map<String, List<Integer>> sinkDefinitions() {
                 Map<String, List<Integer>> res = new HashMap<>();
                 List<Integer> lines = new ArrayList<>();
-                lines.add(13);
+                lines.add(17);
                 res.put("br.unb.cic.analysis.samples.DFPBaseSample", lines);
 
                 return res;

src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisMotivantingTest.java

@@ -0,0 +1,56 @@
+package br.unb.cic.analysis.dfp;
+
+import br.unb.cic.analysis.AbstractMergeConflictDefinition;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DFPAnalysisMotivantingTest {
+
+    private DFPAnalysisSemanticConflicts analysis;
+    AbstractMergeConflictDefinition definition;
+    @Before
+    public void configure() {
+        definition = new AbstractMergeConflictDefinition(true) {
+            @Override
+            protected Map<String, List<Integer>> sourceDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                List<Integer> lines = new ArrayList<>();
+                lines.add(9);
+                res.put("br.unb.cic.analysis.samples.DFPMotivating", lines);
+                return res;
+            }
+
+            @Override
+            protected Map<String, List<Integer>> sinkDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                List<Integer> lines = new ArrayList<>();
+                lines.add(11);
+                res.put("br.unb.cic.analysis.samples.DFPMotivating", lines);
+
+                return res;
+            }
+        };
+
+        String cp = "target/test-classes";
+        analysis = new DFPInterProcedural(cp, definition);
+    }
+
+    @Test
+    public void testDFPAnalysisExpectingOneMoreConflict() {
+        analysis.configureSoot();
+
+        analysis.buildDFP();
+        System.out.println(analysis.svg().reportConflicts().size());
+        analysis.reportDFConflicts();
+        System.out.println(analysis.svgToDotModel());
+        System.out.println(analysis.findSourceSinkPaths());
+        System.out.println(analysis.svg().findConflictingPaths());
+        Assert.assertTrue(analysis.svg().reportConflicts().size() == 1);
+    }
+}

src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java

@@ -6,15 +6,19 @@
 public class DFPBaseSample {
     private String text;
 
+    public DFPBaseSample(String text){
+        this.text = text;
+    }
+
     public void cleanText(){
-        DFPBaseSample inst = new DFPBaseSample();
+        DFPBaseSample inst = new DFPBaseSample("the  the dog");
         inst.normalizeWhiteSpace(); //Left
         inst.removeComments();
         inst.removeDuplicateWords(); //Right
     }
 
     private void normalizeWhiteSpace(){
-        text.replace("  ", "");
+        text = text.replace("  ", " ");
     }
 
     private void removeComments(){
@@ -34,13 +38,13 @@ private void removeComments(){
     }
 
     private void removeDuplicateWords(){
-        String[] words = text.split(" ");
-        StringBuilder result = new StringBuilder(words[0]);
-        for (int i = 1; i < words.length; i++) {
-            if (!words[i].equals(words[i - 1])) {
-                result.append(" ");
+        String[] words = text.split(" ", -1);
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < words.length; i++) {
+            if (i == 0 || !words[i].equals(words[i - 1]))
                 result.append(words[i]);
-            }
+            if (i < words.length - 1)
+                result.append(" ");
         }
 
         text = result.toString();

src/test/java/br/unb/cic/analysis/samples/DFPMotivating.java

@@ -0,0 +1,26 @@
+package br.unb.cic.analysis.samples;
+
+public class DFPMotivating {
+    public String text;
+    public int fixes, comments;
+
+    public void generateReport(){
+        DFPMotivating inst = new DFPMotivating();
+        inst.countDupWhitespace(); //RIGHT
+        inst.countComments();
+        inst.countDupWords(); // LEFT
+    }
+
+    private void countDupWords() {
+        fixes = fixes + 2;
+    }
+
+    private void countComments() {
+        comments =  comments +1;
+    }
+
+    private void countDupWhitespace() {
+        fixes = fixes + 1;
+    }
+
+}