Skip to content

Fixed scoverage html writer class links #9

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
Jan 21, 2014
Merged

Fixed scoverage html writer class links #9

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
30 changes: 23 additions & 7 deletions src/main/scala/scoverage/report/ScoverageHtmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
}

def _file(mfile: MeasuredFile): Node = {

val filename = {
mfile.source.replace(sourceDirectory.getAbsolutePath + "/", "") + ".html"
}

val css =
"table.codegrid { font-family: monospace; font-size: 12px; width: auto!important; }" +
"table.statementlist { width: auto!important; font-size: 13px; } " +
Expand All @@ -47,7 +52,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title id='title'>
{mfile.source}
{filename}
</title>
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css"/>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
Expand Down Expand Up @@ -139,12 +144,12 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
def packageClasses(pack: MeasuredPackage): Node = {
<html>
{head}<body style="font-family: monospace;">
{classes(pack.classes)}
{classes(pack.classes, false)}
</body>
</html>
}

def classes(classes: Iterable[MeasuredClass]): Node = {
def classes(classes: Iterable[MeasuredClass], addPath: Boolean): Node = {
<table class="table table-striped" style="font-size:13px">
<thead>
<tr>
Expand Down Expand Up @@ -185,15 +190,26 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
</tr>
</thead>
<tbody>
{classes.toSeq.sortBy(_.simpleName) map _class}
{classes.toSeq.sortBy(_.simpleName) map (_class(_, addPath))}
</tbody>
</table>
}

def _class(klass: MeasuredClass): Node = {
def _class(klass: MeasuredClass, addPath: Boolean): Node = {

val filename = {
outputDir + klass.source.replace(sourceDirectory.getAbsolutePath, "") + ".html"
val Match = "(.*/)?([^/]+.scala.html)$".r
klass.source.replace(sourceDirectory.getAbsolutePath + "/", "") + ".html" match {
case Match(path, value) => {
if (addPath && path.eq(null)) {
"<empty>/" + value
} else if (addPath && path.ne("")) {
path + value
} else {
value
}
}
}
}

val statement0f = Math.round(klass.statementCoveragePercent).toInt.toString
Expand Down Expand Up @@ -387,7 +403,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) {
{stats(coverage)}
</div>
<div>
{classes(coverage.classes)}
{classes(coverage.classes, true)}
</div>
</div>
</body>
Expand Down