You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/02/11 15:53:53 UTC
svn commit: r506017 - in
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report:
./ model/ resources/ resources/boilerplate/
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 @@
<ul>
#foreach ($pkg in $model.packages)
- <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.name</a></li>
+ <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.displayName</a></li>
#end
</li>
</body>
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 @@
##
<html>
-#pageHeader($model.name)
+#pageHeader($model.displayName)
<body onload="windowTitle();">
#topNavBar()
- <h2>Class $model.name</h2>
+ <h2>Class <a href="$baseURI/$model.parent.href">$model.packageName</a>.$model.shortClassName</h2>
<h3>Summary</h3>
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 @@
##
<html>
-#pageHeader("Iteration $model.name")
+#pageHeader("Iteration $model.displayName")
<body onload="windowTitle();">
#topNavBar()
- <h2>Iteration $model.name</h2>
+ <h2>Iteration $model.displayName</h2>
##
## TODO: Include links to full runtests properties
##
- ##
- ## TODO: Include links to the log files
- ##
-
<h3>Summary</h3>
#groupSummary($model)
+
+ <h3>Configuration</h3>
+
+ <table>
+ <tbody>
+ <tr>
+ <td>Tests</td>
+ <td>$model.testConfiguration</td>
+ </tr>
+ <tr>
+ <td>Options</td>
+ <td>$model.optionsConfiguration</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <h3>Log Files</h3>
+
+ #macro (logFileLink $model $file $desc)
+ <tr>
+ <td><a href="$baseURI/${file}-${model.iterationIndex}.html">$file</a></td>
+ <td>$helper.logFileSize("$file")</td>
+ <td>$desc</td>
+ </tr>
+ #end
+
+ <table>
+ #tableHeader(['Log File', 'Size', 'Description'])
+ <tbody>
+ #logFileLink($model 'server.log' 'Geronimo server console log')
+ #logFileLink($model 'javatest.log' 'Full JavaTest log')
+ <tbody>
+ </table>
<h3>Packages</h3>
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 @@
##
<html>
-#pageHeader("Iteration $model.name")
+#pageHeader("Iteration $model.displayName")
<body>
- #frameHeading3("Iteration $model.name" "$baseURI/$model.href" 'detailFrame')
+ #frameHeading3("Iteration $model.displayName" "$baseURI/$model.href" 'detailFrame')
<ul>
#foreach ($pkg in $model.packages)
- <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.name</a></li>
+ <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.displayName</a></li>
#end
</li>
</body>
Added: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm?view=auto&rev=506017
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm (added)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm Sun Feb 11 06:53:52 2007
@@ -0,0 +1,33 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Id$
+##
+
+<html>
+#pageHeader("Iteration $model.displayName - $logFile.name")
+<body onload="windowTitle();">
+ #topNavBar()
+
+ <h2><a href="$baseURI/$model.href">Iteration $model.displayName</a> - $logFile.name</h2>
+
+ <pre class="logContents">$helper.eval("new File('$logFile').text")</pre>
+</body>
+</html>
Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-log.vm
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/macros.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/macros.vm?view=diff&rev=506017&r1=506016&r2=506017
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/macros.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/macros.vm Sun Feb 11 06:53:52 2007
@@ -153,7 +153,7 @@
#maybeSetFailedRowStyle($model)
<tr class="#toggleRowStyle2($style)">
<td align="center" width="20">#icon($model.statusIcon)</td>
- <td align="left"><a href="$baseURI/$model.href">$model.name</a></td>
+ <td align="left"><a href="$baseURI/$model.href">$model.displayName</a></td>
<td align="right">$model.count</td>
<td align="center" width="210">#barGraph($model.successRate)</td>
<td align="right">$model.duration</td>
@@ -164,7 +164,7 @@
#maybeSetFailedRowStyle($model)
<tr class="#toggleRowStyle2($style)">
<td align="center" width="20">#icon($model.statusIcon)</td>
- <td align="left"><a href="$baseURI/$model.href">$model.name</a></td>
+ <td align="left"><a href="$baseURI/$model.href">$model.displayName</a></td>
<td align="center">#icon($model.statusIcon)</td>
<td align="right">$model.duration</td>
</tr>
@@ -177,6 +177,12 @@
<td>Tests</td>
<td>$model.count</td>
</tr>
+ #if ($model.iteration)
+ <tr>
+ <td>Iteration</td>
+ <td><a href="$baseURI/$model.iteration.href">$model.iteration.displayName</td>
+ </tr>
+ #end
<tr>
<td>Passed</td>
<td>$model.passCount</td>
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-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/overview-frame.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm Sun Feb 11 06:53:52 2007
@@ -36,7 +36,7 @@
<ul>
#foreach ($iter in $model.iterations)
- <li><a href="$baseURI/iteration-${iter.name}-frame.html" target="packageFrame">$iter.name</a></li>
+ <li><a href="$baseURI/$iter.frameHref" target="packageFrame">$iter.displayName</a></li>
#end
</li>
</body>
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-summary.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-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/package-summary.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-summary.vm Sun Feb 11 06:53:52 2007
@@ -22,11 +22,11 @@
##
<html>
-#pageHeader($model.name)
+#pageHeader($model.displayName)
<body onload="windowTitle();">
#topNavBar()
- <h2>Package $model.name</h2>
+ <h2>Package $model.displayName</h2>
<h3>Summary</h3>
Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/testcase-detail.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/testcase-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/testcase-detail.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/testcase-detail.vm Sun Feb 11 06:53:52 2007
@@ -22,11 +22,11 @@
##
<html>
-#pageHeader($testCase.name)
+#pageHeader($model.displayName)
<body onload="windowTitle();">
#topNavBar()
- <h2>TestCase $testCase.name</h2>
+ <h2>TestCase <a href="$baseURI/$model.parent.parent.href">${model.packageName}</a>.<a href="$baseURI/$model.parent.href">$model.shortClassName</a>#${model.testName}</h2>
<h3>Summary</h3>
@@ -34,11 +34,11 @@
<tbody>
<tr>
<td>Name</td>
- <td>$testCase.name</td>
+ <td>$model.displayName</td>
</tr>
<tr>
<td>Iteration</td>
- <td><a href="$baseURI/$model.iteration.href">$model.iteration.name</td>
+ <td><a href="$baseURI/$model.iteration.href">$model.iteration.displayName</td>
</tr>
<tr>
<td>Result File</td>
@@ -56,23 +56,23 @@
</tr>
<tr>
<td>Class</td>
- <td>$testCase.className</td>
+ <td>$model.className</td>
</tr>
<tr>
<td>Test</td>
- <td>$testCase.testName</td>
+ <td>$model.testName</td>
</tr>
<tr>
<td>Started</td>
- <td>$testCase.started</td>
+ <td>$model.started</td>
</tr>
<tr>
<td>Ended</td>
- <td>$testCase.ended</td>
+ <td>$model.ended</td>
</tr>
<tr>
<td>Duration</td>
- <td>$testCase.duration</td>
+ <td>$model.duration</td>
</tr>
<tr>
@@ -115,7 +115,7 @@
#foreach ($stream in $section.streams)
<h5>$stream.name ($stream.lines lines, $stream.chars chars)</h5>
#if ($stream.lines > 0)
- <pre>$stream.data</pre>
+ <pre class="sectionStreamData">$stream.data</pre>
#end
#end
#end