Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 35483 invoked from network); 11 Feb 2007 14:54:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Feb 2007 14:54:17 -0000 Received: (qmail 30221 invoked by uid 500); 11 Feb 2007 14:54:24 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 30193 invoked by uid 500); 11 Feb 2007 14:54:24 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 30182 invoked by uid 99); 11 Feb 2007 14:54:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Feb 2007 06:54:24 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Feb 2007 06:54:14 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D5CF11A981D; Sun, 11 Feb 2007 06:53:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r506017 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report: ./ model/ resources/ resources/boilerplate/ Date: Sun, 11 Feb 2007 14:53:53 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070211145353.D5CF11A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Sun Feb 11 06:53:52 2007 New Revision: 506017 URL: http://svn.apache.org/viewvc?view=rev&rev=506017 Log: Hacked in iteration display name (loads iterations.xml for details) Hacked in log file rendering per-iteration Added: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm (with props) Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/PageRenderer.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/IterationModel.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/PackageModel.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestModel.groovy geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-packages-frame.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/stylesheet.css geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/class-summary.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-detail.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-frame.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/macros.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-summary.vm geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/testcase-detail.vm Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/PageRenderer.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/PageRenderer.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/PageRenderer.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/PageRenderer.groovy Sun Feb 11 06:53:52 2007 @@ -66,5 +66,24 @@ return shell.evaluate(expr) } + + private static final long KILOBYTES = 1024 + private static final long MEGABYTES = KILOBYTES * 1024 + + String logFileSize(filename) { + def file = new File("${params.workDir}/logs/$filename") + + long size = file.length() / MEGABYTES + if (size > 0) { + return "${size} mb" + } + + size = file.length() / KILOBYTES + if (size > 0) { + return "${size} kb" + } + + return "${file.length()} b" + } } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/ReportGenerator.groovy Sun Feb 11 06:53:52 2007 @@ -26,6 +26,7 @@ import gbuild.system.LogSupport import gbuild.system.util.LazyProxy import gbuild.system.util.Sorting +import gbuild.system.util.IterationConfigurator import gbuild.system.template.velocity.TemplateEngine @@ -64,7 +65,7 @@ long total = runtime.totalMemory() / MEGABYTES long max = runtime.maxMemory() / MEGABYTES - log.info "Memory usage: ${used}mb / ${total}mb (${max}mb)" + log.info "Memory usage: ${used} mb / ${total} mb (${max} mb)" } def loadProperties(file) { @@ -107,20 +108,6 @@ return new URI(path[0 .. -2]) } - def createRenderer(templateName, targetPath) { - assert templateName - assert targetPath - - def outputFile = new File(targetDir, targetPath).canonicalFile - - def template = engine.getTemplate(templateName) - - template.params.baseURI = baseURI(targetDir, outputFile.parentFile) - template.params.pageHref = targetPath - - return new PageRenderer(template, outputFile) - } - def generate() { log.info 'Setup workspace' ant.mkdir(dir: targetDir) @@ -134,6 +121,23 @@ log.info 'Generate report' def suiteModel = new SuiteModel() + // Basic render setup + def createRenderer = { templateName, targetPath -> + assert templateName + assert targetPath + + def outputFile = new File(targetDir, targetPath).canonicalFile + + def template = engine.getTemplate(templateName) + + template.params.baseURI = baseURI(targetDir, outputFile.parentFile) + template.params.pageHref = targetPath + template.params.workDir = workDir + template.params.targetDir = targetDir + + return new PageRenderer(template, outputFile) + } + // Renders a template with a given model def renderWithModel = { model, template, file -> def renderer = createRenderer(template, file) @@ -146,9 +150,24 @@ renderWithModel(suiteModel, template, file) } - // - // TODO: Load the iterations.xml configuration so we can use that for rendering ? - // + // Render an interation log + def renderIterationLog = { model, logFile -> + logFile = new File("$logFile") + def file = "${logFile.name}-${model.iterationIndex}.html" + + println logFile + println file + + def renderer = createRenderer('iteration-log.vm', file) + renderer.params.model = model + renderer.params.logFile = logFile + renderer.render() + } + + // Load the iterations.xml configuration so we can use that for rendering + def iterConfigurator = new IterationConfigurator() + iterConfigurator.configFile = 'project/tck-testsuite/iterations.xml' + def iterConfig = iterConfigurator.loadConfig() archives.each { archive -> log.info "Processing results archive: $archive" @@ -167,6 +186,12 @@ // Create a new model for the iter to capture stats def iterModel = suiteModel.createIteration(props) + // Attach the iteration config (xml node) + iterModel.iterationConfig = iterConfig.iteration[iterModel.iterationIndex - 1] + + // Can log this now, since it has the iter config loaded + log.info "Processing iteration $iterModel.name ($iterModel.displayName)" + // Scan for result files def resultsDir = new File(workDir, 'javatest') def scanner = ant.fileScanner { @@ -201,6 +226,10 @@ log.info 'Rendering iteration bits' renderWithModel(iterModel, 'iteration-detail.vm', iterModel.href) renderWithModel(iterModel, 'iteration-frame.vm', iterModel.frameHref) + + log.info 'Rendering iteration logs' + renderIterationLog(iterModel, "${workDir}/logs/server.log") + renderIterationLog(iterModel, "${workDir}/logs/javatest.log") // Clean up for the next iteration ant.delete(dir: workDir) Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/ClassModel.groovy Sun Feb 11 06:53:52 2007 @@ -43,6 +43,10 @@ return super.leftShift(testCase) } + IterationModel getIteration() { + return parent.parent + } + Collection getTests() { return children.values().sort() } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/IterationModel.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/IterationModel.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/IterationModel.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/IterationModel.groovy Sun Feb 11 06:53:52 2007 @@ -36,6 +36,8 @@ { Map runtestsProperties + Node iterationConfig + def IterationModel(String name) { super(name, 'packageName', PackageModel) } @@ -54,6 +56,31 @@ super.compareTo(obj) } + int getIterationIndex() { + return name.toInteger() + } + + String getDisplayName() { + return "${iterationIndex} :: " + iterationConfig.get('name').text() + } + + String getTestConfiguration() { + def list = [] + + iterationConfig.tests.test.each { + list << it.text() + } + + return list.join(' ') + } + + String getOptionsConfiguration() { + if (iterationConfig.options) { + return iterationConfig.options.text() + } + return 'NONE' + } + Collection getPackages() { return children.values().sort() } @@ -91,11 +118,11 @@ } String getHref() { - return "iteration-${name}.html" + return "iteration-${iterationIndex}.html" } String getFrameHref() { - return "iteration-${name}-frame.html" + return "iteration-${iterationIndex}-frame.html" } } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/PackageModel.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/PackageModel.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/PackageModel.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/PackageModel.groovy Sun Feb 11 06:53:52 2007 @@ -37,6 +37,10 @@ super(name, 'className', ClassModel) } + IterationModel getIteration() { + return parent + } + Collection getClasses() { return children.values().sort() } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestModel.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestModel.groovy?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestModel.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestModel.groovy Sun Feb 11 06:53:52 2007 @@ -76,5 +76,9 @@ return name.toLowerCase() <=> obj.toLowerCase() } + + String getDisplayName() { + return name + } } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-packages-frame.vm URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-packages-frame.vm?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-packages-frame.vm (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-packages-frame.vm Sun Feb 11 06:53:52 2007 @@ -28,7 +28,7 @@
    #foreach ($pkg in $model.packages) -
  • $pkg.name
    • +
  • $pkg.displayName
    • #end Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/stylesheet.css URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/stylesheet.css?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/stylesheet.css (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/stylesheet.css Sun Feb 11 06:53:52 2007 @@ -54,6 +54,7 @@ border: 1px solid #000; } +/* div.overview { background-color: #ddd; padding: 4px 4px 4px 0; @@ -110,12 +111,36 @@ #overview { padding: 2px; } +*/ hr { height: 1px; color: #000; } +/* Headings */ + +h1 { + font-size: 18px; + font-weight: bold; +} +h2 { + font-size: 16px; + font-weight: bold; +} +h3 { + font-size: 14px; + font-weight: bold; +} +h4 { + font-size: 12px; + font-weight: bold; +} +h5 { + font-size: 10px; + font-weight: bold; +} + /* Top Nav Bar */ table.topNavBar { @@ -177,6 +202,32 @@ span.testError { font-weight: bold; color: #660000; /* dark red */ +} + +/* Iteration logs */ + +pre.logContents { + font-size: 10px; + color: #CCCCCC; + background-color: #111111; + border: 1px solid black; + height: auto; + width: 98%; + overflow: auto; + padding: 8px; +} + +/* Test Detail */ + +pre.sectionStreamData { + font-size: 10px; + color: #CCCCCC; + background-color: #111111; + border: 1px solid black; + height: auto; + width: 98%; + overflow: auto; + padding: 8px; } /* Bar Graph */ Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/class-summary.vm URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/class-summary.vm?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/class-summary.vm (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/class-summary.vm Sun Feb 11 06:53:52 2007 @@ -22,11 +22,11 @@ ## -#pageHeader($model.name) +#pageHeader($model.displayName) #topNavBar() -

    Class $model.name

    +

    Class $model.packageName.$model.shortClassName

    Summary

    Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-detail.vm URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-detail.vm?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-detail.vm (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-detail.vm Sun Feb 11 06:53:52 2007 @@ -22,23 +22,52 @@ ## -#pageHeader("Iteration $model.name") +#pageHeader("Iteration $model.displayName") #topNavBar() -

    Iteration $model.name

    +

    Iteration $model.displayName

    ## ## TODO: Include links to full runtests properties ## - ## - ## TODO: Include links to the log files - ## -

    Summary

    #groupSummary($model) + +

    Configuration

    + + + + + + + + + + + + +
    Tests$model.testConfiguration
    Options$model.optionsConfiguration
    + +

    Log Files

    + + #macro (logFileLink $model $file $desc) + + $file + $helper.logFileSize("$file") + $desc + + #end + + + #tableHeader(['Log File', 'Size', 'Description']) + + #logFileLink($model 'server.log' 'Geronimo server console log') + #logFileLink($model 'javatest.log' 'Full JavaTest log') + +

    Packages

    Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-frame.vm URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-frame.vm?view=diff&rev=506017&r1=506016&r2=506017 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-frame.vm (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-frame.vm Sun Feb 11 06:53:52 2007 @@ -22,13 +22,13 @@ ## -#pageHeader("Iteration $model.name") +#pageHeader("Iteration $model.displayName") - #frameHeading3("Iteration $model.name" "$baseURI/$model.href" 'detailFrame') + #frameHeading3("Iteration $model.displayName" "$baseURI/$model.href" 'detailFrame')