Added overridden classes in the visualization

Author: CaelmBleidd

utbot-framework/src/main/kotlin/org/utbot/engine/InterProceduralUnitGraph.kt

@@ -40,6 +40,8 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
 
  val stmts: MutableSet<Stmt> = graph.stmts.toMutableSet()
  val registeredEdges: MutableSet<Edge> = graph.edges.toMutableSet()
+ // this field is required for visualization
+ val allEdges: MutableSet<Edge> = graph.edges.toMutableSet()
  /**
  * Used in [org.utbot.engine.selectors.nurs.InheritorsSelector] for a fast search of Virtual invoke successors.
  */
@@ -54,6 +56,7 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
  private val edgeToGraph: MutableMap<Edge, ExceptionalUnitGraph> = graph.edges.associateWithTo(mutableMapOf()) { graph }
 
  private val registeredEdgesCount: MutableMap<Stmt, Int> = graph.outgoingEdgesCount
+ private val allEdgesCount: MutableMap<Stmt, Int> = graph.outgoingEdgesCount
  private val outgoingEdgesCount: MutableMap<Stmt, Int> = graph.outgoingEdgesCount
 
  fun method(stmt: Stmt): SootMethod = stmtToGraph[stmt]?.body?.method ?: error("$stmt not in graph.")
@@ -125,6 +128,12 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
  outgoingEdgesCount += graph.outgoingEdgesCount
  stmts += joinedStmts
 
+ allEdges += graph.edges
+ allEdgesCount += graph.outgoingEdgesCount
+ allEdgesCount.computeIfPresent(stmt) { _, value ->
+ value + 1
+ }
+
  if (registerEdges) {
  registeredMethods += method
  registeredEdgesCount += graph.outgoingEdgesCount
@@ -144,6 +153,7 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
  }
 
  registeredEdges += invokeEdge
+ allEdges += invokeEdge
 
  outgoingEdgesCount.computeIfPresent(stmt) { _, value ->
  value + 1
@@ -168,11 +178,8 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
 
  when (edge) {
  in implicitEdges -> coveredImplicitEdges += edge
- !in registeredEdges -> {
+ !in registeredEdges, !in coveredEdges-> {
  coveredOutgoingEdges.putIfAbsent(edge.src, 0)
- coveredEdges += edge
- }
- !in coveredEdges -> {
  coveredOutgoingEdges.compute(edge.src) { _, value -> (value ?: 0) + 1 }
  coveredEdges += edge
  }
@@ -280,7 +287,10 @@ class InterProceduralUnitGraph(graph: ExceptionalUnitGraph) {
  * Statement is covered if all the outgoing edges are covered.
  */
  fun isCovered(stmt: Stmt) =
- stmt !in registeredEdgesCount || stmt in coveredOutgoingEdges && coveredOutgoingEdges[stmt]!! >= registeredEdgesCount[stmt]!!
+ stmt !in registeredEdgesCount || isCoveredIgnoringRegistration(stmt)
+
+ fun isCoveredIgnoringRegistration(stmt: Stmt) =
+ stmt in coveredOutgoingEdges && coveredOutgoingEdges[stmt]!! >= allEdgesCount[stmt]!!
 
  /**
  * Edge is covered if we visited it in successfully completed execution at least once

utbot-framework/src/main/kotlin/org/utbot/engine/selectors/strategies/GraphViz.kt

@@ -15,6 +15,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import mu.KotlinLogging
 import org.apache.commons.io.FileUtils
+import org.utbot.engine.isOverridden
 import soot.jimple.Stmt
 import soot.toolkits.graph.ExceptionalUnitGraph
 
@@ -81,8 +82,8 @@ class GraphViz(
  uncompletedStack.last().addDotEdge(it)
  fullStack.last().addDotEdge(it)
  }
- (graph.registeredEdges + graph.implicitEdges).forEach {
- if (!libraryGraphs.contains(stmtToSubgraph[it.src]) && !libraryGraphs.contains(stmtToSubgraph[it.src])) {
+ (graph.allEdges + graph.implicitEdges).forEach {
+ if (!libraryGraphs.contains(stmtToSubgraph[it.src]) && !libraryGraphs.contains(stmtToSubgraph[it.dst])) {
  dotGlobalGraph.addDotEdge(it)
  }
  }
@@ -152,7 +153,8 @@ class GraphViz(
  }
 
  override fun onJoin(stmt: Stmt, graph: ExceptionalUnitGraph, shouldRegister: Boolean) {
- if (!shouldRegister) {
+ val declaringClass = graph.body?.method?.declaringClass
+ if (declaringClass?.isLibraryClass == true && !declaringClass.isOverridden) {
  libraryGraphs.add(graph.body?.method?.declaringClass?.shortName + "." + graph.body?.method?.name)
  }
  update()
@@ -175,7 +177,7 @@ class GraphViz(
  }
  }
 
- for (edge in graph.registeredEdges + graph.implicitEdges) {
+ for (edge in graph.allEdges + graph.implicitEdges) {
  subgraphEdges[stmtToSubgraph[edge.src]!!]!!.add(edge)
  }
  }
@@ -185,7 +187,7 @@ class GraphViz(
  graph.dotNode(executionState.stmt)?.isLast = true
 
  // Node property: covered
- globalGraph.stmts.forEach { graph.dotNode(it)?.covered = globalGraph.isCovered(it) }
+ globalGraph.stmts.forEach { graph.dotNode(it)?.covered = globalGraph.isCoveredIgnoringRegistration(it) }
 
  // Node property: In queue
  pathSelector.queue().forEach { graph.dotNode(it.first.stmt)?.inQueue = true }
@@ -194,7 +196,7 @@ class GraphViz(
  if (!pathSelector.isEmpty()) graph.dotNode(pathSelector.peek()!!.stmt)?.headQueue = true
 
  // Edge property: covered
- (globalGraph.registeredEdges + globalGraph.implicitEdges).forEach {
+ (globalGraph.allEdges + globalGraph.implicitEdges).forEach {
  graph.dotEdge(it)?.isCovered = globalGraph.isCovered(it)
  }