Bommels05/maven-plugins
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction of some point due to feedback on the user list :

Browse Source 
- Fix bug when classes have no package.
- Fix overview page for inner classes.
- Add a postGoal to clean:clean for suppress jcoverage.ser file.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113988 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
evenisse committed 2003-09-09 15:52:57 +00:00
1 parent edabb3f6ed
commit 742fd28363
7 files changed
+72 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jcoverage/plugin.jelly
+4
View File
@@ -194,5 +194,9 @@
</classpath>
</java>
</goal>
<postGoal name="clean:clean">
<ant:delete file="${basedir}/jcoverage.ser" quiet="true" failonerror="false"/>
</postGoal>
</project>
jcoverage/project.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-jcoverage-plugin</id>
<name>Maven JCoverage plugin</name>
<currentVersion>1.0</currentVersion>
<currentVersion>1.0.1-SNAPSHOT</currentVersion>
<package>org.apache.maven.jcoveragereport</package>
<description>
jcoverage/src/main/org/apache/maven/jcoveragereport/Clazz.java
+2 -2
View File
@@ -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;
jcoverage/src/main/org/apache/maven/jcoveragereport/CoverageReport.java
+13 -4
View File
@@ -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("<tr class=\"report\">");
pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + cl.getName() + ".html\">" + cl.getName() + "</a></td>");
pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
pw.println("</tr>");
@@ -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("<tr class=\"report\">");
pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + cl.getName() + ".html\">" + cl.getName() + "</a></td>");
pw.println("<td class=\"reportText\" colspan=\"2\"><a href=\"" + classFilename + "\">" + cl.getName() + "</a></td>");
pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getLineRate())) + "</td>");
pw.println("<td class=\"reportValue\">" + generatePercentResult(getPercentValue(cl.getBranchRate())) + "</td>");
pw.println("</tr>");
@@ -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)
jcoverage/src/main/org/apache/maven/jcoveragereport/Package.java
+6 -2
View File
@@ -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;
}
jcoverage/src/main/org/apache/maven/jcoveragereport/PackageComparator.java
+18 -4
View File
@@ -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
{
jcoverage/xdocs/changes.xml
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<document>
<properties>
<title>Changes</title>
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
<release version="1.0.1" date="In CVS">
<action dev="evenisse" type="fix">
Fix bug when classes have no package.
</action>
<action dev="evenisse" type="fix">
Fix overview page for inner classes.
</action>
<action dev="evenisse" type="add">
Add a postGoal to clean:clean for suppress jcoverage.ser file.
</action>
</release>
<release version="1.0" date="2003-09-04">
<action dev="evenisse" type="add">
First release
</action>
</release>
</body>
</document>