[hibernate-commits] Hibernate SVN: r16017 - validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report.

[hibernate-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-22 11:34:02 -0500 (Sun, 22 Feb 2009)
New Revision: 16017

Modified:
   validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java
Log:
Fix coverage percent to not include untestable

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-22 02:07:14 UTC (rev 16016)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java	2009-02-22 16:34:02 UTC (rev 16017)
@@ -10,6 +10,7 @@
 import java.util.Map;
 
 import org.hibernate.tck.config.RuntimeProperties;
+import org.hibernate.tck.config.Strings;
 
 /**
  * Generates the TCK spec coverage report
@@ -454,8 +455,10 @@
             }
          }
          
-         double coveragePercent = assertions > 0 ? ((coverage * 1.0) / assertions) * 100 : -1;
+         int coveredAndUnTestable = coverage + (assertions - testable);
          
+         double coveragePercent = assertions > 0 ? ((coveredAndUnTestable * 1.0) / (assertions)) * 100 : -1;
+         
          sb.append("<td align=\"center\">");
          sb.append(assertions);
          sb.append("</td>");
@@ -538,7 +541,14 @@
 
                     sb.append("    <div class=\"results\">");
                     sb.append("<p class=\"description\">");
-                    sb.append(assertion.getText());
+                    if (!Strings.isEmpty(assertion.getNote()))
+                    {
+                       sb.append("<a title=\"" + assertion.getNote() + "\">").append(assertion.getText()).append("</a>");
+                    }
+                    else
+                    {
+                       sb.append(assertion.getText());
+                    }
                     sb.append("</p>\n");
 
                     if (assertion.isTestable())