You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2004/09/03 09:58:59 UTC
cvs commit: maven-plugins/jcoverage/xdocs changes.xml
evenisse 2004/09/03 00:58:59
Modified: jcoverage/src/main/org/apache/maven/jcoveragereport
Coverage.java Package.java
jcoverage/xdocs changes.xml
Log:
MPJCOVERAGE-14. Fixed overview and packages rates.
Revision Changes Path
1.5 +19 -9 maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/Coverage.java
Index: Coverage.java
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/Coverage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Coverage.java 6 Mar 2004 22:41:56 -0000 1.4
+++ Coverage.java 3 Sep 2004 07:58:59 -0000 1.5
@@ -123,13 +123,15 @@
public String getCoveredPercentBranch()
{
- double total = 0.00d;
+ double totalLines = 0.00d;
+ double total = 0.00d;
if (getLineCoverage() > 0.00d)
{
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
+ int classLines = theClass.getLines().size();
double rate = 0;
try
{
@@ -139,30 +141,38 @@
{
rate = 0;
}
- total += rate;
+ total += (rate*classLines);
+ totalLines += classLines;
}
+
+ total /= totalLines;
}
- return String.valueOf(total / getClasses().size());
+ return String.valueOf(total);
}
-
+
private double getLineCoverage()
{
- double total = 0.00d;
+ double totalLines = 0.00d;
+ double totalTestedLines = 0.00d;
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
+ int classLines = theClass.getLines().size();
double rate = 0;
try
- {
+ {
rate = new Double(theClass.getLineRate()).floatValue();
}
catch(NumberFormatException e)
{
rate = 0;
}
- total += rate;
+ totalTestedLines += (rate * classLines);
+ totalLines += classLines;
}
- return total / getClasses().size();
+
+ return (totalTestedLines / totalLines);
+
}
}
1.6 +14 -9 maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java
Index: Package.java
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Package.java 6 Mar 2004 22:41:56 -0000 1.5
+++ Package.java 3 Sep 2004 07:58:59 -0000 1.6
@@ -91,13 +91,15 @@
public String getCoveredPercentBranch()
{
- double total = 0.00d;
+ double pckgLines = 0.00d;
+ double total = 0.00d;
if (getLineCoverage() > 0.00d)
{
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
+ int classLines = theClass.getLines().size();
double rate = 0;
try
{
@@ -107,10 +109,11 @@
{
rate = 0;
}
- total += rate;
+ total += (rate*classLines);
+ pckgLines += classLines;
}
- total /= getClasses().size();
+ total /= pckgLines;
}
return String.valueOf(total);
@@ -118,23 +121,25 @@
private double getLineCoverage()
{
- double total = 0.00d;
-
+ double pckgLines = 0.00d;
+ double pckgTestedLines = 0.00d;
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
+ int classLines = theClass.getLines().size();
double rate = 0;
try
- {
+ {
rate = new Double(theClass.getLineRate()).floatValue();
}
catch(NumberFormatException e)
{
rate = 0;
}
- total += rate;
+ pckgTestedLines += (rate * classLines);
+ pckgLines += classLines;
}
- return (total / getClasses().size());
+ return (pckgTestedLines / pckgLines);
}
}
1.24 +1 -0 maven-plugins/jcoverage/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/jcoverage/xdocs/changes.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- changes.xml 17 Aug 2004 14:00:48 -0000 1.23
+++ changes.xml 3 Sep 2004 07:58:59 -0000 1.24
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.0.8" date="In CVS">
+ <action dev="evenisse" type="fix" issue="MPJCOVERAGE-14">Fixed overview and packages rates.</action>
<action dev="evenisse" type="add">Add the possibility to set multiple includes and excludes files for instrumentation.</action>
</release>
<release version="1.0.7" date="2004-07-11">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org