Skip to content

Commit 674d4b9

Browse files
sebastianbergmannsebastianbergmann
committed
More work on the dashboard
1 parent 4f58694 commit 674d4b9

File tree

2 files changed

+58
-71
lines changed

2 files changed

+58
-71
lines changed

‎PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php‎

Lines changed: 26 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
7171

7272
$complexity = $this->complexity($classes);
7373
$coverageDistribution = $this->coverageDistribution($classes);
74-
$leastTested = $this->leastTested($classes);
75-
$topProjectRisks = $this->topProjectRisks($classes);
74+
$insufficientCoverage = $this->insufficientCoverage($classes);
75+
$projectRisks = $this->projectRisks($classes);
7676

7777
$template->setVar(
7878
array(
79-
'least_tested_classes' => $leastTested['class'],
80-
'least_tested_methods' => $leastTested['method'],
81-
'top_project_risks_classes' => $topProjectRisks['class'],
82-
'top_project_risks_methods' => $topProjectRisks['method'],
83-
'complexity_class' => $complexity['class'],
84-
'complexity_method' => $complexity['method'],
85-
'class_coverage_distribution' => $coverageDistribution['class'],
86-
'method_coverage_distribution' => $coverageDistribution['method'],
87-
'backlink' => basename(str_replace('.dashboard', '', $file))
79+
'insufficient_coverage_classes' => $insufficientCoverage['class'],
80+
'insufficient_coverage_methods' => $insufficientCoverage['method'],
81+
'project_risks_classes' => $projectRisks['class'],
82+
'project_risks_methods' => $projectRisks['method'],
83+
'complexity_class' => $complexity['class'],
84+
'complexity_method' => $complexity['method'],
85+
'class_coverage_distribution' => $coverageDistribution['class'],
86+
'method_coverage_distribution' => $coverageDistribution['method'],
87+
'backlink' => basename(str_replace('.dashboard', '', $file))
8888
)
8989
);
9090

@@ -213,21 +213,20 @@ protected function coverageDistribution(array $classes)
213213
}
214214

215215
/**
216-
* Returns the least tested classes / methods.
216+
* Returns the classes / methods with insufficient coverage.
217217
*
218-
* @param array $classes
219-
* @param integer $max
218+
* @param array $classes
220219
* @return array
221220
*/
222-
protected function leastTested(array $classes, $max = 10)
221+
protected function insufficientCoverage(array $classes)
223222
{
224223
$leastTestedClasses = array();
225224
$leastTestedMethods = array();
226225
$result = array('class' => '', 'method' => '');
227226

228227
foreach ($classes as $className => $class) {
229228
foreach ($class['methods'] as $methodName => $method) {
230-
if ($method['coverage'] < 100) {
229+
if ($method['coverage'] < $this->highLowerBound) {
231230
if ($className != '*') {
232231
$key = $className . '::' . $methodName;
233232
} else {
@@ -238,37 +237,28 @@ protected function leastTested(array $classes, $max = 10)
238237
}
239238
}
240239

241-
if ($class['coverage'] < 100) {
240+
if ($class['coverage'] < $this->highLowerBound) {
242241
$leastTestedClasses[$className] = $class['coverage'];
243242
}
244243
}
245244

246245
asort($leastTestedClasses);
247246
asort($leastTestedMethods);
248247

249-
$leastTestedClasses = array_slice($leastTestedClasses, 0, min($max, count($leastTestedClasses)));
250-
$leastTestedMethods = array_slice($leastTestedMethods, 0, min($max, count($leastTestedMethods)));
251-
252-
$i = 1;
253-
254248
foreach ($leastTestedClasses as $className => $coverage) {
255249
$result['class'] .= sprintf(
256-
' <tr><td><div align="right">%d.</div></td><td><a href="%s">%s</a></td><td><div align="right">%d%%</div></td></tr>' . "\n",
257-
$i++,
250+
' <tr><td><a href="%s">%s</a></td><td><div align="right">%d%%</div></td></tr>' . "\n",
258251
$classes[$className]['link'],
259252
$className,
260253
$coverage
261254
);
262255
}
263256

264-
$i = 1;
265-
266257
foreach ($leastTestedMethods as $methodName => $coverage) {
267258
list($class, $method) = explode('::', $methodName);
268259

269260
$result['method'] .= sprintf(
270-
' <tr><td><div align="right">%d.</div></td><td><a href="%s">%s</a></td><td><div align="right">%d%%</div></td></tr>' . "\n",
271-
$i++,
261+
' <tr><td><a href="%s">%s</a></td><td><div align="right">%d%%</div></td></tr>' . "\n",
272262
$classes[$class]['methods'][$method]['link'],
273263
$methodName,
274264
$coverage
@@ -279,13 +269,12 @@ protected function leastTested(array $classes, $max = 10)
279269
}
280270

281271
/**
282-
* Returns the top project risks according to the CRAP index.
272+
* Returns the project risks according to the CRAP index.
283273
*
284-
* @param array $classes
285-
* @param integer $max
274+
* @param array $classes
286275
* @return array
287276
*/
288-
protected function topProjectRisks(array $classes, $max = 10)
277+
protected function projectRisks(array $classes)
289278
{
290279
$classRisks = array();
291280
$methodRisks = array();
@@ -294,7 +283,8 @@ protected function topProjectRisks(array $classes, $max = 10)
294283

295284
foreach ($classes as $className => $class) {
296285
foreach ($class['methods'] as $methodName => $method) {
297-
if ($method['coverage'] < 100 && $method['ccn'] > 1) {
286+
if ($method['coverage'] < $this->highLowerBound &&
287+
$method['ccn'] > 1) {
298288
if ($className != '*') {
299289
$key = $className . '::' . $methodName;
300290
} else {
@@ -305,7 +295,7 @@ protected function topProjectRisks(array $classes, $max = 10)
305295
}
306296
}
307297

308-
if ($class['coverage'] < 100 &&
298+
if ($class['coverage'] < $this->highLowerBound &&
309299
$class['ccn'] > count($class['methods'])) {
310300
$classRisks[$className] = $class['crap'];
311301
}
@@ -314,29 +304,20 @@ protected function topProjectRisks(array $classes, $max = 10)
314304
arsort($classRisks);
315305
arsort($methodRisks);
316306

317-
$classRisks = array_slice($classRisks, 0, min($max, count($classRisks)));
318-
$methodRisks = array_slice($methodRisks, 0, min($max, count($methodRisks)));
319-
320-
$i = 1;
321-
322307
foreach ($classRisks as $className => $crap) {
323308
$result['class'] .= sprintf(
324-
' <tr><td><div align="right">%d.</div></td><td><a href="%s">%s</a></td><td><div align="right">%d</div></td></tr>' . "\n",
325-
$i++,
309+
' <tr><td><a href="%s">%s</a></td><td><div align="right">%d</div></td></tr>' . "\n",
326310
$classes[$className]['link'],
327311
$className,
328312
$crap
329313
);
330314
}
331315

332-
$i = 1;
333-
334316
foreach ($methodRisks as $methodName => $crap) {
335317
list($class, $method) = explode('::', $methodName);
336318

337319
$result['method'] .= sprintf(
338-
' <tr><td><div align="right">%d.</div></td><td><a href="%s">%s</a></td><td><div align="right">%d</div></td></tr>' . "\n",
339-
$i++,
320+
' <tr><td><a href="%s">%s</a></td><td><div align="right">%d</div></td></tr>' . "\n",
340321
$classes[$class]['methods'][$method]['link'],
341322
$methodName,
342323
$crap

‎PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,86 +24,92 @@
2424
</div>
2525
</header>
2626
<div class="container">
27+
<div class="row">
28+
<div class="span12">
29+
<h2>Classes</h2>
30+
</div>
31+
</div>
2732
<div class="row">
2833
<div class="span6">
29-
<h2>Class Coverage Distribution</h2>
34+
<h3>Coverage Distribution</h3>
3035
<div id="classCoverageDistribution" style="height: 300px"></div>
3136
</div>
3237
<div class="span6">
33-
<h2>Method Coverage Distribution</h2>
34-
<div id="methodCoverageDistribution" style="height: 300px"></div>
38+
<h3>Complexity</h3>
39+
<div id="classComplexity" style="height: 300px"></div>
3540
</div>
3641
</div>
3742
<div class="row">
38-
<div class="span6">
39-
<h2>Least Tested Classes</h2>
43+
<div class="span6" style="height: 300px; overflow: auto;">
44+
<h3>Insufficient Coverage</h3>
4045
<table class="table">
4146
<thead>
4247
<tr>
43-
<th></th>
4448
<th><div align="left">Class</div></th>
4549
<th><div align="right">Coverage</div></th>
4650
</tr>
4751
</thead>
4852
<tbody>
49-
{least_tested_classes}
53+
{insufficient_coverage_classes}
5054
</tbody>
5155
</table>
5256
</div>
53-
<div class="span6">
54-
<h2>Least Tested Methods</h2>
57+
<div class="span6" style="height: 300px; overflow: auto;">
58+
<h3>Project Risks</h3>
5559
<table class="table">
5660
<thead>
5761
<tr>
58-
<th></th>
59-
<th><div align="left">Method</div></th>
60-
<th><div align="right">Coverage</div></th>
62+
<th><div align="left">Class</div></th>
63+
<th><div align="right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></div></th>
6164
</tr>
6265
</thead>
6366
<tbody>
64-
{least_tested_methods}
67+
{project_risks_classes}
6568
</tbody>
6669
</table>
6770
</div>
6871
</div>
72+
<div class="row">
73+
<div class="span12">
74+
<h2>Methods</h2>
75+
</div>
76+
</div>
6977
<div class="row">
7078
<div class="span6">
71-
<h2>Class Complexity</h2>
72-
<div id="classComplexity" style="height: 300px"></div>
79+
<h3>Coverage Distribution</h3>
80+
<div id="methodCoverageDistribution" style="height: 300px"></div>
7381
</div>
7482
<div class="span6">
75-
<h2>Method Complexity</h2>
83+
<h3>Complexity</h3>
7684
<div id="methodComplexity" style="height: 300px"></div>
7785
</div>
7886
</div>
7987
<div class="row">
80-
<div class="span6">
81-
<h2>Top Project Risks (Classes)</h2>
88+
<div class="span6" style="height: 300px; overflow: auto;">
89+
<h3>Insufficient Coverage</h3>
8290
<table class="table">
8391
<thead>
8492
<tr>
85-
<th></th>
86-
<th><div align="left">Class</div></th>
87-
<th><div align="right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></div></th>
93+
<th><div align="left">Method</div></th>
94+
<th><div align="right">Coverage</div></th>
8895
</tr>
8996
</thead>
9097
<tbody>
91-
{top_project_risks_classes}
98+
{insufficient_coverage_methods}
9299
</tbody>
93100
</table>
94101
</div>
95-
<div class="span6">
96-
<h2>Top Project Risks (Methods)</h2>
102+
<div class="span6" style="height: 300px; overflow: auto;">
103+
<h3>Project Risks</h3>
97104
<table class="table">
98105
<thead>
99106
<tr>
100-
<th></th>
101107
<th><div align="left">Method</div></th>
102108
<th><div align="right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></div></th>
103109
</tr>
104110
</thead>
105111
<tbody>
106-
{top_project_risks_methods}
112+
{project_risks_methods}
107113
</tbody>
108114
</table>
109115
</div>

0 commit comments

Comments
 (0)