You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/09/24 07:24:33 UTC
cvs commit: maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport Coverage.java Clazz.java Package.java
dion 2003/09/23 22:24:33
Modified: src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport
Coverage.java Clazz.java Package.java
Log:
Apply MAVEN-846
Revision Changes Path
1.2 +17 -7 maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Coverage.java
Index: Coverage.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Coverage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Coverage.java 3 Sep 2003 16:27:14 -0000 1.1
+++ Coverage.java 24 Sep 2003 05:24:33 -0000 1.2
@@ -157,23 +157,33 @@
public String getCoveredPercentLine()
{
+ return String.valueOf(getLineCoverage());
+ }
+
+ public String getCoveredPercentBranch()
+ {
double total = 0.00d;
- for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
+
+ if (getLineCoverage() > 0.00d)
{
- Clazz theClass = (Clazz) iter.next();
- total += new Double(theClass.getLineRate()).floatValue();
+ for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
+ {
+ Clazz theClass = (Clazz) iter.next();
+ total += new Double(theClass.getBranchRate()).floatValue();
+ }
}
+
return String.valueOf(total / getClasses().size());
}
- public String getCoveredPercentBranch()
+ private double getLineCoverage()
{
double total = 0.00d;
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
- total += new Double(theClass.getBranchRate()).floatValue();
+ total += new Double(theClass.getLineRate()).floatValue();
}
- return String.valueOf(total / getClasses().size());
+ return total / getClasses().size();
}
}
1.3 +13 -1 maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java
Index: Clazz.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Clazz.java 9 Sep 2003 15:52:57 -0000 1.2
+++ Clazz.java 24 Sep 2003 05:24:33 -0000 1.3
@@ -141,6 +141,18 @@
public String getBranchRate()
{
+ try
+ {
+ if (new Double(lineRate).doubleValue() == 0.0d)
+ {
+ return new String("0.0");
+ }
+ } catch (NumberFormatException nfe)
+ {
+ // could happen if the coverage.xml format changes.
+ return new String("0");
+ }
+
return branchRate;
}
1.3 +22 -8 maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java
Index: Package.java
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Package.java 9 Sep 2003 15:52:57 -0000 1.2
+++ Package.java 24 Sep 2003 05:24:33 -0000 1.3
@@ -125,23 +125,37 @@
public String getCoveredPercentLine()
{
+ return String.valueOf(getLineCoverage());
+ }
+
+ public String getCoveredPercentBranch()
+ {
double total = 0.00d;
- for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
+
+ if (getLineCoverage() > 0.00d)
{
- Clazz theClass = (Clazz) iter.next();
- total += new Double(theClass.getLineRate()).floatValue();
+ for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
+ {
+ Clazz theClass = (Clazz) iter.next();
+ total += new Double(theClass.getBranchRate()).floatValue();
+ }
+
+ total /= getClasses().size();
}
- return String.valueOf(total / getClasses().size());
+
+ return String.valueOf(total);
}
- public String getCoveredPercentBranch()
+ private double getLineCoverage()
{
double total = 0.00d;
+
for (Iterator iter = getClasses().iterator(); iter.hasNext(); )
{
Clazz theClass = (Clazz) iter.next();
- total += new Double(theClass.getBranchRate()).floatValue();
+ total += new Double(theClass.getLineRate()).floatValue();
}
- return String.valueOf(total / getClasses().size());
+
+ return (total / getClasses().size());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org