Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 73150 invoked from network); 8 Feb 2007 07:11:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Feb 2007 07:11:54 -0000 Received: (qmail 39385 invoked by uid 500); 8 Feb 2007 07:12:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 39352 invoked by uid 500); 8 Feb 2007 07:12:00 -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 39333 invoked by uid 99); 8 Feb 2007 07:12:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Feb 2007 23:12:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Wed, 07 Feb 2007 23:11:52 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 241D41A981A; Wed, 7 Feb 2007 23:11:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r504806 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model: ClassModel.groovy GroupModel.groovy IterationModel.groovy PackageModel.groovy SuiteModel.groovy Date: Thu, 08 Feb 2007 07:11:31 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070208071132.241D41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Wed Feb 7 23:11:31 2007 New Revision: 504806 URL: http://svn.apache.org/viewvc?view=rev&rev=504806 Log: Hook up basic aggregation Modified: 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/GroupModel.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 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=504806&r1=504805&r2=504806 ============================================================================== --- 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 Wed Feb 7 23:11:31 2007 @@ -33,11 +33,15 @@ class ClassModel extends GroupModel { def ClassModel() { - super('testName', TestCaseModel) + super('name', TestCaseModel) } List getTestNames() { return childNames + } + + long getTestCount() { + return testNames.size() } } Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy?view=diff&rev=504806&r1=504805&r2=504806 ============================================================================== --- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy (original) +++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/report/model/GroupModel.groovy Wed Feb 7 23:11:31 2007 @@ -96,8 +96,44 @@ return model } - List getChildNames() { + protected List getChildNames() { return children.keySet().sort(Sorting.CASE_INSENSITIVE) + } + + protected List aggregateChildValues(String fieldName, boolean sorted) { + assert fieldName + + def list = [] + + children.each { key, value -> + list.addAll(value[fieldName]) + } + + if (sorted) { + list = list.sort(Sorting.CASE_INSENSITIVE) + } + + return list + } + + protected List aggregateChildValues(String fieldName) { + return aggregateChildValues(fieldName, true) + } + + protected long sumChildValues(String fieldName) { + assert fieldName + + def sum = 0 + + children.each { key, value -> + sum += value[fieldName] + } + + return sum + } + + long size() { + return children.size() } // 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=504806&r1=504805&r2=504806 ============================================================================== --- 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 Wed Feb 7 23:11:31 2007 @@ -41,5 +41,25 @@ List getPackageNames() { return childNames } + + long getPacakgeCount() { + return packageNames.size() + } + + List getClassNames() { + return aggregateChildValues('classNames') + } + + long getClassCount() { + return classNames.size() + } + + List getTestNames() { + return aggregateChildValues('testNames') + } + + long getTestCount() { + return testNames.size() + } } 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=504806&r1=504805&r2=504806 ============================================================================== --- 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 Wed Feb 7 23:11:31 2007 @@ -40,5 +40,17 @@ List getClassNames() { return childNames } + + long getClassCount() { + return childNames.size() + } + + List getTestNames() { + return aggregateChildValues('testNames') + } + + long getTestCount() { + return testNames.size() + } } 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=504806&r1=504805&r2=504806 ============================================================================== --- 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 Wed Feb 7 23:11:31 2007 @@ -40,27 +40,39 @@ class SuiteModel extends GroupModel { IterationModel createIteration(iter) { - iter = String.valueOf(iter) - - return addChild(iter, new IterationModel()) + return addChild(String.valueOf(iter), new IterationModel()) } def leftShift(TestCase testCase) { throw new Exception('Use iteration model to add test cases') } - int getIterations() { + int getIterationCount() { return children.size() } List getPackageNames() { - def list = [] - - children.each { key, value -> - list.addAll(value.packageNames) - } - - return list.sort(Sorting.CASE_INSENSITIVE) + return aggregateChildValues('packageNames') + } + + long getPackageCount() { + return packageNames.size() + } + + List getClassNames() { + return aggregateChildValues('classNames') + } + + long getClassCount() { + return classNames.size() + } + + List getTestNames() { + return aggregateChildValues('testNames') + } + + long getTestCount() { + return testNames.size() } }