fixing test cases

Author: rbonifacio

src/main/scala/br/unb/cic/soot/graph/Graph.scala

@@ -16,6 +16,10 @@ class Graph[NodeT]() {
   val map = new  mutable.HashMap[NodeT,mutable.MutableList[NodeT]]()
 
   def addEdge(source: NodeT, target: NodeT): Unit = {
+    if(source == target) {
+      return
+    }
+
     if(map.contains(source)) {
       val adjacentList  = map.get(source).get
       adjacentList += target

src/main/scala/br/unb/cic/soot/svfa/SVFA.scala

@@ -69,8 +69,8 @@ abstract class SVFA {
 
       for(n <- svg.nodes()) {
          nodeColor = n.nodeType match  {
-            case SourceNode => "[blue]"
-            case SinkNode   => "[red]"
+            case SourceNode => "[fillcolor=blue, style=filled]"
+            case SinkNode   => "[fillcolor=red, style=filled]"
             case _          => ""
          }
 

src/test/scala/br/unb/cic/soot/BlackBoard.scala

@@ -1,7 +1,7 @@
 package br.unb.cic.soot
 
 import br.unb.cic.soot.graph._
-import org.scalatest.FunSuite
+import org.scalatest.{BeforeAndAfter, FunSuite}
 import scalax.collection.Graph
 import scalax.collection.GraphEdge.DiEdge
 import soot.jimple.{AssignStmt, InvokeExpr, InvokeStmt}
@@ -33,14 +33,22 @@ class BlackBoard extends JSVFATest {
     }
 }
 
-class BlackBoardTestSuite extends FunSuite {
+class BlackBoardTestSuite extends FunSuite with BeforeAndAfter {
 
-  test("we should correctly compute the number of nodes and edges") {
-    val svfa = new BlackBoard()
+  val svfa = new BlackBoard()
+
+  before {
     svfa.buildSparseValueFlowGraph()
-    println(svfa.reportConflicts())
+  }
+
+  test("we should correctly compute the number of nodes and edges") {
     assert(svfa.svg.nodes.size == 7)
-    assert(svfa.svg.numberOfEdges() == 7)
+    assert(svfa.svg.numberOfEdges() == 6)
+  }
+
+  test("we should find exactly one conflict in this analysis") {
+    println(svfa.svgToDotModel())
+    assert(svfa.reportConflicts().size == 0)
   }
 
 }

src/test/scala/br/unb/cic/soot/CC16Test.scala

@@ -39,7 +39,7 @@ class CC16TestSuite extends FunSuite with BeforeAndAfter {
 
   test("we should correctly compute the number of nodes and edges") {
     assert(svfa.svg.nodes.size == 10)
-    assert(svfa.svg.numberOfEdges() == 10)
+    assert(svfa.svg.numberOfEdges() == 9)
   }
 
   test("we should find exactly one conflict in this analysis") {

src/test/scala/br/unb/cic/soot/IfElseTest.scala

@@ -1,7 +1,7 @@
 package br.unb.cic.soot
 
 import br.unb.cic.soot.graph._
-import org.scalatest.FunSuite
+import org.scalatest.{BeforeAndAfter, FunSuite}
 import soot.jimple.{AssignStmt, InvokeExpr, InvokeStmt}
 
 class IfElseTest extends JSVFATest {
@@ -33,13 +33,21 @@ class IfElseTest extends JSVFATest {
 }
 
 
-class IfElseTestSuite extends FunSuite {
-  test("we should correctly compute the number of nodes and edges") {
-    val svfa = new IfElseTest()
+class IfElseTestSuite extends FunSuite with BeforeAndAfter {
+  var svfa: IfElseTest = _
+
+  before {
+    svfa = new IfElseTest()
     svfa.buildSparseValueFlowGraph()
+  }
+
+  test("we should correctly compute the number of nodes and edges") {
     assert(svfa.svg.nodes.size == 12)
-    assert(svfa.svg.numberOfEdges() == 13)
+    assert(svfa.svg.numberOfEdges() == 11)
+  }
 
-    assert(!svfa.reportConflicts().isEmpty)
+  test("we should find exactly one conflict in this analysis") {
+    println(svfa.svgToDotModel())
+    assert(svfa.reportConflicts().size == 1)
   }
 }