svn commit: r965914 - in /ofbiz/trunk: .gitignore build.xml framework/base/config/test-containers.xml framework/start/src/org/ofbiz/base/start/test.properties

[doogie-3]

Author: doogie
Date: Tue Jul 20 17:14:06 2010
New Revision: 965914

URL: http://svn.apache.org/viewvc?rev=965914&view=rev
Log:
Fix coverage reports; the coverage for base was reporting 100%, which is
not correct.  With real numbers on base, it shows a lot of missing
lines.

Modified:
    ofbiz/trunk/.gitignore
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/base/config/test-containers.xml
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties

Modified: ofbiz/trunk/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=965914&r1=965913&r2=965914&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Tue Jul 20 17:14:06 2010
@@ -53,7 +53,8 @@ changelog
 runtime/svninfo.ftl
 runtime/test-list-build.xml
 runtime/logs/access_log.*
-runtime/logs/cobertura.dat
+runtime/logs/cobertura-base.dat
+runtime/logs/cobertura-components.dat
 runtime/logs/cobertura-report
 runtime/logs/*.log*
 runtime/logs/*.html*

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=965914&r1=965913&r2=965914&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Tue Jul 20 17:14:06 2010
@@ -555,6 +555,12 @@ under the License.
                 </fileset>
             </classpath>
         </taskdef>
+        <cobertura-merge datafile="runtime/logs/cobertura.dat">
+            <fileset dir="runtime/logs">
+                <include name="cobertura-base.dat"/>
+                <include name="cobertura-components.dat"/>
+            </fileset>
+        </cobertura-merge>
         <cobertura-report datafile="runtime/logs/cobertura.dat" destdir="runtime/logs/cobertura-report">
             <dirset dir=".">
                 <include name="*/*/src"/>

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=965914&r1=965913&r2=965914&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Tue Jul 20 17:14:06 2010
@@ -23,7 +23,7 @@ under the License.
     <!-- load the ofbiz component container (always first) -->
     <container name="component-container" class="org.ofbiz.base.container.ComponentContainer">
         <property name="ofbiz.instrumenterClassName" value="org.ofbiz.base.config.CoberturaInstrumenter"/>
-        <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura.dat"/>
+        <property name="ofbiz.instrumenterFile" value="runtime/logs/cobertura-components.dat"/>
     </container>
 
     <!-- load the cached classloader container (always second) -->

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties?rev=965914&r1=965913&r2=965914&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/test.properties Tue Jul 20 17:14:06 2010
@@ -51,7 +51,7 @@ ofbiz.start.loader1=org.ofbiz.base.conta
 ofbiz.auto.shutdown=true
 
 ofbiz.instrumenterClassName=org.ofbiz.base.config.CoberturaInstrumenter
-ofbiz.instrumenterFile=runtime/logs/cobertura.dat
+ofbiz.instrumenterFile=runtime/logs/cobertura-base.dat
 
 # --- Default Derby system home directory
 #derby.system.home=runtime/data/derby