[hibernate-commits] Hibernate SVN: r15975 - validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sun Feb 15 08:52:15 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-02-15 08:52:15 -0500 (Sun, 15 Feb 2009)
New Revision: 15975
Modified:
validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageProcessor.java
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/SpecReference.java
Log:
report styling, add package names
Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageProcessor.java
===================================================================
--- validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageProcessor.java 2009-02-14 23:46:56 UTC (rev 15974)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageProcessor.java 2009-02-15 13:52:15 UTC (rev 15975)
@@ -20,6 +20,7 @@
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -168,6 +169,9 @@
Map<? extends ExecutableElement, ? extends AnnotationValue> annotationParameters) {
SpecReference ref = new SpecReference();
+
+ PackageElement packageElement = getEnclosingPackageElement(methodElement);
+ ref.setPackageName(packageElement.getQualifiedName().toString());
ref.setClassName(methodElement.getEnclosingElement().getSimpleName().toString());
ref.setMethodName(methodElement.getSimpleName().toString());
for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : annotationParameters.entrySet()) {
@@ -180,5 +184,17 @@
}
}
references.add(ref);
+ }
+
+ private PackageElement getEnclosingPackageElement(ExecutableElement methodElement) {
+ Element classElement = methodElement.getEnclosingElement();
+
+ Element enclosingElement = classElement.getEnclosingElement();
+
+ while (!(enclosingElement instanceof PackageElement) && enclosingElement != null) {
+ enclosingElement = enclosingElement.getEnclosingElement();
+ }
+
+ return (PackageElement) enclosingElement;
}
}
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-14 23:46:56 UTC (rev 15974)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/CoverageReport.java 2009-02-15 13:52:15 UTC (rev 15975)
@@ -53,6 +53,9 @@
sb.append("<head><title>JSR-299 TCK Coverage Report</title>\n");
sb.append("<style type=\"text/css\">\n");
+ sb.append(" body {\n");
+ sb.append(" font-family: verdana, arial, sans-serif;\n");
+ sb.append(" font-size: 11px; }\n");
sb.append(" .code {\n");
sb.append(" float: left;\n");
sb.append(" font-weight: bold;\n");
@@ -65,7 +68,13 @@
sb.append(" margin-top: 2px;\n");
sb.append(" margin-bottom: 2px; }\n");
sb.append(" .sectionHeader {\n");
+ sb.append(" border-bottom: 1px solid #cccccc;\n");
+ sb.append(" margin-top: 8px;\n");
sb.append(" font-weight: bold; }\n");
+ sb.append(" .packageName {\n");
+ sb.append(" color: #999999;\n");
+ sb.append(" font-size: 9px;\n");
+ sb.append(" font-weight: bold; }\n");
sb.append(" .noCoverage {\n");
sb.append(" margin-top: 2px;\n");
sb.append(" margin-bottom: 2px;\n");
@@ -96,6 +105,7 @@
}
private void writeCoverage(OutputStream out) throws IOException {
+
for (String sectionId : auditParser.getSectionIds()) {
List<AuditAssertion> sectionAssertions = auditParser.getAssertionsForSection(sectionId);
@@ -105,6 +115,8 @@
out.write(("<div class=\"sectionHeader\">Section " + sectionId + " - " +
auditParser.getSectionTitle(sectionId) + "</div>\n").getBytes());
+
+ String currentPackageName = null;
for (AuditAssertion assertion : sectionAssertions) {
List<SpecReference> coverage = getCoverageForAssertion(sectionId, assertion.getId());
@@ -128,6 +140,14 @@
sb.append(" <p class=\"noCoverage\">No tests exist for this assertion</p>\n");
} else {
for (SpecReference ref : coverage) {
+ if (!ref.getPackageName().equals(currentPackageName))
+ {
+ currentPackageName = ref.getPackageName();
+ sb.append(" <div class=\"packageName\">");
+ sb.append(currentPackageName);
+ sb.append(" </div>\n");
+ }
+
sb.append(" <div class=\"coverageMethod\">");
sb.append(ref.getClassName());
sb.append(".");
@@ -179,6 +199,9 @@
sb.append("</td>");
sb.append("<td>");
+ sb.append("<div class=\"packageName\">");
+ sb.append(ref.getPackageName());
+ sb.append("</div>");
sb.append(ref.getClassName());
sb.append("</td>");
Modified: validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/SpecReference.java
===================================================================
--- validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/SpecReference.java 2009-02-14 23:46:56 UTC (rev 15974)
+++ validator/trunk/tck-utils/impl/src/main/java/org/hibernate/tck/report/SpecReference.java 2009-02-15 13:52:15 UTC (rev 15975)
@@ -8,6 +8,7 @@
public class SpecReference {
private String section;
private String assertion;
+ private String packageName;
private String className;
private String methodName;
@@ -18,6 +19,10 @@
public void setAssertion(String assertion) {
this.assertion = assertion;
}
+
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
public void setClassName(String className) {
this.className = className;
@@ -34,6 +39,10 @@
public String getAssertion() {
return assertion;
}
+
+ public String getPackageName() {
+ return packageName;
+ }
public String getClassName() {
return className;
@@ -47,6 +56,6 @@
public String toString()
{
return "SpecReference[section=" + section + ";assertion=" + assertion +
- ";class=" + className + ";method=" + methodName + "]";
+ ";class=" + packageName + "." + className + ";method=" + methodName + "]";
}
}
More information about the hibernate-commits
mailing list