Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,19 @@ final class CelCoverageIndex {
new ConcurrentHashMap<>();

public void init(CelAbstractSyntaxTree ast) {
this.ast = ast;
CelNavigableExpr.fromExpr(ast.getExpr())
.allNodes()
.forEach(
celNavigableExpr -> {
NodeCoverageStats nodeCoverageStats = new NodeCoverageStats();
nodeCoverageStats.isBooleanNode.set(isNodeTypeBoolean(celNavigableExpr.expr()));
nodeCoverageStatsMap.put(celNavigableExpr.id(), nodeCoverageStats);
});
// If the AST and node coverage stats map are already initialized, then we don't need to
// re-initialize them.
if (this.ast == null && nodeCoverageStatsMap.isEmpty()) {
this.ast = ast;
CelNavigableExpr.fromExpr(ast.getExpr())
.allNodes()
.forEach(
celNavigableExpr -> {
NodeCoverageStats nodeCoverageStats = new NodeCoverageStats();
nodeCoverageStats.isBooleanNode.set(isNodeTypeBoolean(celNavigableExpr.expr()));
nodeCoverageStatsMap.put(celNavigableExpr.id(), nodeCoverageStats);
});
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,28 @@ public void getCoverageReport_fullCoverage_writesToUndeclaredOutputs() throws Ex
String fileContent = Files.asCharSource(outputFile, UTF_8).read();
assertThat(fileContent).isEqualTo(report.dotGraph());
}

@Test
public void getCoverageReport_fullCoverage_multipleEvaluations() throws Exception {
Cel cel = CelFactory.standardCelBuilder().addVar("x", SimpleType.INT).build();
CelAbstractSyntaxTree ast = cel.compile("x > 1").getAst();
CelRuntime.Program program = cel.createProgram(ast);
CelCoverageIndex coverageIndex = new CelCoverageIndex();
coverageIndex.init(ast);
CelEvaluationListener listener = coverageIndex.newEvaluationListener();

program.trace(ImmutableMap.of("x", 2L), listener);
coverageIndex.init(ast); // Re-initialize the coverage index.
program.trace(ImmutableMap.of("x", 0L), listener);

CoverageReport report = coverageIndex.generateCoverageReport();
assertThat(report.nodes()).isGreaterThan(0);
assertThat(report.coveredNodes()).isEqualTo(report.nodes());
assertThat(report.branches()).isEqualTo(2);
// Despite re-initializing the coverage index now, the report should still
// be fully covered. Else, only the second evaluation would've been covered.
assertThat(report.coveredBooleanOutcomes()).isEqualTo(2);
assertThat(report.unencounteredNodes()).isEmpty();
assertThat(report.unencounteredBranches()).isEmpty();
}
}