test(spgroup#31): add if branch test case

barbosamaatheus · Dec 22, 2020 · a579687 · a579687
1 parent 380327d
commit a579687
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java b/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java
@@ -125,5 +125,15 @@ public void objectFieldNotConflict() {
         Assert.assertEquals(0, analysis.getConflicts().size());
     }
 
+    @Test
+    public void ifBranchConflict() {
+        String sampleClassPath = "br.unb.cic.analysis.samples.OverridingAssignmentIfBranchConflictInterProceduralSample";
+        AbstractMergeConflictDefinition definition = DefinitionFactory
+                .definition(sampleClassPath, new int[]{8}, new int[]{9});
+        InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition);
+        configureTest(analysis);
+        Assert.assertEquals(1, analysis.getConflicts().size());
+    }
+
 
 }
diff --git a/...tBranchConflictInterProceduralSample.java → ...fBranchConflictInterProceduralSample.java b/...tBranchConflictInterProceduralSample.java → ...fBranchConflictInterProceduralSample.java
@@ -1,7 +1,7 @@
 package br.unb.cic.analysis.samples;
 
 // Conflict: [left, m():8] --> [right, foo():14]
-public class OverridingAssignmentBranchConflictInterProceduralSample {
+public class OverridingAssignmentIfBranchConflictInterProceduralSample {
     private int x;
 
     public void m() {