From ef8b26d74febe5ff8aac8f5eb2792346ae13e6c6 Mon Sep 17 00:00:00 2001 From: Rudrakshi Date: Thu, 13 Feb 2020 14:26:17 +0100 Subject: [PATCH] updated to fix Code coverage --- .../com/exxeta/iss/sonar/esql/EsqlSensor.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java b/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java index 5a29b2c2..a8f550ff 100644 --- a/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java +++ b/esql-plugin/src/main/java/com/exxeta/iss/sonar/esql/EsqlSensor.java @@ -92,6 +92,7 @@ public class EsqlSensor implements Sensor { private final ActionParser parser; // parsingErrorRuleKey equals null if ParsingErrorCheck is not activated private RuleKey parsingErrorRuleKey = null; + private MetricsVisitor metricsVisitor = null; public EsqlSensor( CheckFactory checkFactory, FileLinesContextFactory fileLinesContextFactory, FileSystem fileSystem, NoSonarFilter noSonarFilter) { @@ -134,7 +135,7 @@ protected void analyseFiles( success = true; } catch (CancellationException e) { // do not propagate the exception - LOG.debug(e.toString(), e); + LOG.debug("Error while file analysis in code coverage" + e.toString(), e); } finally { stopProgressReport(progressReport, success); } @@ -311,7 +312,7 @@ public void execute(SensorContext context) { public List getTreeVisitors(SensorContext context) { boolean ignoreHeaderComments = ignoreHeaderComments(context); - MetricsVisitor metricsVisitor = new MetricsVisitor( + metricsVisitor = new MetricsVisitor( context, ignoreHeaderComments, fileLinesContextFactory); @@ -328,12 +329,10 @@ public void highlightSymbols(InputFile inputFile, TreeVisitorContext treeVisitor } public void executeCoverageSensors(SensorContext context) { - boolean ignoreHeaderComments = ignoreHeaderComments(context); - - MetricsVisitor metricsVisitor = new MetricsVisitor( - context, - ignoreHeaderComments, - fileLinesContextFactory); + //Removed re-initialization of metriccvisitor as executable lines were empty + if (metricsVisitor == null) { + LOG.debug("metricVisitor null"); + } executeCoverageSensors(context, metricsVisitor.executableLines()); }