Author: pete.muir(a)jboss.org Date: 2009-02-20 08:35:41 -0500 (Fri, 20 Feb 2009) New Revision: 16008 Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java Log: minor style changes Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java =================================================================== --- validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java 2009-02-20 12:39:56 UTC (rev 16007) +++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java 2009-02-20 13:35:41 UTC (rev 16008) @@ -227,20 +227,19 @@ } } + double untestablePercent = assertionTotal > 0 ? (((assertionTotal - testableAssertionTotal) * 1.0) / assertionTotal) * 100 : 100; + sb.append(assertionTotal); sb.append("</td>"); sb.append("</tr>"); sb.append("<tr>"); - sb.append("<td>Total number of testable assertions</td>"); + sb.append("<td>Total number of untestable assertions</td>"); sb.append("<td>"); - sb.append(testableAssertionTotal); + sb.append(assertionTotal - testableAssertionTotal).append(" (").append(String.format("%.2f%%", untestablePercent)).append(")"); sb.append("</td>"); sb.append("</tr>"); - sb.append("<tr>"); - sb.append("<td>Total number of tested assertions</td>"); - int coverage = 0; for (String sectionId : auditParser.getSectionIds()) @@ -253,12 +252,6 @@ } } } - - sb.append("<td>"); - sb.append(coverage); - sb.append("</td>"); - - sb.append("</tr>"); double coveragePercent = testableAssertionTotal > 0 ? ((coverage * 1.0) / testableAssertionTotal) * 100 : 100; String bgColor = coveragePercent < failThreshold ? "#ffaaaa" : @@ -266,11 +259,13 @@ sb.append("<tr style=\"background-color:" + bgColor + "; border-color: " + bgColor + "\">"); - sb.append("<td style=\"background-color:" + bgColor + "; border-color: " + bgColor + "\">Total percentage of tested assertions</td>"); + sb.append("<td style=\"background-color:" + bgColor + "; border-color: " + bgColor + "\">Total number of tested assertions</td>"); sb.append("<td align=\"center\" style=\"background-color:" + bgColor + "; border-color: " + bgColor + "\">"); + sb.append(coverage).append(" ("); + sb.append(String.format("%.2f%%", coveragePercent)); - sb.append("</td>"); + sb.append(")</td>"); sb.append("</tr>");