feat(spgroup#31): add support for marking in multiple classes

barbosamaatheus · Jul 29, 2021 · 229683f · 229683f
1 parent 49bc5fa
commit 229683f
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 16 deletions.
diff --git a/src/test/java/br/unc/cic/analysis/test/DefinitionFactory.java b/src/test/java/br/unc/cic/analysis/test/DefinitionFactory.java
@@ -2,7 +2,10 @@
 
 import br.unb.cic.analysis.AbstractMergeConflictDefinition;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class DefinitionFactory {
@@ -13,21 +16,44 @@ public static AbstractMergeConflictDefinition definition(String className, int s
 
     public static AbstractMergeConflictDefinition definition(String className, int sourceLines[], int sinkLines[], boolean recursive) {
         return new AbstractMergeConflictDefinition(recursive) {
-                @Override
-                protected Map<String, List<Integer>> sourceDefinitions() {
-                    Map<String, List<Integer>> res = new HashMap<>();
-                    List<Integer> lines = Arrays.stream(sourceLines).boxed().collect(Collectors.toList());
-                    res.put(className, lines);
-                    return res;
+            @Override
+            protected Map<String, List<Integer>> sourceDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                List<Integer> lines = Arrays.stream(sourceLines).boxed().collect(Collectors.toList());
+                res.put(className, lines);
+                return res;
+            }
+
+            @Override
+            protected Map<String, List<Integer>> sinkDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                List<Integer> lines = Arrays.stream(sinkLines).boxed().collect(Collectors.toList());
+                res.put(className, lines);
+                return res;
+            }
+        };
+    }
+    public static AbstractMergeConflictDefinition definition(List<Marking> markings) {
+        return new AbstractMergeConflictDefinition(false) {
+            @Override
+            protected Map<String, List<Integer>> sourceDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                for(Marking m: markings){
+                    List<Integer> lines = Arrays.stream(m.getSourceLines()).boxed().collect(Collectors.toList());
+                    res.put(m.getClassName(), lines);
                 }
+                return res;
+            }
 
-                @Override
-                protected Map<String, List<Integer>> sinkDefinitions() {
-                    Map<String, List<Integer>> res = new HashMap<>();
-                    List<Integer> lines = Arrays.stream(sinkLines).boxed().collect(Collectors.toList());
-                    res.put(className, lines);
-                    return res;
+            @Override
+            protected Map<String, List<Integer>> sinkDefinitions() {
+                Map<String, List<Integer>> res = new HashMap<>();
+                for(Marking m: markings) {
+                    List<Integer> lines = Arrays.stream(m.getSinkLines()).boxed().collect(Collectors.toList());
+                    res.put(m.getClassName(), lines);
                 }
-            };
-        }
-}
+                return res;
+            }
+        };
+    }
+}
diff --git a/src/test/java/br/unc/cic/analysis/test/Marking.java b/src/test/java/br/unc/cic/analysis/test/Marking.java
@@ -0,0 +1,37 @@
+package br.unc.cic.analysis.test;
+
+public class Marking {
+    String className;
+    int sourceLines[];
+    int sinkLines[];
+
+    public Marking(String className, int[] sourceLines, int[] sinkLines) {
+        this.className = className;
+        this.sourceLines = sourceLines;
+        this.sinkLines = sinkLines;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public int[] getSourceLines() {
+        return sourceLines;
+    }
+
+    public void setSourceLines(int[] sourceLines) {
+        this.sourceLines = sourceLines;
+    }
+
+    public int[] getSinkLines() {
+        return sinkLines;
+    }
+
+    public void setSinkLines(int[] sinkLines) {
+        this.sinkLines = sinkLines;
+    }
+}