geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r505907 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report: ./ model/ resources/ resources/boilerplate/
Date Sun, 11 Feb 2007 11:59:31 GMT
Author: jdillon
Date: Sun Feb 11 03:59:30 2007
New Revision: 505907

URL: http://svn.apache.org/viewvc?view=rev&rev=505907
Log:
Added bits to create synthetic testcase classnames if the jtr filename does not sync up with its contents
Test case know has details about its result file path, flag to show if synthetic names were used, original name
Using model.href for all elements, template roots to $baseURI
Exposed IterationModel to TestCaseModel directly so it can get details better
Dropped filename sanity check muck, was causing problems with some tests that had '.' in the testName
Packages are all flat peers now
Added render helping closures to clean up the main report gen
Runtests props now in iter model
Web container now in suite model
Bunch of fixes optimizations of templates

Added:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm   (with props)
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm   (with props)
Removed:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/all-iterations-frame.vm
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/TestCase.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/SuiteModel.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestCaseModel.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/index.html
    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/iteration-overview.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/non-passing-overview.vm
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-overview.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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -48,11 +48,21 @@
     }
     
     def render() {
+        file.parentFile.mkdirs()
+        
+        // println "Rendering: $file"
+        
         template.render(file)
     }
     
+    //
+    // Helper functions
+    //
+    
     def eval(String expr) {
         assert expr
+        
+        // println "Evaluating expression: $expr"
         
         return shell.evaluate(expr)
     }

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -86,21 +86,6 @@
         return props
     }
     
-    def makeSafeFilename(String filename) {
-        assert filename
-        
-        int i = filename.lastIndexOf('.')
-        
-        filename = filename.replace('.', '/')
-        filename = filename.replace('#', '_')
-        
-        if (i != -1) {
-            filename = new StringBuffer(filename).replace(i, i + 1, '.').toString()
-        }
-        
-        return filename
-    }
-    
     private URI baseURI(File baseDir, File targetFile) {
         assert baseDir
         assert targetFile
@@ -122,44 +107,47 @@
         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)
-        
         def workDir = new File('target/work').canonicalFile
         
         // Make sure we start out with a clean slate
         ant.delete(dir: workDir)
         ant.delete(dir: targetDir)
         
-        def installBoilerplate = {
-            log.info "Installing boilerplate"
-            
-            // Install boilerplate resources
-            def url = getClass().classLoader.getResource('gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate')
-            assert url != null
-            assert url.protocol == 'file'
-            
-            ant.copy(todir: targetDir) {
-                fileset(dir: url.path) {
-                    include(name: '**')
-                }
-            }
-        }
+        // Once its sane, start the report
+        log.info 'Generate report'
+        def suiteModel = new SuiteModel()
         
-        def createRenderer = { templateName, targetPath ->
-            def outputFile = new File(targetDir, makeSafeFilename(targetPath)).canonicalFile
-            
-            def template = engine.getTemplate(templateName)
-            
-            template.params.baseURI = baseURI(targetDir, outputFile.parentFile)
-            
-            return new PageRenderer(template, outputFile)
+        // Renders a template with a given model
+        def renderWithModel = { model, template, file ->
+            def renderer = createRenderer(template, file)
+            renderer.params.model = model
+            renderer.render()
         }
         
-        def suiteModel = new SuiteModel()
+        // Renders a template with the suite model
+        def renderWithSuite = { template, file ->
+            renderWithModel(suiteModel, template, file)
+        }
         
         //
-        // TODO: Load the iterations.xml configuration so we can use that for rendering
+        // TODO: Load the iterations.xml configuration so we can use that for rendering ?
         //
         
         archives.each { archive ->
@@ -169,20 +157,15 @@
             
             // Unpack the results
             log.info 'Unpacking result files'
+            ant.mkdir(dir: workDir)
             ant.unzip(src: archive, dest: workDir)
             
             // Load runtests.properties, so we can see webcontainer and iteration (and others)
             log.debug 'Loading results properties'
             def props = loadProperties("$workDir/runtests.properties")
-            def iteration = props.iteration
-            log.info "Iteration: $iteration"
             
             // Create a new model for the iter to capture stats
-            def iterModel = suiteModel.createIteration(iteration)
-            
-            //
-            // TODO: Set iteration config properties
-            //
+            def iterModel = suiteModel.createIteration(props)
             
             // Scan for result files
             def resultsDir = new File(workDir, 'javatest')
@@ -195,97 +178,56 @@
             // Process each result
             log.info 'Processing test results'
             scanner.each { file ->
-                //
-                // TODO: Need to handle some cases where the report uses a classname
-                //       that does not match the jtr, which happens for some jaxp tests
-                //       Need to use the .jtr relative to the work/javatest dir
-                //       to create a synthetic classname for it
-                //
-                
-                def testCase = TestCase.fromFile(file)
-                
-                //
-                // HACK: Try to figure out stupid jaxp test case
-                //
-                
-                if (testCase.name == 'com.sun.ts.tests.jaxp.api.xml_schema.XmlSchemaRunner#Positive_from_servlet') {
-                    println "Positive_from_servlet: $file"
-                }
-                if (testCase.name == 'com.sun.ts.tests.jaxp.api.xml_schema.XmlSchemaRunner#Negative_from_servlet') {
-                    println "Positive_from_servlet: $file"
-                }
-                
+                def testCase = TestCase.fromFile(resultsDir, file)
                 def model = iterModel << testCase
                 
-                //
-                // FIXME: testCase.name *might* have '.' in it which will hose up the
-                //        safe-ness... might want to have *all* packages exist as
-                //        flat peers with . names, then use exact name from testCase.name
-                //        for report detail.
-                
                 // Render testcase detail
-                def renderer = createRenderer('testcase-detail.vm', "${testCase.name}.html")
+                def renderer = createRenderer('testcase-detail.vm', model.href)
                 renderer.params.testCase = testCase
                 renderer.params.model = model
                 renderer.render()
             }
             
-            // Render class summaries
+            log.info 'Rendering class summaries'
             iterModel.classes.each { model ->
-                def renderer = createRenderer('class-summary.vm', "${model.name}.html")
-                renderer.params.model = model
-                renderer.render()
+                renderWithModel(model, 'class-summary.vm', model.href)
             }
             
-            // Render package summaries
+            log.info 'Rendering package summaries'
             iterModel.packages.each { model ->
-                def renderer = createRenderer('package-summary.vm', "${model.name}/package-summary.html")
-                renderer.params.model = model
-                renderer.render()
+                renderWithModel(model, 'package-summary.vm', model.href)
             }
             
-            def renderer
-            
-            // Render iteration detail
-            renderer = createRenderer('iteration-detail.vm', "iteration-${iteration}.html")
-            renderer.params.model = iterModel
-            renderer.render()
-            
-            // Render iteration frame
-            renderer = createRenderer('iteration-frame.vm', "iteration-${iteration}-frame.html")
-            renderer.params.model = iterModel
-            renderer.render()
+            log.info 'Rendering iteration bits'
+            renderWithModel(iterModel, 'iteration-detail.vm', iterModel.href)
+            renderWithModel(iterModel, 'iteration-frame.vm', iterModel.frameHref)
             
             // Clean up for the next iteration
             ant.delete(dir: workDir)
         }
         
-        def renderer
+        log.info "Rendering overview bits"
+        renderWithSuite('iteration-overview.vm', "iteration-overview.html")
+        renderWithSuite('package-overview.vm', "package-overview.html")
+        renderWithSuite('non-passing-overview.vm', "non-passing-overview.html")
+        renderWithSuite('overview-summary.vm', "overview-summary.html")
+        renderWithSuite('overview-frame.vm', "overview-frame.html")
+        renderWithSuite('all-packages-frame.vm', "all-packages-frame.html")
         
-        // Render the iteration overview
-        renderer = createRenderer('iteration-overview.vm', "iteration-overview.html")
-        renderer.params.model = suiteModel
-        renderer.render()
-        
-        // Render the package overview
-        renderer = createRenderer('package-overview.vm', "package-overview.html")
-        renderer.params.model = suiteModel
-        renderer.render()
-        
-        // Render the non-passing tests overview
-        renderer = createRenderer('non-passing-overview.vm', "non-passing-overview.html")
-        renderer.params.model = suiteModel
-        renderer.render()
-        
-        // Render the all iterations frame
-        renderer = createRenderer('all-iterations-frame.vm', "all-iterations-frame.html")
-        renderer.params.model = suiteModel
-        renderer.render()
-        
-        // Render the all packages frame
-        renderer = createRenderer('all-packages-frame.vm', "all-packages-frame.html")
-        renderer.params.model = suiteModel
-        renderer.render()
+        def installBoilerplate = {
+            log.info "Installing boilerplate"
+            
+            // Install boilerplate resources
+            def url = getClass().classLoader.getResource('gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate')
+            assert url != null
+            assert url.protocol == 'file'
+            
+            ant.copy(todir: targetDir) {
+                fileset(dir: url.path) {
+                    include(name: '**')
+                }
+            }
+        }
         
         installBoilerplate()
     }

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/TestCase.groovy Sun Feb 11 03:59:30 2007
@@ -38,16 +38,33 @@
     // Parses out dates formated like: Thu Feb 01 00:24:56 PST 2007
     static final DATE_FORMAT = new SimpleDateFormat('EEE MMM dd HH:mm:ss z yyyy')
     
+    /** The test result (or proxy to a result). */
     def result
     
-    def TestCase(result) {
+    /** The relative path of the .jtr result file. */
+    String resultFilePath
+    
+    /** Flag to indiate that synthetic names were used due to jtr inconsistencies. */
+    boolean syntheticNames = false
+    
+    /** Exposed to show what the original name was before we make synthetic ones. */
+    String originalName
+    
+    private String className
+    
+    private String testName
+    
+    private TestCase(result) {
         assert result
         
         this.result = result
     }
     
     String getClassName() {
-        return result.testdescription['classname']
+        if (!className) {
+            className = result.testdescription['classname']
+        }
+        return className
     }
     
     String getPackageName() {
@@ -55,14 +72,17 @@
     }
     
     String getTestName() {
-        //
-        // NOTE: 'testName' is not unique, so we have to use 'id'
-        //
-        return result.testdescription['id']
+        if (!testName) {
+            //
+            // NOTE: 'testName' is not unique, so we have to use 'id'
+            //
+            testName = result.testdescription['id']
+        }
+        return testName
     }
     
     String getName() {
-        return "$className#$testName"
+        return getClassName() + '#' + getTestName()
     }
     
     Date getStarted() {
@@ -136,12 +156,58 @@
         return result.testresult
     }
     
-    static TestCase fromFile(file) {
+    //
+    // TestCase Creation
+    //
+    
+    static LOG = LogSupport.getLog(this)
+    
+    static void applySyntheticNames(TestCase testCase) {
+        def path = testCase.resultFilePath
+        
+        def i = path.lastIndexOf('/')
+                    
+        def packagePart = path.substring(0, i)
+        def classTestPart = path.substring(i + 1, path.size())
+        def j = classTestPart.indexOf('_')
+        
+        testCase.syntheticNames = true
+        testCase.originalName = testCase.name
+        testCase.className = (packagePart + "/" + classTestPart.substring(0, j)).replace('/', '.')
+        testCase.testName = classTestPart.substring(j + 1, classTestPart.size() - 4 /*.jtr*/)
+        
+        if (LOG.debugEnabled) {
+            LOG.debug "Using syntetic name: $testCase.name"
+            LOG.debug "           for file: $path"
+            LOG.debug "               orig: $testCase.originalName"
+        }
+    }
+    
+    static TestCase fromFile(File baseDir, File file) {
+        assert baseDir
         assert file
         
-        file = new File("$file")
         def factory = { new TestResult(it) }.curry(file)
-        return new TestCase(new LazyProxy(factory))
+        def testCase = new TestCase(new LazyProxy(factory))
+        
+        //
+        // NOTE: Handle some sanity issues, some results contain some bunk data, so
+        //       if we find something, make synthetic names
+        //
+        
+        testCase.resultFilePath = baseDir.toURI().relativize(file.toURI()).getPath()
+        
+        if (testCase.testName.contains('.')) {
+            applySyntheticNames(testCase)
+        }
+        else {
+            def expectName = "${testCase.className.replace('.','/')}_${testCase.testName}.jtr"
+            if (testCase.resultFilePath != expectName) {
+                applySyntheticNames(testCase)
+            }
+        }
+        
+        return testCase
     }
 }
 

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -36,14 +36,9 @@
         super(name, 'name', TestCaseModel)
     }
     
-    //
-    // HACK: Try and detect duplicate test names
-    //
-    
     def leftShift(gbuild.config.projects.Geronimo_CTS.report.TestCase testCase) {
-        if (children.containsKey(testCase.name)) {
-            println "ERROR: Duplicate test case name: ${testCase.name}"
-        }
+        // Make sure no duplicate test names are added
+        assert !children.containsKey(testCase.name)
         
         return super.leftShift(testCase)
     }
@@ -60,9 +55,16 @@
         return testNames.size()
     }
     
+    String getPackageName() {
+        return name.substring(0, name.lastIndexOf('.'))
+    }
+    
+    String getShortClassName() {
+        return name.substring(name.lastIndexOf('.') + 1, name.size())
+    }
+    
     String getHref() {
-        def shortName = name.substring(name.lastIndexOf('.') + 1, name.size())
-        return shortName.replace('.', '/').replace('#', '_') + '.html'
+        return "${packageName}/${shortClassName}.html"
     }
 }
 

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -34,6 +34,8 @@
  */
 class IterationModel extends GroupModel
 {
+    Map runtestsProperties
+    
     def IterationModel(String name) {
         super(name, 'packageName', PackageModel)
     }
@@ -82,12 +84,6 @@
         return classNames.size()
     }
     
-    Collection getTests() {
-        //
-        // TODO:
-        //
-    }
-    
     List getTestNames() {
         return aggregateChildValues('testNames')
     }
@@ -98,6 +94,10 @@
     
     String getHref() {
         return "iteration-${name}.html"
+    }
+    
+    String getFrameHref() {
+        return "iteration-${name}-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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -68,7 +68,7 @@
     }
     
     String getHref() {
-        return name.replace('.', '/').replace('#', '_') + '/package-summary.html'
+        return "${name}/package-summary.html"
     }
 }
 

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/SuiteModel.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/SuiteModel.groovy?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/SuiteModel.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/SuiteModel.groovy Sun Feb 11 03:59:30 2007
@@ -43,9 +43,15 @@
         super("TestSuite")
     }
     
-    IterationModel createIteration(iter) {
-        def name = String.valueOf(iter)
-        return addChild(name, new IterationModel(name))
+    IterationModel createIteration(Map props) {
+        assert props
+        assert props.iteration
+        
+        def name = String.valueOf(props.iteration)
+        def model = new IterationModel(name)
+        model.runtestsProperties = props
+        
+        return addChild(name, model)
     }
     
     def leftShift(TestCase testCase) {
@@ -78,12 +84,6 @@
         return packageNames.size()
     }
     
-    Collection getClasses() {
-        //
-        // TODO:
-        //
-    }
-    
     List getClassNames() {
         return aggregateChildValues('classNames')
     }
@@ -108,6 +108,13 @@
     
     long getTestCount() {
         return testNames.size()
+    }
+    
+    String getWebContainer() {
+        //
+        // NOTE: Assume all iterations have the same value (they should)
+        //
+        return children.values().iterator().next().runtestsProperties.webcontainer
     }
 }
 

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestCaseModel.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestCaseModel.groovy?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestCaseModel.groovy (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/TestCaseModel.groovy Sun Feb 11 03:59:30 2007
@@ -31,8 +31,6 @@
  */
 class TestCaseModel extends TestModel
 {
-    int iteration
-    
     String className
     
     String testName
@@ -51,11 +49,6 @@
         super(name)
     }
     
-    //
-    // HACK: Can't seem to add our selves to the listener list, so force the event
-    //       to be run instead...
-    //
-    
     def leftShift(TestCase testCase) {
         def model = super.leftShift(testCase)
         
@@ -65,7 +58,6 @@
     }
     
     def testCaseAdded(TestCase testCase) {
-        this.iteration = parent.parent.parent.name.toInteger()
         this.className = testCase.className
         this.testName = testCase.testName
         this.started = testCase.started
@@ -75,13 +67,20 @@
         this.status = testCase.status
     }
     
-    String getHref() {
-        def shortName = name.substring(name.lastIndexOf('.') + 1, name.size())
-        return shortName.replace('.', '/').replace('#', '_') + '.html'
+    IterationModel getIteration() {
+        return parent.parent.parent
+    }
+    
+    String getPackageName() {
+        return className.substring(0, className.lastIndexOf('.'))
     }
     
-    String getFullHref() {
-        return name.replace('.', '/').replace('#', '_') + '.html'
+    String getShortClassName() {
+        return className.substring(className.lastIndexOf('.') + 1, className.size())
+    }
+    
+    String getHref() {
+        return "${packageName}/${shortClassName}_${testName}.html"
     }
     
     boolean getPassed() {
@@ -99,10 +98,5 @@
             return 'icon_warning_sml.gif'
         }
     }
-    
-    //
-    // TODO: Need to have acces to the parent model so we can find out details
-    //       like what iteration we are in
-    //
 }
 

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -24,11 +24,11 @@
 <html>
 #pageHeader('All Packages')
 <body>
-    <h2><a href="package-overview.html" target="detailFrame">Packages</a></h2>
+    #frameHeading3('Packages' "$baseURI/package-overview.html" 'detailFrame')
     
     <ul>
         #foreach ($pkg in $model.packages)
-            <li><a href="$pkg.href" target="detailFrame">$pkg.name</a></li>
+            <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.name</a></li>
         #end
     </li>
 </body>

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/index.html
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/index.html?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/index.html (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/boilerplate/index.html Sun Feb 11 03:59:30 2007
@@ -23,24 +23,25 @@
 <head>
     <title>TCK Testsuite Report</title>
     <script type="text/javascript">
-    targetPage = "" + window.location.search
-    if (targetPage != "" && targetPage != "undefined") {
-       targetPage = targetPage.substring(1)
-    }
-    function loadFrames() {
+        targetPage = "" + window.location.search
         if (targetPage != "" && targetPage != "undefined") {
-             top.classFrame.location = top.targetPage
+           targetPage = targetPage.substring(1)
+        }
+        
+        function loadFrames() {
+            if (targetPage != "" && targetPage != "undefined") {
+                 top.detailFrame.location = top.targetPage
+            }
         }
-    }
     </script>
 <head>
 
 <frameset cols="20%,80%" title="" onLoad="top.loadFrames()">
     <frameset rows="20%,80%" title="" onLoad="top.loadFrames()">
-        <frame src="all-iterations-frame.html" name="iterationListFrame" title="Iterations">
+        <frame src="overview-frame.html" name="iterationListFrame" title="Iterations">
         <frame src="all-packages-frame.html" name="packageFrame" title="Packages">
     </frameset>
-    <frame src="iteration-overview.html" name="detailFrame" title="Details" scrolling="yes">
+    <frame src="overview-summary.html" name="detailFrame" title="Details" scrolling="yes">
 </frameset>
 </html>
 

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -27,14 +27,13 @@
 }
 
 a:link {
- color: #00f;
+    color: #00f;
 }
 a:visited {
- color: #00a;
+    color: #00a;
 }
-
 a:active, a:hover {
- color: #f30 !important;
+    color: #f30 !important;
 }
 
 ul, li {
@@ -115,6 +114,34 @@
 hr {
 	height: 1px;
 	color: #000;
+}
+
+/* Top Nav Bar */
+
+table.topNavBar {
+    /* ??? */
+}
+
+div.topNavBarButtons {
+    font-size: 10px;
+    text-align: right;
+}
+
+td.topNavBarCell {
+    background-color:#EEEEFF; /* Light mauve */
+    color:#000000;
+}
+
+/* Frames */
+
+div.frameTitle {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+div.frameHeading {
+    font-size: 12px;
+    font-weight: bold;
 }
 
 /* Tables */

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -23,41 +23,14 @@
 
 <html>
 #pageHeader($model.name)
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Class $model.name</h2>
     
     <h3>Summary</h3>
     
-    <table>
-        <tbody>
-            <tr>
-                <td>Tests</td>
-                <td>$model.count</td>
-            </tr>
-            <tr>
-                <td>Passed</td>
-                <td>$model.passCount</td>
-            </tr>
-            <tr>
-                <td>Failed</td>
-                <td>$model.failureCount</td>
-            </tr>
-            <tr>
-                <td>Errors</td>
-                <td>$model.errorCount</td>
-            </tr>
-            <tr>
-                <td>Success Rate</td>
-                <td align="center" width="210">#barGraph($model.successRate)</td>
-            </tr>
-            <tr>
-                <td>Duration</td>
-                <td>$model.duration</td>
-            </tr>
-        </tbody>
-    </table>
+    #groupSummary($model)
     
     <h3>Tests</h3>
     
@@ -67,17 +40,7 @@
         <tbody>
             #resetRowStyle()
             #foreach ($test in $model.tests)
-                #if ($test.passed)
-                    #set ($style = '')
-                #else
-                    #set ($style = '_failed')
-                #end
-                <tr class="#toggleRowStyle2($style)">
-                    <td align="center" width="20">#icon($test.statusIcon)</td>
-                    <td align="left"><a href="$test.href">$test.testName</a></td>
-                    <td align="center">#testStatus($test)</a></td>
-                    <td align="right">$test.duration</a></td>
-                </tr>
+                #testSummaryItem($test)
             #end
         </tbody>
     </table>

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -22,42 +22,23 @@
 ##
 
 <html>
-#pageHeader($model.name)
-<body>
+#pageHeader("Iteration $model.name")
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Iteration $model.name</h2>
     
+    ##
+    ## TODO: Include links to full runtests properties
+    ##
+    
+    ##
+    ## TODO: Include links to the log files
+    ##
+    
     <h3>Summary</h3>
     
-    <table>
-        <tbody>
-            <tr>
-                <td>Tests</td>
-                <td>$model.count</td>
-            </tr>
-            <tr>
-                <td>Passed</td>
-                <td>$model.passCount</td>
-            </tr>
-            <tr>
-                <td>Failed</td>
-                <td>$model.failureCount</td>
-            </tr>
-            <tr>
-                <td>Errors</td>
-                <td>$model.errorCount</td>
-            </tr>
-            <tr>
-                <td>Success Rate</td>
-                <td align="center" width="210">#barGraph($model.successRate)</td>
-            </tr>
-            <tr>
-                <td>Duration</td>
-                <td>$model.duration</td>
-            </tr>
-        </tbody>
-    </table>
+    #groupSummary($model)
     
     <h3>Packages</h3>
     
@@ -67,18 +48,7 @@
         <tbody>
             #resetRowStyle()
             #foreach ($pkg in $model.packages)
-                #if ($pkg.passed)
-                    #set ($style = '')
-                #else
-                    #set ($style = '_failed')
-                #end
-                <tr class="#toggleRowStyle2($style)">
-                    <td align="center" width="20">#icon($pkg.statusIcon)</td>
-                    <td align="left"><a href="$pkg.href">$pkg.name</a></td>
-                    <td align="right">$pkg.count</td>
-                    <td align="center" width="210">#barGraph($pkg.successRate)</td>
-                    <td align="right">$pkg.duration</td>
-                </tr>
+                #subGroupSummaryItem($pkg)
             #end
         </tbody>
     </table>

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -24,11 +24,11 @@
 <html>
 #pageHeader("Iteration $model.name")
 <body>
-    <h2><a href="$model.href" target="detailFrame">Iteration $model.name</a> | <a href="all-packages-frame.html">All</a></h2>
+    #frameHeading3("Iteration $model.name" "$baseURI/$model.href" 'detailFrame')
     
     <ul>
         #foreach ($pkg in $model.packages)
-            <li><a href="$pkg.href" target="detailFrame">$pkg.name</a></li>
+            <li><a href="$baseURI/$pkg.href" target="detailFrame">$pkg.name</a></li>
         #end
     </li>
 </body>

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-overview.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-overview.vm?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-overview.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/iteration-overview.vm Sun Feb 11 03:59:30 2007
@@ -23,7 +23,7 @@
 
 <html>
 #pageHeader('Iterations')
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Iterations</h2>
@@ -34,18 +34,7 @@
         <tbody>
             #resetRowStyle()
             #foreach ($iter in $model.iterations)
-                #if ($iter.passed)
-                    #set ($style = '')
-                #else
-                    #set ($style = '_failed')
-                #end
-                <tr class="#toggleRowStyle2($style)">
-                    <td align="center" width="20">#icon($iter.statusIcon)</td>
-                    <td align="left"><a href="$iter.href">$iter.name</a></td>
-                    <td align="right">$iter.count</td>
-                    <td align="center" width="210">#barGraph($iter.successRate)</td>
-                    <td align="right">$iter.duration</td>
-                </tr>
+                #subGroupSummaryItem($iter)
             #end
         </tbody>
     </table>

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -21,32 +21,61 @@
 ## $Id$
 ##
 
+#macro (spacer $height $width)
+    <img src="${baseURI}/images/spacer.gif" border="0" height="$height" width="$width"/>
+#end
+
 #macro (pageHeader $title)
     <head>
         <title>$title</title>
         <link rel="stylesheet" type="text/css" href="${baseURI}/stylesheet.css" title="style"/>
+        <script type="text/javascript">
+            function windowTitle() {
+                parent.document.title = "$title"
+            }
+        </script>
+        <noscript>
+        </noscript>
     </head>
 #end
 
-#macro (icon $filename)
-    <img src="${baseURI}/images/$filename" border="0"/>
+#macro (frameTitle $title)
+    <div class="frameTitle">$title</div>
+    #spacer(10 1)
 #end
 
-#macro (spacer $height $width)
-    <img src="${baseURI}/images/spacer.gif" border="0" height="$height" width="$width"/>
+#macro (frameHeading $title)
+    <div class="frameHeading">$title</div>
+    #spacer(10 1)
+#end
+
+#macro (frameHeading3 $title $href $target)
+    <div class="frameHeading"><a href="$href" target="$target">$title</a></div>
+    #spacer(10 1)
+#end
+
+#macro (icon $filename)
+    <img src="${baseURI}/images/$filename" border="0"/>
 #end
 
 #macro (topNavBar)
-    <table>
+    <table class="topNavBar">
         <tbody>
-            <tr>
-                <td><a href="${baseURI}/iteration-overview.html">Iterations</td>
-                <td><a href="${baseURI}/package-overview.html">Packages</td>
-                <td><a href="${baseURI}/non-passing-overview.html">Non-Passing</td>
+            <tr align="center" valign="top">
+                <td class="topNavBarCell"><a href="${baseURI}/overview-summary.html">Overview</td>
+                <td class="topNavBarCell"><a href="${baseURI}/iteration-overview.html">Iterations</td>
+                <td class="topNavBarCell"><a href="${baseURI}/package-overview.html">Packages</td>
+                <td class="topNavBarCell"><a href="${baseURI}/non-passing-overview.html">Non-Passing</td>
             </tr>
         </tbody>
     </table>
-    <hr/>
+    
+    <div>#spacer(5 1)</div>
+    
+    <div class="topNavBarButtons">
+        <a href="javascript:parent.document.location.href='$baseURI/index.html?$pageHref';">FRAMES</a> |
+        <a href="javascript:parent.document.location.href='$baseURI/$pageHref';">NO FRAMES</a>
+    </div>
 #end
 
 #macro (tableHeader $names)
@@ -67,6 +96,14 @@
     #set($_rowStyle = 'unset')
 #end
 
+#macro (maybeSetFailedRowStyle $model)
+    #if ($model.passed)
+        #set ($style = '')
+    #else
+        #set ($style = '_failed')
+    #end
+#end
+
 #macro (propertiesTable $map)
     <table>
         #tableHeader(['Name', 'Value'])
@@ -112,6 +149,54 @@
     </table>
 #end
 
-#macro (testCaseIterationLink $test)
-    <a href="${baseURI}/iteration-${test.iteration}.html">$test.iteration</a>
+#macro (subGroupSummaryItem $model)
+    #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="right">$model.count</td>
+        <td align="center" width="210">#barGraph($model.successRate)</td>
+        <td align="right">$model.duration</td>
+    </tr>
+#end
+
+#macro (testSummaryItem $model)
+    #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="center">#icon($model.statusIcon)</td>
+        <td align="right">$model.duration</td>
+    </tr>
+#end
+
+#macro (groupSummary $model)
+    <table>
+        <tbody>
+            <tr>
+                <td>Tests</td>
+                <td>$model.count</td>
+            </tr>
+            <tr>
+                <td>Passed</td>
+                <td>$model.passCount</td>
+            </tr>
+            <tr>
+                <td>Failed</td>
+                <td>$model.failureCount</td>
+            </tr>
+            <tr>
+                <td>Errors</td>
+                <td>$model.errorCount</td>
+            </tr>
+            <tr>
+                <td>Success Rate</td>
+                <td align="center" width="210">#barGraph($model.successRate)</td>
+            </tr>
+            <tr>
+                <td>Duration</td>
+                <td>$model.duration</td>
+            </tr>
+        </tbody>
+    </table>
 #end

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/non-passing-overview.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/non-passing-overview.vm?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/non-passing-overview.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/non-passing-overview.vm Sun Feb 11 03:59:30 2007
@@ -23,24 +23,23 @@
 
 <html>
 #pageHeader('Non-passing Tests')
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Non-passing Tests</h2>
     
+    ##
+    ## TODO: Sumamry of errors/failed
+    ##
+    
     <table>
         #tableHeader(['', 'Test', 'Status', 'Duration'])
         
         <tbody>
             #resetRowStyle()
             #foreach ($test in $model.tests)
-                #if (!$test.status.passed)
-                    <tr class="#toggleRowStyle()">
-                        <td align="center" width="20">#icon($test.statusIcon)</td>
-                        <td align="left"><a href="$test.fullHref">$test.name</a></td>
-                        <td align="center">#testStatus($test)</a></td>
-                        <td align="right">$test.duration</a></td>
-                    </tr>
+                #if (!$test.passed)
+                    #testSummaryItem($test)
                 #end
             #end
         </tbody>

Added: 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=auto&rev=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm (added)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm Sun Feb 11 03:59:30 2007
@@ -0,0 +1,43 @@
+##
+## 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('Overview')
+<body>
+    #frameTitle('Overview')
+    
+    <ul>
+        <li><a href="$baseURI/all-packages-frame.html" target="packageFrame">All Packages</a></li>
+    </ul>
+    
+    #spacer(10 1)
+    
+    #frameHeading3('Iterations' "$baseURI/iteration-overview.html" 'detailFrame')
+    
+    <ul>
+        #foreach ($iter in $model.iterations)
+            <li><a href="$baseURI/iteration-${iter.name}-frame.html" target="packageFrame">$iter.name</a></li>
+        #end
+    </li>
+</body>
+</html>

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-frame.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm?view=auto&rev=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm (added)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm Sun Feb 11 03:59:30 2007
@@ -0,0 +1,93 @@
+##
+## 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('Overview')
+<body onload="windowTitle();">
+    #topNavBar()
+    
+    <h2>Summary</h2>
+    
+    <table>
+        <tbody>
+            <tr>
+                <td>Iterations</td>
+                <td>$model.iterationCount</td>
+            </tr>
+            <tr>
+                <td>Packages</td>
+                <td>$model.packageCount</td>
+            </tr>
+            <tr>
+                <td>Classes</td>
+                <td>$model.classCount</td>
+            </tr>
+            <tr>
+                <td>Tests</td>
+                <td>$model.count</td>
+            </tr>
+            <tr>
+                <td>Passed</td>
+                <td>$model.passCount</td>
+            </tr>
+            <tr>
+                <td>Failed</td>
+                <td>$model.failureCount</td>
+            </tr>
+            <tr>
+                <td>Errors</td>
+                <td>$model.errorCount</td>
+            </tr>
+            <tr>
+                <td>Success Rate</td>
+                <td align="center" width="210">#barGraph($model.successRate)</td>
+            </tr>
+            
+            ##
+            ## TODO: Start/end timestamp
+            ##
+            
+            <tr>
+                <td>Duration</td>
+                <td>$model.duration</td>
+            </tr>
+        </tbody>
+    </table>
+    
+    <h2>Assembly</h2>
+    
+    ##
+    ## TODO: More details on the CTS assembly (and the G assembly its built on)
+    ##
+    
+    <table>
+        <tbody>
+            <tr>
+                <td>Web Container</td>
+                <td>$model.webContainer</td>
+            </tr>
+        </tbody>
+    </table>
+
+</body>
+</html>

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/overview-summary.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-overview.vm
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-overview.vm?view=diff&rev=505907&r1=505906&r2=505907
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-overview.vm (original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/resources/package-overview.vm Sun Feb 11 03:59:30 2007
@@ -23,7 +23,7 @@
 
 <html>
 #pageHeader('Packages')
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Packages</h2>
@@ -34,18 +34,7 @@
         <tbody>
             #resetRowStyle()
             #foreach ($pkg in $model.packages)
-                #if ($pkg.passed)
-                    #set ($style = '')
-                #else
-                    #set ($style = '_failed')
-                #end
-                <tr class="#toggleRowStyle2($style)">
-                    <td align="center" width="20">#icon($pkg.statusIcon)</td>
-                    <td align="left"><a href="$pkg.href">$pkg.name</a></td>
-                    <td align="right">$pkg.count</td>
-                    <td align="center" width="210">#barGraph($pkg.successRate)</td>
-                    <td align="right">$pkg.duration</td>
-                </tr>
+                #subGroupSummaryItem($pkg)
             #end
         </tbody>
     </table>

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -23,41 +23,14 @@
 
 <html>
 #pageHeader($model.name)
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>Package $model.name</h2>
     
     <h3>Summary</h3>
     
-    <table>
-        <tbody>
-            <tr>
-                <td>Tests</td>
-                <td>$model.count</td>
-            </tr>
-            <tr>
-                <td>Passed</td>
-                <td>$model.passCount</td>
-            </tr>
-            <tr>
-                <td>Failed</td>
-                <td>$model.failureCount</td>
-            </tr>
-            <tr>
-                <td>Errors</td>
-                <td>$model.errorCount</td>
-            </tr>
-            <tr>
-                <td>Success Rate</td>
-                <td align="center" width="210">#barGraph($model.successRate)</td>
-            </tr>
-            <tr>
-                <td>Duration</td>
-                <td>$model.duration</td>
-            </tr>
-        </tbody>
-    </table>
+    #groupSummary($model)
     
     <h3>Classes</h3>
     
@@ -67,18 +40,7 @@
         <tbody>
             #resetRowStyle()
             #foreach ($clazz in $model.classes)
-                #if ($clazz.passed)
-                    #set ($style = '')
-                #else
-                    #set ($style = '_failed')
-                #end
-                <tr class="#toggleRowStyle2($style)">
-                    <td align="center" width="20">#icon($clazz.statusIcon)</td>
-                    <td align="left"><a href="$clazz.href">$clazz.name</a></td>
-                    <td align="right">$clazz.count</td>
-                    <td align="center" width="210">#barGraph($clazz.successRate)</td>
-                    <td align="right">$clazz.duration</td>
-                </tr>
+                #subGroupSummaryItem($clazz)
             #end
         </tbody>
     </table>
@@ -92,17 +54,7 @@
             #resetRowStyle()
             #foreach ($clazz in $model.classes)
                 #foreach ($test in $clazz.tests)
-                    #if ($test.passed)
-                        #set ($style = '')
-                    #else
-                        #set ($style = '_failed')
-                    #end
-                    <tr class="#toggleRowStyle2($style)">
-                        <td align="center" width="20">#icon($test.statusIcon)</td>
-                        <td align="left"><a href="$test.href">$test.name</a></td>
-                        <td align="center">#testStatus($test)</a></td>
-                        <td align="right">$test.duration</a></td>
-                    </tr>
+                    #testSummaryItem($test)
                 #end
             #end
         </tbody>

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=505907&r1=505906&r2=505907
==============================================================================
--- 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 03:59:30 2007
@@ -23,7 +23,7 @@
 
 <html>
 #pageHeader($testCase.name)
-<body>
+<body onload="windowTitle();">
     #topNavBar()
     
     <h2>TestCase $testCase.name</h2>
@@ -38,7 +38,21 @@
             </tr>
             <tr>
                 <td>Iteration</td>
-                <td>#testCaseIterationLink($model)</td>
+                <td><a href="$baseURI/$model.iteration.href">$model.iteration.name</td>
+            </tr>
+            <tr>
+                <td>Result File</td>
+                <td>
+                    $testCase.resultFilePath
+                    #if ($testCase.syntheticNames)
+                        <br/>
+                        <br/>
+                        <b>WARNING:</b>
+                        Synthetic names were created due to inconsistencies with the result data.
+                        Original test name: <tt>$testCase.originalName</tt>
+                        <br>
+                    #end
+                </td>
             </tr>
             <tr>
                 <td>Class</td>



Mime
View raw message