From hibernate-commits at lists.jboss.org Sat Feb 21 21:07:15 2009
Content-Type: multipart/mixed; boundary="===============1467582967744663598=="
MIME-Version: 1.0
From: hibernate-commits at lists.jboss.org
To: hibernate-commits at lists.jboss.org
Subject: [hibernate-commits] Hibernate SVN: r16016 -
 validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report.
Date: Sat, 21 Feb 2009 21:07:14 -0500
Message-ID: <E1Lb3kQ-00010X-E3@committer01.frg.pub.inap.atl.jboss.com>

--===============1467582967744663598==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: shane.bryzak(a)jboss.com
Date: 2009-02-21 21:07:14 -0500 (Sat, 21 Feb 2009)
New Revision: 16016

Modified:
   validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/Co=
verageReport.java
Log:
added chapter summary

Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/re=
port/CoverageReport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/C=
overageReport.java	2009-02-20 17:18:17 UTC (rev 16015)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/C=
overageReport.java	2009-02-22 02:07:14 UTC (rev 16016)
@@ -85,6 +85,7 @@
         writeHeader(out);
         writeContents(out);
         writeMasterSummary(out);
+        writeChapterSummary(out);
         writeSectionSummary(out);
         writeCoverage(out);
         writeUnmatched(out);
@@ -196,6 +197,7 @@
        =

        sb.append("<h3>Contents</h3>");
        sb.append("<div><a href=3D\"#masterSummary\">Master Summary</a></di=
v>");
+       sb.append("<div><a href=3D\"#chapterSummary\">Chapter Summary</a></=
div>");
        sb.append("<div><a href=3D\"#sectionSummary\">Section Summary</a></=
div>");
        sb.append("<div><a href=3D\"#coverageDetail\">Coverage Detail</a></=
div>");
        sb.append("<div><a href=3D\"#unmatched\">Unmatched Tests</a></div>"=
);
@@ -282,7 +284,122 @@
        =

        out.write(sb.toString().getBytes());
     }
+    =

+    private void writeChapterSummary(OutputStream out) throws IOException {
+       StringBuilder sb =3D new StringBuilder();
+       =

+       sb.append("<h3 id=3D\"chapterSummary\">Chapter Summary</h3>\n");
 =

+       sb.append("<table width=3D\"100%\">");
+       =

+       sb.append("<tr style=3D\"background-color:#dddddd\">");
+       sb.append("<th align=3D\"left\">Chapter</th>");
+       sb.append("<th>Assertions</th>");
+       sb.append("<th>Testable</th>");
+       sb.append("<th>Tested</th>");
+       sb.append("<th>Coverage %</th>");
+       sb.append("</tr>");
+       =

+       boolean odd =3D true;
+              =

+       for (String sectionId : auditParser.getSectionIds()) {
+          =

+          // Chapters have no .'s in their id
+         if (sectionId.split("[.]").length =3D=3D 1)
+         {
+            String prefix =3D sectionId + ".";
+            =

+            int assertions =3D auditParser.getAssertionsForSection(section=
Id).size();
+            int testable =3D 0;
+            int coverage =3D 0;                     =

+            =

+            for (AuditAssertion assertion : auditParser.getAssertionsForSe=
ction(sectionId))
+            {
+               if (assertion.isTestable()) testable++;
+               =

+               if (!getCoverageForAssertion(sectionId, assertion.getId()).=
isEmpty())
+               {
+                  coverage++;
+               }
+            }             =

+            =

+            // Gather stats here
+            for (String subSectionId : auditParser.getSectionIds())
+            {
+               if (subSectionId.startsWith(prefix))
+               {
+                  assertions +=3D auditParser.getAssertionsForSection(subS=
ectionId).size();
+                                    =

+                  for (AuditAssertion assertion : auditParser.getAssertion=
sForSection(subSectionId))
+                  {
+                     if (assertion.isTestable()) testable++;              =
       =

+                     =

+                     if (!getCoverageForAssertion(subSectionId, assertion.=
getId()).isEmpty())
+                     {
+                        coverage++;
+                     }
+                  }                  =

+               }
+            }
+            =

+            if (odd)
+            {
+               sb.append("<tr style=3D\"background-color:#f7f7f7\">");
+            }
+            else
+            {
+               sb.append("<tr>");
+            }
+            =

+            odd =3D !odd;
+            =

+            int margin =3D (sectionId.split("[.]").length - 1) * 16;      =
   =

+            =

+            sb.append("<td style=3D\"padding-left:" + margin + "px\">");
+            sb.append("<a href=3D\"#" + sectionId + "\">");
+            sb.append(sectionId);
+            sb.append(" ");
+            sb.append(auditParser.getSectionTitle(sectionId));
+            sb.append("</a>");
+            sb.append("</td>");
+                        =

+            double coveragePercent =3D assertions > 0 ? ((coverage * 1.0) =
/ assertions) * 100 : -1;
+            =

+            sb.append("<td align=3D\"center\">");
+            sb.append(assertions);
+            sb.append("</td>");
+            =

+            sb.append("<td align=3D\"center\">");
+            sb.append(testable);
+            sb.append("</td>");
+            =

+            sb.append("<td align=3D\"center\">");
+            sb.append(coverage);
+            sb.append("</td>");
+            =

+            if (coveragePercent >=3D 0)
+            {
+               String bgColor =3D coveragePercent < 60 ? "#ffaaaa" : cover=
agePercent < 80 ? "#ffffaa" : "#aaffaa" ;
+            =

+               sb.append("<td align=3D\"center\" style=3D\"background-colo=
r:" + bgColor + "\">");
+               sb.append(String.format("%.2f%%", coveragePercent));
+               sb.append("</td>");
+            }
+            else
+            {
+               sb.append("<td />");
+            }
+
+            sb.append("</tr>");                        =

+            =

+         }
+          =

+       }
+
+       sb.append("</table>");       =

+       out.write(sb.toString().getBytes());        =

+    }
+
     private void writeSectionSummary(OutputStream out) throws IOException {
        StringBuilder sb =3D new StringBuilder();
        =

@@ -324,17 +441,13 @@
          sb.append("</td>");
          =

          int assertions =3D auditParser.getAssertionsForSection(sectionId)=
.size();
-         int testable =3D 0;
-         =

-         for (AuditAssertion a : auditParser.getAssertionsForSection(secti=
onId))
-         {
-            if (a.isTestable()) testable++;
-         }
-         =

+         int testable =3D 0;         =

          int coverage =3D 0;
          =

          for (AuditAssertion assertion : auditParser.getAssertionsForSecti=
on(sectionId))
          {
+            if (assertion.isTestable()) testable++;
+            =

             if (!getCoverageForAssertion(sectionId, assertion.getId()).isE=
mpty())
             {
                coverage++;


--===============1467582967744663598==--