Skip to content

Added total statements metric to avoid overlaps with coremetrics #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2015
Merged

Added total statements metric to avoid overlaps with coremetrics #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion plugin/src/main/scala/com/buransky/plugins/scoverage/measure/ScalaMetrics.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ import scala.collection.mutable.ListBuffer
* @author Rado Buransky
*/
class ScalaMetrics extends Metrics {
override def getMetrics = ListBuffer(ScalaMetrics.statementCoverage, ScalaMetrics.coveredStatements).toList
override def getMetrics = ListBuffer(ScalaMetrics.statementCoverage, ScalaMetrics.coveredStatements, ScalaMetrics.totalStatements).toList
}

object ScalaMetrics {
private val STATEMENT_COVERAGE_KEY = "scoverage"
private val COVERED_STATEMENTS_KEY = "covered_statements"
private val TOTAL_STATEMENTS_KEY = "total_statements"

lazy val statementCoverage = new Metric.Builder(STATEMENT_COVERAGE_KEY,
"Statement coverage", ValueType.PERCENT)
Expand All @@ -55,4 +56,12 @@ object ScalaMetrics {
.setDomain(CoreMetrics.DOMAIN_SIZE)
.setFormula(new org.sonar.api.measures.SumChildValuesFormula(false))
.create[java.lang.Integer]()

lazy val totalStatements = new Metric.Builder(TOTAL_STATEMENTS_KEY,
"Total statements", Metric.ValueType.INT)
.setDescription("Number of all statements covered by tests and uncovered")
.setDirection(Metric.DIRECTION_BETTER)
.setQualitative(false)
.setDomain(CoreMetrics.DOMAIN_SIZE)
.create[java.lang.Integer]()
}
9 changes: 4 additions & 5 deletions plugin/src/main/scala/com/buransky/plugins/scoverage/sensor/ScoverageSensor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem

private def analyseStatementCountForModule(module: Project, context: SensorContext): Long = {
// Aggregate modules
context.getMeasure(module, CoreMetrics.STATEMENTS) match {
context.getMeasure(module, ScalaMetrics.totalStatements) match {
case null =>
log.debug(LogUtil.f("Module has no number of statements. [" + module.name + "]"))
0
Expand Down Expand Up @@ -174,8 +174,7 @@ class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem

private def saveMeasures(context: SensorContext, resource: Resource, statementCoverage: StatementCoverage) {
context.saveMeasure(resource, createStatementCoverage(statementCoverage.rate))
if (context.getMeasure(CoreMetrics.STATEMENTS) == null)
context.saveMeasure(resource, createStatementCount(statementCoverage.statementCount))
context.saveMeasure(resource, createStatementCount(statementCoverage.statementCount))
context.saveMeasure(resource, createCoveredStatementCount(statementCoverage.coveredStatementsCount))

log.debug(LogUtil.f("Save measures [" + statementCoverage.rate + ", " + statementCoverage.statementCount +
Expand All @@ -189,7 +188,7 @@ class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem

// Set line hits
val coverage = CoverageMeasuresBuilder.create()
coveredLines.foreach { coveredLine =>
coveredLines.foreach { coveredLine =>
coverage.setHits(coveredLine.line, coveredLine.hitCount)
}

Expand All @@ -214,7 +213,7 @@ class ScoverageSensor(settings: Settings, pathResolver: PathResolver, fileSystem
new Measure[T](ScalaMetrics.statementCoverage, rate)

private def createStatementCount[T <: Serializable](statements: Int): Measure[T] =
new Measure(CoreMetrics.STATEMENTS, statements.toDouble, 0)
new Measure(ScalaMetrics.totalStatements, statements.toDouble, 0)

private def createCoveredStatementCount[T <: Serializable](coveredStatements: Int): Measure[T] =
new Measure(ScalaMetrics.coveredStatements, coveredStatements.toDouble, 0)
Expand Down