test(spgroup#31): add concat matheods test case

src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java

@@ -125,6 +125,17 @@ public void objectFieldNotConflict() {
         Assert.assertEquals(0, analysis.getConflicts().size());
     }
 
+    @Test
+    public void concatMethodsConflict() {
+        String sampleClassPath = "br.unb.cic.analysis.samples.OverridingAssignmentConcatMethodsConflictInterProceduralSample";
+        AbstractMergeConflictDefinition definition = DefinitionFactory
+                .definition(sampleClassPath, new int[]{7}, new int[]{8});
+        InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition);
+        configureTest(analysis);
+        Assert.assertEquals(1, analysis.getConflicts().size());
+    }
+
+    //@Ignore
     @Test
     public void ifBranchConflict() {
         String sampleClassPath = "br.unb.cic.analysis.samples.OverridingAssignmentIfBranchConflictInterProceduralSample";

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

@@ -0,0 +1,23 @@
+package br.unb.cic.analysis.samples;
+
+// Conflict: [left, m():7] --> [right, foo():8]
+public class OverridingAssignmentConcatMethodsConflictInterProceduralSample {
+
+    public void m() {
+        int x = foo() + bar(); // LEFT
+        x = x + qux(); // RIGHT
+        System.out.println(x);
+    }
+
+    private int foo() {
+        return 1;
+    }
+
+    private int bar() {
+        return 2;
+    }
+
+    private int qux() {
+        return 3;
+    }
+}