diff --git a/jcoverage/plugin.jelly b/jcoverage/plugin.jelly index 2f722697..7af10d32 100644 --- a/jcoverage/plugin.jelly +++ b/jcoverage/plugin.jelly @@ -194,5 +194,9 @@ + + + + diff --git a/jcoverage/project.xml b/jcoverage/project.xml index 95015101..7aeccb63 100644 --- a/jcoverage/project.xml +++ b/jcoverage/project.xml @@ -5,7 +5,7 @@ 3 maven-jcoverage-plugin Maven JCoverage plugin - 1.0 + 1.0.1-SNAPSHOT org.apache.maven.jcoveragereport diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java index 58372cc4..905c4ba5 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java @@ -63,11 +63,11 @@ import java.util.Map; /** * @author Emmanuel Venisse - * @version $Id: Clazz.java,v 1.1 2003/09/03 16:27:14 evenisse Exp $ + * @version $Id: Clazz.java,v 1.2 2003/09/09 15:52:57 evenisse Exp $ */ public class Clazz { - private String packageName; + private String packageName = ""; private String name; private String file; private String lineRate; diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java index 4ed0c5d0..fd3d5908 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java @@ -72,7 +72,7 @@ import org.apache.oro.text.perl.Perl5Util; /** * @author Emmanuel Venisse - * @version $Id: CoverageReport.java,v 1.4 2003/09/08 13:39:51 evenisse Exp $ + * @version $Id: CoverageReport.java,v 1.5 2003/09/09 15:52:57 evenisse Exp $ */ public class CoverageReport { @@ -317,8 +317,9 @@ public class CoverageReport for (Iterator it = thePackage.getClassesSortedByName().iterator(); it.hasNext(); ) { Clazz cl = (Clazz) it.next(); + String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html"; pw.println(""); - pw.println("" + cl.getName() + ""); + pw.println("" + cl.getName() + ""); pw.println("" + generatePercentResult(getPercentValue(cl.getLineRate())) + ""); pw.println("" + generatePercentResult(getPercentValue(cl.getBranchRate())) + ""); pw.println(""); @@ -364,8 +365,9 @@ public class CoverageReport for (Iterator iter = classesList.iterator(); iter.hasNext(); ) { Clazz cl = (Clazz) iter.next(); + String classFilename = cl.getFile().substring(cl.getFile().lastIndexOf("/")+1, cl.getFile().lastIndexOf(".")) + ".html"; pw.println(""); - pw.println("" + cl.getName() + ""); + pw.println("" + cl.getName() + ""); pw.println("" + generatePercentResult(getPercentValue(cl.getLineRate())) + ""); pw.println("" + generatePercentResult(getPercentValue(cl.getBranchRate())) + ""); pw.println(""); @@ -510,7 +512,14 @@ public class CoverageReport private String getRelativePath(String path) { - return new Perl5Util().substitute("s/[^\\.]*(\\.|$)/\\.\\.\\//g", path); + if (path != null && !path.equals("")) + { + return new Perl5Util().substitute("s/[^\\.]*(\\.|$)/\\.\\.\\//g", path); + } + else + { + return ""; + } } private String getPercentValue(String value) diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java index 761a0f57..8f454818 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java @@ -63,12 +63,12 @@ import java.util.List; /** * @author Emmanuel Venisse - * @version $Id: Package.java,v 1.1 2003/09/03 16:27:15 evenisse Exp $ + * @version $Id: Package.java,v 1.2 2003/09/09 15:52:57 evenisse Exp $ */ public class Package { private List classes; - private String name; + private String name = ""; private String directory; public Package(String name) @@ -79,6 +79,10 @@ public class Package public void setName(String name) { + if (name == null) + { + System.out.println("Package == null"); + } this.name = name; } diff --git a/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java b/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java index 2164d5ae..47c98b7b 100644 --- a/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java +++ b/jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java @@ -60,7 +60,7 @@ import java.util.Comparator; /** * @author Emmanuel Venisse - * @version $Id: PackageComparator.java,v 1.1 2003/09/03 16:27:15 evenisse Exp $ + * @version $Id: PackageComparator.java,v 1.2 2003/09/09 15:52:57 evenisse Exp $ */ public class PackageComparator implements Comparator { @@ -70,9 +70,23 @@ public class PackageComparator implements Comparator { Package p1 = (Package) package1; Package p2 = (Package) package2; - String lower1 = p1.getName().toLowerCase(); - String lower2 = p2.getName().toLowerCase(); - return lower1.compareTo(lower2); + if (p1.getName() != null && p2.getName() != null) + { + String lower1 = p1.getName().toLowerCase(); + String lower2 = p2.getName().toLowerCase(); + return lower1.compareTo(lower2); + } + else + { + if (p1.getName() == null && p2.getName() == null) + { + return 0; + } + else + { + return -1; + } + } } else { diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml new file mode 100644 index 00000000..d3222752 --- /dev/null +++ b/jcoverage/xdocs/changes.xml @@ -0,0 +1,28 @@ + + + + Changes + Emmanuel Venisse + + + + + + Fix bug when classes have no package. + + + Fix overview page for inner classes. + + + Add a postGoal to clean:clean for suppress jcoverage.ser file. + + + + + + First release + + + + +