The Unified and Autonomous Development Platform
Fix issue #247 - Clover coverage report for build
Robin Shen09bab4b1e3f4
diff --git a/server-core/src/main/java/io/onedev/server/model/CloverMetric.java b/server-core/src/main/java/io/onedev/server/model/CloverMetric.javaindex 299e1d3f83..4cb87fe252 100644--- a/server-core/src/main/java/io/onedev/server/model/CloverMetric.java+++ b/server-core/src/main/java/io/onedev/server/model/CloverMetric.java@@ -58,7 +58,7 @@ public class CloverMetric extends AbstractEntity implements BuildMetric {this.reportName = reportName;}- @MetricIndicator(group="Test Coverages", order=100, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ @MetricIndicator(group="Code Coverage", order=100, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,maxValue=100, minValue=0, name="Method", color="#F64E60")public int getMethodCoverage() {return methodCoverage;@@ -68,17 +68,7 @@ public class CloverMetric extends AbstractEntity implements BuildMetric {this.methodCoverage = methodCoverage;}- @MetricIndicator(group="Test Coverages", order=200, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,- maxValue=100, minValue=0, name="Statement", color="#8950FC")- public int getStatementCoverage() {- return statementCoverage;- }-- public void setStatementCoverage(int statementCoverage) {- this.statementCoverage = statementCoverage;- }-- @MetricIndicator(group="Test Coverages", order=300, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ @MetricIndicator(group="Code Coverage", order=200, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,maxValue=100, minValue=0, name="Branch", color="#1BC5BD")public int getBranchCoverage() {return branchCoverage;@@ -88,7 +78,17 @@ public class CloverMetric extends AbstractEntity implements BuildMetric {this.branchCoverage = branchCoverage;}- @MetricIndicator(group="Test Coverages", order=400, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ @MetricIndicator(group="Code Coverage", order=300, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,+ maxValue=100, minValue=0, name="Statement", color="#8950FC")+ public int getStatementCoverage() {+ return statementCoverage;+ }++ public void setStatementCoverage(int statementCoverage) {+ this.statementCoverage = statementCoverage;+ }++ @MetricIndicator(group="Code Coverage", order=400, valueFormatter=BuildMetric.FORMAT_PERCENTAGE,maxValue=100, minValue=0, name="Line", color="#FFA800")public int getLineCoverage() {return lineCoverage;@@ -107,16 +107,7 @@ public class CloverMetric extends AbstractEntity implements BuildMetric {this.totalMethods = totalMethods;}- @MetricIndicator(group="Total Number", order=600, minValue=0, name="Statement", color="#8950FC")- public int getTotalStatements() {- return totalStatements;- }-- public void setTotalStatements(int totalStatements) {- this.totalStatements = totalStatements;- }-- @MetricIndicator(group="Total Number", order=700, minValue=0, name="Branch", color="#1BC5BD")+ @MetricIndicator(group="Total Number", order=600, minValue=0, name="Branch", color="#1BC5BD")public int getTotalBranches() {return totalBranches;}@@ -125,6 +116,15 @@ public class CloverMetric extends AbstractEntity implements BuildMetric {this.totalBranches = totalBranches;}+ @MetricIndicator(group="Total Number", order=700, minValue=0, name="Statement", color="#8950FC")+ public int getTotalStatements() {+ return totalStatements;+ }++ public void setTotalStatements(int totalStatements) {+ this.totalStatements = totalStatements;+ }+@MetricIndicator(group="Total Number", order=800, minValue=0, name="Effective Line", color="#FFA800")public int getTotalLines() {return totalLines;diff --git a/server-core/src/main/java/io/onedev/server/util/Coverage.java b/server-core/src/main/java/io/onedev/server/util/Coverage.javanew file mode 100644index 0000000000..5ee723738b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/Coverage.java@@ -0,0 +1,38 @@+package io.onedev.server.util;++import java.io.Serializable;++public class Coverage implements Serializable {++ private static final long serialVersionUID = 1L;++ private final int total;++ private final int covered;++ public Coverage(int total, int covered) {+ this.total = total;+ this.covered = covered;+ }++ public int getTotal() {+ return total;+ }++ public int getCovered() {+ return covered;+ }++ public int getPercent() {+ if (total != 0)+ return covered*100/total;+ else+ return 0;+ }++ @Override+ public String toString() {+ return covered + "/" + total;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.html b/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.htmlnew file mode 100644index 0000000000..8d7f697688--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div class="coverage-bar progress">+ <div wicket:id="coverage" class="progress-bar"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.java b/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.javanew file mode 100644index 0000000000..af6494adb0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/coveragebar/CoverageBar.java@@ -0,0 +1,48 @@+package io.onedev.server.web.component.coveragebar;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.util.Coverage;++@SuppressWarnings("serial")+public class CoverageBar extends GenericPanel<Coverage> {++ public CoverageBar(String id, IModel<Coverage> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebMarkupContainer("coverage").add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (getCoverage().getPercent() < 50)+ return "bg-danger";+ else if (getCoverage().getPercent() < 75)+ return "bg-warning";+ else+ return "bg-success";+ }++ })).add(AttributeAppender.append("style", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return "width: " + getCoverage().getPercent() + "%";+ }++ })));+ }++ private Coverage getCoverage() {+ return getModelObject();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.javaindex e6e830eea4..ee517fd246 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java@@ -26,6 +26,12 @@ public class BuildTab extends PageTab {super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);}+ public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,+ Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,+ Class<? extends BuildDetailPage> additionalPageClass3) {+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ }+public BuildTab(String title, Class<? extends BuildDetailPage> mainPageClass,Class<? extends BuildDetailPage> additionalPageClass1, Class<? extends BuildDetailPage> additionalPageClass2,Class<? extends BuildDetailPage> additionalPageClass3, Class<? extends BuildDetailPage> additionalPageClass4) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportPage.javanew file mode 100644index 0000000000..a70d37b9f0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportPage.java@@ -0,0 +1,37 @@+package io.onedev.server.web.page.project.builds.detail.report;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Build;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;++@SuppressWarnings("serial")+public abstract class BuildReportPage extends BuildDetailPage {++ private static final String PARAM_REPORT = "report";++ private final String reportName;++ public BuildReportPage(PageParameters params) {+ super(params);++ reportName = params.get(PARAM_REPORT).toString();+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccessReport(getBuild(), reportName);+ }++ public String getReportName() {+ return reportName;+ }++ public static PageParameters paramsOf(Build build, String reportName) {+ PageParameters params = paramsOf(build);+ params.add(PARAM_REPORT, reportName);+ return params;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.javanew file mode 100644index 0000000000..9fededc952--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/report/BuildReportTab.java@@ -0,0 +1,63 @@+package io.onedev.server.web.page.project.builds.detail.report;++import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.markup.html.link.Link;++import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.tabbable.PageTabHead;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;+import io.onedev.server.web.page.project.builds.detail.BuildTab;++public class BuildReportTab extends BuildTab {++ private static final long serialVersionUID = 1L;++ public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass) {+ super(title, mainPageClass);+ }++ public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,+ Class<? extends BuildReportPage> additionalPageClass1) {+ super(title, mainPageClass, additionalPageClass1);+ }++ public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,+ Class<? extends BuildReportPage> additionalPageClass1,+ Class<? extends BuildReportPage> additionalPageClass2) {+ super(title, mainPageClass, additionalPageClass1, additionalPageClass2);+ }++ public BuildReportTab(String title, Class<? extends BuildReportPage> mainPageClass,+ Class<? extends BuildReportPage> additionalPageClass1,+ Class<? extends BuildReportPage> additionalPageClass2,+ Class<? extends BuildReportPage> additionalPageClass3) {+ super(title, mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);+ }++ @Override+ public Component render(String componentId) {+ return new PageTabHead(componentId, this) {++ private static final long serialVersionUID = 1L;++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ BuildDetailPage page = (BuildDetailPage) getPage();+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, BuildReportPage.paramsOf(page.getBuild(), getTitle()));+ }++ };+ }++ @Override+ public boolean isActive(Page currentPage) {+ if (super.isActive(currentPage)) {+ BuildReportPage jestReportPage = (BuildReportPage) currentPage;+ return getTitle().equals(jestReportPage.getReportName());+ } else {+ return false;+ }+ }++}\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.javanew file mode 100644index 0000000000..103ff1d511--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.java@@ -0,0 +1,85 @@+package org.server.plugin.report.clover;++import io.onedev.commons.utils.StringUtils;++enum CloverOrderBy {+ DEFAULT {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return 0;+ }++ },+ LEAST_METHOD_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return obj1.getMethodCoverage().getPercent() - obj2.getMethodCoverage().getPercent();+ }++ },+ MOST_METHOD_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return LEAST_METHOD_COVERAGE.compare(obj2, obj1);+ }++ },+ LEAST_BRANCH_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return obj1.getBranchCoverage().getPercent() - obj2.getBranchCoverage().getPercent();+ }++ },+ MOST_BRANCH_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return LEAST_BRANCH_COVERAGE.compare(obj2, obj1);+ }++ },+ LEAST_STATEMENT_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return obj1.getStatementCoverage().getPercent() - obj2.getStatementCoverage().getPercent();+ }++ },+ MOST_STATEMENT_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return LEAST_STATEMENT_COVERAGE.compare(obj2, obj1);+ }++ },+ LEAST_LINE_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return obj1.getLineCoverage().getPercent() - obj2.getLineCoverage().getPercent();+ }++ },+ MOST_LINE_COVERAGE {++ @Override+ public int compare(CoverageInfo obj1, CoverageInfo obj2) {+ return LEAST_LINE_COVERAGE.compare(obj2, obj1);+ }++ };++ public String getDisplayName() {+ return StringUtils.capitalize(name().replace('_', ' ').toLowerCase());+ }++ public abstract int compare(CoverageInfo obj1, CoverageInfo obj2);++}\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.javaindex 9656a284b3..ac74fd2461 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java@@ -33,6 +33,9 @@ import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.DynamicPathPageMapper;import io.onedev.server.web.page.layout.SidebarMenuItem;import io.onedev.server.web.page.project.StatisticsMenuContribution;+import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;+import io.onedev.server.web.page.project.builds.detail.report.BuildReportTab;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -90,10 +93,11 @@ public class CloverPluginModule extends AbstractPluginModule {Map<Integer, Integer> coverages = new HashMap<>();if (build.getReportDir(JobCloverReport.DIR).exists()) {for (File reportDir: build.getReportDir(JobCloverReport.DIR).listFiles()) {- if (SecurityUtils.canAccessReport(build, reportDir.getName())) {- File lineCoverageFile = new File(reportDir, JobCloverReport.LINE_COVERAGES_DIR + "/" + blobPath);- if (lineCoverageFile.exists()) {- try (InputStream is = new FileInputStream(lineCoverageFile)) {+ if (SecurityUtils.canAccessReport(build, reportDir.getName())+ && (reportName == null || reportName.equals(reportDir.getName()))) {+ File testCountFile = new File(reportDir, JobCloverReport.TEST_COUNTS_DIR + "/" + blobPath);+ if (testCountFile.exists()) {+ try (InputStream is = new FileInputStream(testCountFile)) {@SuppressWarnings("unchecked")Map<Integer, Integer> deserialized = (Map<Integer, Integer>) SerializationUtils.deserialize(is);deserialized.forEach((key, value) -> {@@ -113,15 +117,45 @@ public class CloverPluginModule extends AbstractPluginModule {});+ contribute(BuildTabContribution.class, new BuildTabContribution() {++ @Override+ public List<BuildTab> getTabs(Build build) {+ List<BuildTab> tabs = new ArrayList<>();+ LockUtils.read(build.getReportLockKey(JobCloverReport.DIR), new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ if (build.getReportDir(JobCloverReport.DIR).exists()) {+ for (File reportDir: build.getReportDir(JobCloverReport.DIR).listFiles()) {+ if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName()))+ tabs.add(new BuildReportTab(reportDir.getName(), CloverReportPage.class));+ }+ }+ return null;+ }++ });+ return tabs;+ }++ @Override+ public int getOrder() {+ return 200;+ }++ });+contribute(WebApplicationConfigurator.class, new WebApplicationConfigurator() {@Overridepublic void configure(WebApplication application) {+ application.mount(new DynamicPathPageMapper("projects/${project}/builds/${build}/clover-reports/${report}", CloverReportPage.class));application.mount(new DynamicPathPageMapper("projects/${project}/stats/clover", CloverStatsPage.class));}- });+ });}-+}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.javanew file mode 100644index 0000000000..8e5bf505fa--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.java@@ -0,0 +1,13 @@+package org.server.plugin.report.clover;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class CloverReportCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public CloverReportCssResourceReference() {+ super(CloverReportCssResourceReference.class, "clover-report.css");+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.javaindex c5f32186c1..d1fa329ebf 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java@@ -7,88 +7,39 @@ import java.io.IOException;import java.io.InputStream;import java.io.OutputStream;import java.io.Serializable;--import javax.annotation.Nullable;+import java.util.List;import org.apache.commons.lang.SerializationUtils;public class CloverReportData implements Serializable {private static final long serialVersionUID = 1L;-- private static final String FILE_NAME = "data.ser";- private final int totalStatements;-- private final int coveredStatements;-- private final int totalMethods;-- private final int coveredMethods;-- private final int totalBranches;-- private final int coveredBranches;+ private static final String FILE_NAME = "data.ser";- private final int totalLines;+ private final CoverageInfo coverages;- private final int coveredLines;+ private final List<PackageCoverageInfo> packageCoverages;- public CloverReportData(int totalStatements, int coveredStatements, int totalMethods, int coveredMethods,- int totalBranches, int coveredBranches, int totalLines, int coveredLines) {- this.totalStatements = totalStatements;- this.coveredStatements = coveredStatements;- this.totalMethods = totalMethods;- this.coveredMethods = coveredMethods;- this.totalBranches = coveredBranches;- this.coveredBranches = coveredBranches;- this.totalLines = totalLines;- this.coveredLines = coveredLines;- }-- public int getTotalStatements() {- return totalStatements;- }-- public int getCoveredStatements() {- return coveredStatements;- }-- public int getTotalMethods() {- return totalMethods;- }-- public int getCoveredMethods() {- return coveredMethods;+ public CloverReportData(CoverageInfo coverages, List<PackageCoverageInfo> packageCoverages) {+ this.coverages = coverages;+ this.packageCoverages = packageCoverages;}- public int getTotalBranches() {- return totalBranches;+ public CoverageInfo getOverallCoverages() {+ return coverages;}- public int getCoveredBranches() {- return coveredBranches;+ public List<PackageCoverageInfo> getPackageCoverages() {+ return packageCoverages;}-- public int getTotalLines() {- return totalLines;- }-- public int getCoveredLines() {- return coveredLines;- }-- @Nullable+public static CloverReportData readFrom(File reportDir) {File dataFile = new File(reportDir, FILE_NAME);- if (dataFile.exists()) {- try (InputStream is = new FileInputStream(dataFile)) {- return (CloverReportData) SerializationUtils.deserialize(is);- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- return null;+ try (InputStream is = new FileInputStream(dataFile)) {+ return (CloverReportData) SerializationUtils.deserialize(is);+ } catch (IOException e) {+ throw new RuntimeException(e);}}@@ -101,32 +52,4 @@ public class CloverReportData implements Serializable {};}- public int getMethodCoverage() {- if (totalMethods != 0)- return coveredMethods*100/totalMethods;- else- return 0;- }-- public int getStatementCoverage() {- if (totalStatements != 0)- return coveredStatements*100/totalStatements;- else- return 0;- }-- public int getBranchCoverage() {- if (totalBranches != 0)- return coveredBranches*100/totalBranches;- else- return 0;- }-- public int getLineCoverage() {- if (totalLines != 0)- return coveredLines*100/totalLines;- else- return 0;- }-}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.htmlnew file mode 100644index 0000000000..5990c3d93f--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html@@ -0,0 +1,31 @@+<wicket:extend>+ <div class="clover-report">+ <div wicket:id="cloverTitle" class="title h4 mb-3 text-break"></div>+ <div wicket:id="coverages" class="coverages mb-5"></div>+ <div class="items rounded border">+ <div wicket:id="itemsTitle" class="title p-3 font-weight-bold border-bottom bg-light"></div>+ <div class="p-4">+ <form wicket:id="form">+ <div class="operations d-flex flex-nowrap">+ <div class="clearable-wrapper flex-grow-1 mr-3">+ <div class="input-group">+ <input wicket:id="input" class="form-control" spellcheck="false" autocomplete="off" placeholder="Filter">+ <span class="input-group-append">+ <button wicket:id="submit" title="Filter" class="btn btn-icon btn-outline-secondary" type="submit"><wicket:svg href="magnify" class="icon"></wicket:svg></button>+ </span>+ </div>+ </div>+ <a wicket:id="orderBy" class="order-by btn btn-primary flex-shrink-0">Order By <wicket:svg href="arrow" class="dropdown-caret icon rotate-90"/></a>+ </div>+ <div wicket:id="feedback" class="mt-3"></div>+ </form>+ <div wicket:id="itemsContainer">+ <div wicket:id="items" class="item border-top border-secondary mt-4 pt-4">+ <a wicket:id="name" class="name font-weight-bold text-break"><span wicket:id="label"></span></a>+ <div wicket:id="coverages" class="coverages mt-3"></div>+ </div>+ </div>+ </div>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.javanew file mode 100644index 0000000000..3cc2105ae7--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.java@@ -0,0 +1,398 @@+package org.server.plugin.report.clover;++import java.io.File;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;+import java.util.Optional;+import java.util.concurrent.Callable;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;++import com.google.common.collect.Lists;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.codeassist.parser.TerminalExpect;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Build;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.StringMatcher;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.PatternSetAssistBehavior;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.menu.MenuItem;+import io.onedev.server.web.component.menu.MenuLink;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.builds.detail.report.BuildReportPage;+import io.onedev.server.web.util.SuggestionUtils;++@SuppressWarnings("serial")+public class CloverReportPage extends BuildReportPage {++ private static final String PARAM_PACKAGE = "package";++ private static final String PARAM_FILTER = "filter";++ private static final String PARAM_ORDER_BY = "order-by";++ private String packageName;++ private com.google.common.base.Optional<PatternSet> filterPatterns;++ private State state = new State();++ private Form<?> form;++ private Component feedback;++ private WebMarkupContainer itemsContainer;++ private final IModel<CloverReportData> reportDataModel = new LoadableDetachableModel<CloverReportData>() {++ @Override+ protected CloverReportData load() {+ return LockUtils.read(getBuild().getReportLockKey(JobCloverReport.DIR), new Callable<CloverReportData>() {++ @Override+ public CloverReportData call() throws Exception {+ return CloverReportData.readFrom(new File(+ getBuild().getReportDir(JobCloverReport.DIR), getReportName()));+ }++ });++ }++ };++ public CloverReportPage(PageParameters params) {+ super(params);++ packageName = params.get(PARAM_PACKAGE).toOptionalString();+ state.filter = params.get(PARAM_FILTER).toOptionalString();+ String orderByString = params.get(PARAM_ORDER_BY).toOptionalString();+ if (orderByString != null)+ state.orderBy = CloverOrderBy.valueOf(orderByString);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ if (packageName != null)+ add(new Label("cloverTitle", packageName));+ else+ add(new WebMarkupContainer("cloverTitle").setVisible(false));++ add(new CoverageInfoPanel<CoverageInfo>("coverages", new LoadableDetachableModel<CoverageInfo>() {++ @Override+ protected CoverageInfo load() {+ if (packageName != null) {+ return getReportData().getPackageCoverages().stream()+ .filter(it->it.getName().equals(packageName)).findFirst().get();+ } else {+ return getReportData().getOverallCoverages();+ }+ }++ }));++ add(new Label("itemsTitle", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (packageName != null)+ return "Files";+ else+ return "Packages";+ }++ }));++ form = new Form<Void>("form");++ TextField<String> input = new TextField<String>("input", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return state.filter;+ }++ @Override+ public void setObject(String object) {+ state.filter = object;+ }++ });+ input.add(new PatternSetAssistBehavior() {++ @Override+ protected List<InputSuggestion> suggest(String matchWith) {+ List<String> names;+ if (packageName != null) {+ Optional<PackageCoverageInfo> packageCoverages = getReportData().getPackageCoverages()+ .stream().filter(it->it.getName().equals(packageName)).findFirst();+ if (packageCoverages.isPresent())+ names = packageCoverages.get().getFileCoverages().stream().map(it->it.getName()).collect(Collectors.toList());+ else+ names = new ArrayList<>();+ } else {+ names = getReportData().getPackageCoverages().stream().map(it->it.getName()).collect(Collectors.toList());+ }+ return SuggestionUtils.suggest(names, matchWith);+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Path containing spaces or starting with dash needs to be quoted",+ "Use '*' or '?' for wildcard match. Prefix with '-' to exclude"+ );+ }++ });+ form.add(input);++ input.add(new AjaxFormComponentUpdatingBehavior("clear") {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ pushState(target);+ parseFilterPatterns();+ target.add(feedback);+ target.add(itemsContainer);+ }++ });++ form.add(new MenuLink("orderBy") {++ @Override+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {+ List<MenuItem> menuItems = new ArrayList<>();+ for (CloverOrderBy orderBy: CloverOrderBy.values()) {+ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return orderBy.getDisplayName();+ }++ @Override+ public WebMarkupContainer newLink(String id) {+ return new AjaxLink<Void>(id) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dropdown.close();+ state.orderBy = orderBy;+ target.add(itemsContainer);+ }++ };+ }++ @Override+ public boolean isSelected() {+ return orderBy == state.orderBy;+ }++ });+ }+ return menuItems;+ }++ });++ form.add(feedback = new FencedFeedbackPanel("feedback", form));+ feedback.setOutputMarkupPlaceholderTag(true);++ form.add(new AjaxButton("submit") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(this));+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ pushState(target);+ parseFilterPatterns();+ target.add(feedback);+ target.add(itemsContainer);+ }++ });+ form.setOutputMarkupId(true);+ add(form);++ parseFilterPatterns();++ itemsContainer = new WebMarkupContainer("itemsContainer");+ itemsContainer.setOutputMarkupId(true);+ add(itemsContainer);++ itemsContainer.add(new ListView<NamedCoverageInfo>("items", new LoadableDetachableModel<List<NamedCoverageInfo>>() {++ @SuppressWarnings("unchecked")+ @Override+ protected List<NamedCoverageInfo> load() {+ if (filterPatterns != null) {+ List<? extends NamedCoverageInfo> coverages;+ if (packageName != null) {+ Optional<PackageCoverageInfo> packageCoverages = getReportData().getPackageCoverages()+ .stream().filter(it->it.getName().equals(packageName)).findFirst();+ if (packageCoverages.isPresent())+ coverages = packageCoverages.get().getFileCoverages();+ else+ coverages = new ArrayList<>();+ } else {+ coverages = getReportData().getPackageCoverages();+ }+ if (filterPatterns.isPresent()) {+ Matcher matcher = new StringMatcher();+ coverages = coverages.stream()+ .filter(it->filterPatterns.get().matches(matcher, it.getName()))+ .collect(Collectors.toList());+ }+ coverages.sort(new Comparator<CoverageInfo>() {++ @Override+ public int compare(CoverageInfo o1, CoverageInfo o2) {+ return state.orderBy.compare(o1, o2);+ }++ });+ return (List<NamedCoverageInfo>) coverages;+ } else {+ return new ArrayList<>();+ }+ }++ }) {++ @Override+ protected void populateItem(ListItem<NamedCoverageInfo> item) {+ NamedCoverageInfo coverageInfo = item.getModelObject();++ Link<Void> nameLink;+ if (coverageInfo instanceof PackageCoverageInfo) {+ PageParameters params = paramsOf(getBuild(), getReportName(),+ coverageInfo.getName(), state);+ nameLink = new BookmarkablePageLink<Void>("name", CloverReportPage.class, params);+ } else {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(getBuild().getCommitHash(),+ ((FileCoverageInfo) coverageInfo).getPath(), FileMode.REGULAR_FILE.getBits());+ state.coverageReport = getReportName();+ PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);+ nameLink = new BookmarkablePageLink<Void>("name", ProjectBlobPage.class, params);+ }+ nameLink.add(new Label("label", coverageInfo.getName()));+ item.add(nameLink);++ item.add(new CoverageInfoPanel<NamedCoverageInfo>("coverages", item.getModel()));+ }++ });+ }++ private void parseFilterPatterns() {+ if (state.filter != null) {+ try {+ filterPatterns = com.google.common.base.Optional.of(PatternSet.parse(state.filter));+ } catch (Exception e) {+ filterPatterns = null;+ form.error("Malformed filter");+ }+ } else {+ filterPatterns = com.google.common.base.Optional.absent();+ }+ }++ private CloverReportData getReportData() {+ return reportDataModel.getObject();+ }++ @Override+ protected void onDetach() {+ reportDataModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new CloverReportCssResourceReference()));+ }++ private void pushState(AjaxRequestTarget target) {+ CharSequence url = urlFor(CloverReportPage.class, paramsOf(getBuild(), getReportName(), packageName, state));+ pushState(target, url.toString(), state);+ }++ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ super.onPopState(target, data);+ state = (State) data;+ parseFilterPatterns();+ target.add(form);+ target.add(itemsContainer);+ }++ private static PageParameters paramsOf(Build build, String reportName,+ @Nullable String packageName, State state) {+ PageParameters params = BuildReportPage.paramsOf(build, reportName);+ if (packageName != null)+ params.add(PARAM_PACKAGE, packageName);+ if (state.filter != null)+ params.add(PARAM_FILTER, state.filter);+ if (state.orderBy != null)+ params.add(PARAM_ORDER_BY, state.orderBy);+ return params;+ }++ public static class State implements Serializable {++ @Nullable+ public String filter;++ public CloverOrderBy orderBy = CloverOrderBy.DEFAULT;++ }++}\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.javanew file mode 100644index 0000000000..c643c47825--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.java@@ -0,0 +1,44 @@+package org.server.plugin.report.clover;++import java.io.Serializable;++import io.onedev.server.util.Coverage;++public class CoverageInfo implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Coverage statementCoverage;++ private final Coverage methodCoverage;++ private final Coverage branchCoverage;++ private final Coverage lineCoverage;++ public CoverageInfo(+ Coverage statementCoverage, Coverage methodCoverage,+ Coverage branchCoverage, Coverage lineCoverage) {+ this.statementCoverage = statementCoverage;+ this.methodCoverage = methodCoverage;+ this.branchCoverage = branchCoverage;+ this.lineCoverage = lineCoverage;+ }++ public Coverage getStatementCoverage() {+ return statementCoverage;+ }++ public Coverage getMethodCoverage() {+ return methodCoverage;+ }++ public Coverage getBranchCoverage() {+ return branchCoverage;+ }++ public Coverage getLineCoverage() {+ return lineCoverage;+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.html b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.htmlnew file mode 100644index 0000000000..1cd0dbc651--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.html@@ -0,0 +1,20 @@+<wicket:panel>+ <div class="coverages d-flex flex-wrap">+ <div class="coverage method">+ <div wicket:id="methodLabel" class="label"></div>+ <div wicket:id="methodCoverage"></div>+ </div>+ <div class="coverage branch">+ <div wicket:id="branchLabel" class="label"></div>+ <div wicket:id="branchCoverage"></div>+ </div>+ <div class="coverage statement">+ <div wicket:id="statementLabel" class="label"></div>+ <div wicket:id="statementCoverage"></div>+ </div>+ <div class="coverage line">+ <div wicket:id="lineLabel" class="label"></div>+ <div wicket:id="lineCoverage"></div>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.javanew file mode 100644index 0000000000..6781040af4--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.java@@ -0,0 +1,100 @@+package org.server.plugin.report.clover;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;++import io.onedev.server.util.Coverage;+import io.onedev.server.web.component.coveragebar.CoverageBar;++@SuppressWarnings("serial")+ class CoverageInfoPanel<T extends CoverageInfo> extends GenericPanel<T> {++ public CoverageInfoPanel(String id, IModel<T> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("methodLabel", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "Methods " + getCoverageInfo().getMethodCoverage();+ }++ }));++ add(new CoverageBar("methodCoverage", new AbstractReadOnlyModel<Coverage>() {++ @Override+ public Coverage getObject() {+ return getCoverageInfo().getMethodCoverage();+ }++ }));++ add(new Label("statementLabel", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "Statements " + getCoverageInfo().getStatementCoverage();+ }++ }));++ add(new CoverageBar("statementCoverage", new AbstractReadOnlyModel<Coverage>() {++ @Override+ public Coverage getObject() {+ return getCoverageInfo().getStatementCoverage();+ }++ }));++ add(new Label("branchLabel", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "Branches " + getCoverageInfo().getBranchCoverage();+ }++ }));++ add(new CoverageBar("branchCoverage", new AbstractReadOnlyModel<Coverage>() {++ @Override+ public Coverage getObject() {+ return getCoverageInfo().getBranchCoverage();+ }++ }));++ add(new Label("lineLabel", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "Lines " + getCoverageInfo().getLineCoverage();+ }++ }));++ add(new CoverageBar("lineCoverage", new AbstractReadOnlyModel<Coverage>() {++ @Override+ public Coverage getObject() {+ return getCoverageInfo().getLineCoverage();+ }++ }));++ }++ private CoverageInfo getCoverageInfo() {+ return getModelObject();+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.javanew file mode 100644index 0000000000..6f23c41fb9--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.java@@ -0,0 +1,23 @@+package org.server.plugin.report.clover;++import io.onedev.server.util.Coverage;++public class FileCoverageInfo extends NamedCoverageInfo {++ private static final long serialVersionUID = 1L;++ private final String path;++ public FileCoverageInfo(String name,+ Coverage statementCoverage, Coverage methodCoverage,+ Coverage branchCoverage, Coverage lineCoverage,+ String path) {+ super(name, statementCoverage, methodCoverage, branchCoverage, lineCoverage);+ this.path = path;+ }++ public String getPath() {+ return path;+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.javaindex 4099a7b83b..859820b8fe 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java@@ -5,6 +5,7 @@ import java.io.FileOutputStream;import java.io.IOException;import java.io.OutputStream;import java.io.Serializable;+import java.util.ArrayList;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -17,7 +18,6 @@ import org.dom4j.io.SAXReader;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;@@ -26,25 +26,25 @@ import io.onedev.server.buildspec.job.JobReport;import io.onedev.server.model.Build;import io.onedev.server.model.CloverMetric;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.Coverage;import io.onedev.server.util.SimpleLogger;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.Patterns;-@Editable(name="Clover Coverage Metrics", description="Collected coverage information will be displayed "- + "when view source files")+@Editable(name="Clover Coverage Report")public class JobCloverReport extends JobReport {private static final long serialVersionUID = 1L;public static final String DIR = "clover-reports";- public static final String LINE_COVERAGES_DIR = "line-coverages";+ public static final String TEST_COUNTS_DIR = "test-count";- @Editable(order=100, description="Specify clover xml file containing coverage metrics. This should be a "+ @Editable(order=100, description="Specify clover xml file containing coverage data. This should be a "+ "relative path under OneDev workspace. For instance, <tt>target/site/clover/clover.xml</tt>. "+ "Refer to <a href='https://openclover.org/documentation'>OpenClover documentation</a> "- + "on how to generate clover report. Use * or ? for pattern match")+ + "on how to generate clover xml file. Use * or ? for pattern match")@Interpolative(variableSuggester="suggestVariables")@Patterns(path=true)@NotEmpty@@ -66,8 +66,8 @@ public class JobCloverReport extends JobReport {@Overridepublic void process(Build build, File workspace, SimpleLogger logger) {File reportDir = new File(build.getReportDir(DIR), getReportName());-- CloverReportData report = LockUtils.write(build.getReportLockKey(DIR), new Callable<CloverReportData>() {++ CloverReportData reportData = LockUtils.write(build.getReportLockKey(DIR), new Callable<CloverReportData>() {@Overridepublic CloverReportData call() throws Exception {@@ -86,83 +86,134 @@ public class JobCloverReport extends JobReport {int totalLines = 0;int coveredLines = 0;- boolean hasReport = false;+ List<PackageCoverageInfo> packageCoverages = new ArrayList<>();+for (File file: getPatternSet().listFiles(workspace)) {logger.log("Processing clover coverage report: " + file.getAbsolutePath().substring(baseLen));- try {- Document doc = reader.read(file);- for (Element projectElement: doc.getRootElement().elements("project")) {- Element metricsElement = projectElement.element("metrics");-- totalStatements += Integer.parseInt(metricsElement.attributeValue("statements"));- totalMethods += Integer.parseInt(metricsElement.attributeValue("methods"));- totalBranches += Integer.parseInt(metricsElement.attributeValue("conditionals"));-- coveredStatements += Integer.parseInt(metricsElement.attributeValue("coveredstatements"));- coveredMethods += Integer.parseInt(metricsElement.attributeValue("coveredmethods"));- coveredBranches += Integer.parseInt(metricsElement.attributeValue("coveredconditionals"));+ Document doc = reader.read(file);+ for (Element projectElement: doc.getRootElement().elements("project")) {+ Element metricsElement = projectElement.element("metrics");++ totalStatements += Integer.parseInt(metricsElement.attributeValue("statements"));+ totalMethods += Integer.parseInt(metricsElement.attributeValue("methods"));+ totalBranches += Integer.parseInt(metricsElement.attributeValue("conditionals"));++ coveredStatements += Integer.parseInt(metricsElement.attributeValue("coveredstatements"));+ coveredMethods += Integer.parseInt(metricsElement.attributeValue("coveredmethods"));+ coveredBranches += Integer.parseInt(metricsElement.attributeValue("coveredconditionals"));++ for (Element packageElement: projectElement.elements("package")) {+ String packageName = packageElement.attributeValue("name");++ metricsElement = packageElement.element("metrics");- for (Element packageElement: projectElement.elements("package")) {- for (Element fileElement: packageElement.elements("file")) {- String path = fileElement.attributeValue("path");- if (build.getJobWorkspace() != null && path.startsWith(build.getJobWorkspace())) {- path = path.substring(build.getJobWorkspace().length()+1);- Map<Integer, Integer> lineCoverages = new HashMap<>();- for (Element lineElement: fileElement.elements("line")) {- int lineNum = Integer.parseInt(lineElement.attributeValue("num")) - 1;- String testCountStr = lineElement.attributeValue("count");- if (testCountStr != null) {- int testCount = Integer.parseInt(testCountStr);- lineCoverages.merge(lineNum, testCount, (v1, v2)->v1+v2);- }+ Coverage packageStatementCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("statements")),+ Integer.parseInt(metricsElement.attributeValue("coveredstatements")));+ Coverage packageMethodCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("methods")),+ Integer.parseInt(metricsElement.attributeValue("coveredmethods")));+ Coverage packageBranchCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("conditionals")),+ Integer.parseInt(metricsElement.attributeValue("coveredconditionals")));++ int packageTotalLines = 0;+ int packageCoveredLines = 0;++ List<FileCoverageInfo> fileCoverages = new ArrayList<>();+ for (Element fileElement: packageElement.elements("file")) {+ String fileName = fileElement.attributeValue("name");+ String filePath = fileElement.attributeValue("path");+ if (build.getJobWorkspace() != null && filePath.startsWith(build.getJobWorkspace())) {+ filePath = filePath.substring(build.getJobWorkspace().length()+1);++ metricsElement = fileElement.element("metrics");++ Coverage fileStatementCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("statements")),+ Integer.parseInt(metricsElement.attributeValue("coveredstatements")));+ Coverage fileMethodCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("methods")),+ Integer.parseInt(metricsElement.attributeValue("coveredmethods")));+ Coverage fileBranchCoverage = new Coverage(+ Integer.parseInt(metricsElement.attributeValue("conditionals")),+ Integer.parseInt(metricsElement.attributeValue("coveredconditionals")));++ Map<Integer, Integer> lineCoverages = new HashMap<>();+ for (Element lineElement: fileElement.elements("line")) {+ int lineNum = Integer.parseInt(lineElement.attributeValue("num")) - 1;+ String testCountStr = lineElement.attributeValue("count");+ if (testCountStr != null) {+ int testCount = Integer.parseInt(testCountStr);+ lineCoverages.merge(lineNum, testCount, (v1, v2)->v1+v2);}- totalLines += lineCoverages.size();- coveredLines += lineCoverages.entrySet().stream().filter(it->it.getValue()!=0).count();-- File lineCoverateFile = new File(reportDir, LINE_COVERAGES_DIR + "/" + path);- FileUtils.createDir(lineCoverateFile.getParentFile());- try (OutputStream os = new FileOutputStream(lineCoverateFile)) {- SerializationUtils.serialize((Serializable) lineCoverages, os);- } catch (IOException e) {- throw new RuntimeException(e);- };}+ int fileTotalLines = lineCoverages.size();+ int fileCoveredLines = (int) lineCoverages.entrySet().stream().filter(it->it.getValue()!=0).count();++ Coverage fileLineCoverage = new Coverage(fileTotalLines, fileCoveredLines);++ packageTotalLines += fileTotalLines;+ packageCoveredLines += fileCoveredLines;++ File testCountFile = new File(reportDir, TEST_COUNTS_DIR + "/" + filePath);+ FileUtils.createDir(testCountFile.getParentFile());+ try (OutputStream os = new FileOutputStream(testCountFile)) {+ SerializationUtils.serialize((Serializable) lineCoverages, os);+ } catch (IOException e) {+ throw new RuntimeException(e);+ };+ fileCoverages.add(new FileCoverageInfo(fileName,+ fileStatementCoverage, fileMethodCoverage, fileBranchCoverage, fileLineCoverage,+ filePath));}}++ Coverage packageLineCoverage = new Coverage(packageTotalLines, packageCoveredLines);++ packageCoverages.add(new PackageCoverageInfo(+ packageName,+ packageStatementCoverage, packageMethodCoverage,+ packageBranchCoverage, packageLineCoverage,+ fileCoverages));++ totalLines += packageTotalLines;+ coveredLines += packageCoveredLines;}- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);}- hasReport = true;- }- if (hasReport) {- CloverReportData report = new CloverReportData(totalStatements, coveredStatements, totalMethods, coveredMethods,- totalBranches, coveredBranches, totalLines, coveredLines);- FileUtils.createDir(reportDir);- report.writeTo(reportDir);- return report;- } else {- return null;}++ CoverageInfo coverageInfo = new CoverageInfo(+ new Coverage(totalStatements, coveredStatements),+ new Coverage(totalMethods, coveredMethods),+ new Coverage(totalBranches, coveredBranches),+ new Coverage(totalLines, coveredLines));++ return new CloverReportData(coverageInfo, packageCoverages);}});-- if (report != null) {++ if (!reportData.getPackageCoverages().isEmpty()) {+ FileUtils.createDir(reportDir);+ reportData.writeTo(reportDir);+CloverMetric metric = new CloverMetric();metric.setBuild(build);metric.setReportName(getReportName());- metric.setBranchCoverage(report.getBranchCoverage());- metric.setLineCoverage(report.getLineCoverage());- metric.setMethodCoverage(report.getMethodCoverage());- metric.setStatementCoverage(report.getStatementCoverage());- metric.setTotalBranches(report.getTotalBranches());- metric.setTotalLines(report.getTotalLines());- metric.setTotalMethods(report.getTotalMethods());- metric.setTotalStatements(report.getTotalStatements());++ CoverageInfo coverages = reportData.getOverallCoverages();+ metric.setBranchCoverage(coverages.getBranchCoverage().getPercent());+ metric.setLineCoverage(coverages.getLineCoverage().getPercent());+ metric.setMethodCoverage(coverages.getMethodCoverage().getPercent());+ metric.setStatementCoverage(coverages.getStatementCoverage().getPercent());+ metric.setTotalBranches(coverages.getBranchCoverage().getTotal());+ metric.setTotalLines(coverages.getLineCoverage().getTotal());+ metric.setTotalMethods(coverages.getMethodCoverage().getTotal());+ metric.setTotalStatements(coverages.getStatementCoverage().getTotal());OneDev.getInstance(Dao.class).persist(metric);- }+ }}}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.javanew file mode 100644index 0000000000..6df2daed6e--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.java@@ -0,0 +1,22 @@+package org.server.plugin.report.clover;++import io.onedev.server.util.Coverage;++public class NamedCoverageInfo extends CoverageInfo {++ private static final long serialVersionUID = 1L;++ private final String name;++ public NamedCoverageInfo(String name,+ Coverage statementCoverage, Coverage methodCoverage,+ Coverage branchCoverage, Coverage lineCoverage) {+ super(statementCoverage, methodCoverage, branchCoverage, lineCoverage);+ this.name = name;+ }++ public String getName() {+ return name;+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.javanew file mode 100644index 0000000000..1fd4e1e689--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.java@@ -0,0 +1,25 @@+package org.server.plugin.report.clover;++import java.util.List;++import io.onedev.server.util.Coverage;++public class PackageCoverageInfo extends NamedCoverageInfo {++ private static final long serialVersionUID = 1L;++ private final List<FileCoverageInfo> fileCoverages;++ public PackageCoverageInfo(String name,+ Coverage statementCoverage, Coverage methodCoverage,+ Coverage branchCoverage, Coverage lineCoverage,+ List<FileCoverageInfo> fileCoverages) {+ super(name, statementCoverage, methodCoverage, branchCoverage, lineCoverage);+ this.fileCoverages = fileCoverages;+ }++ public List<FileCoverageInfo> getFileCoverages() {+ return fileCoverages;+ }++}diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.cssnew file mode 100644index 0000000000..748e246d3c--- /dev/null+++ b/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css@@ -0,0 +1,35 @@+.clover-report .items .item {+ border-top-style: dashed !important;+}++.coverages>.coverage {+ margin-right: 1.2rem;+ width: 10%;+ flex-grow: 1;+}+.coverages>.coverage>.label {+ font-size: 0.9rem;+ color: gray;+ margin-bottom: 0.3rem;+}+.clover-report>.coverages>.coverages>.coverage>.label {+ font-size: 1rem;+ color: inherit;+ margin-bottom: 0.5rem;+}+.coverages>.coverage:last-child {+ margin-right: 0;+}++@media(max-width: 991px) {+.coverages>.coverage {+ width: 40%;+}+.coverages>.coverage.method {+ margin-bottom: 0.5rem;+}+.coverages>.coverage.branch {+ margin-right: 0;+ margin-bottom: 0.5rem;+}+}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.javaindex 37c13f7637..4c7618b506 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportModule.java@@ -6,9 +6,6 @@ import java.util.Collection;import java.util.List;import java.util.concurrent.Callable;-import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -27,14 +24,12 @@ import io.onedev.server.search.buildmetric.BuildMetricQuery;import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.mapper.DynamicPathPageMapper;import io.onedev.server.web.page.layout.SidebarMenuItem;import io.onedev.server.web.page.project.StatisticsMenuContribution;-import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.BuildTab;import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;+import io.onedev.server.web.page.project.builds.detail.report.BuildReportTab;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -71,8 +66,8 @@ public class JestTestReportModule extends AbstractPluginModule {public Void call() throws Exception {if (build.getReportDir(JobJestReport.DIR).exists()) {for (File reportDir: build.getReportDir(JobJestReport.DIR).listFiles()) {- if (SecurityUtils.canAccessReport(build, reportDir.getName()))- tabs.add(new JestReportTab(reportDir.getName()));+ if (!reportDir.isHidden() && SecurityUtils.canAccessReport(build, reportDir.getName()))+ tabs.add(new BuildReportTab(reportDir.getName(), JestTestSuitesPage.class, JestTestCasesPage.class));}}return null;@@ -123,40 +118,4 @@ public class JestTestReportModule extends AbstractPluginModule {});}- private static class JestReportTab extends BuildTab {-- private static final long serialVersionUID = 1L;-- public JestReportTab(String title) {- super(title, JestTestSuitesPage.class, JestTestReportPage.class);- }-- @Override- public Component render(String componentId) {- return new PageTabHead(componentId, this) {-- private static final long serialVersionUID = 1L;-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- BuildDetailPage page = (BuildDetailPage) getPage();- PageParameters params = JestTestReportPage.paramsOf(- page.getBuild(), getTitle());- return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);- }-- };- }-- @Override- public boolean isActive(Page currentPage) {- if (super.isActive(currentPage)) {- JestTestReportPage jestReportPage = (JestTestReportPage) currentPage;- return getTitle().equals(jestReportPage.getReportName());- } else {- return false;- }- }-- }}diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.javaindex 8ad798280c..2420b10c9b 100644--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/JestTestReportPage.java@@ -18,25 +18,20 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.model.Build;import io.onedev.server.model.support.BuildMetric;import io.onedev.server.search.buildmetric.BuildMetricQuery;import io.onedev.server.search.buildmetric.BuildMetricQueryParser;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.BuildTab;+import io.onedev.server.web.page.project.builds.detail.report.BuildReportPage;@SuppressWarnings("serial")-public abstract class JestTestReportPage extends BuildDetailPage {+public abstract class JestTestReportPage extends BuildReportPage {- private static final String PARAM_REPORT = "report";-- private final String reportName;-private final IModel<JestTestReportData> reportDataModel = new LoadableDetachableModel<JestTestReportData>() {@Override@@ -45,7 +40,7 @@ public abstract class JestTestReportPage extends BuildDetailPage {@Overridepublic JestTestReportData call() throws Exception {- File reportsDir = new File(getBuild().getReportDir(JobJestReport.DIR), reportName);+ File reportsDir = new File(getBuild().getReportDir(JobJestReport.DIR), getReportName());return JestTestReportData.readFrom(reportsDir);}@@ -56,8 +51,6 @@ public abstract class JestTestReportPage extends BuildDetailPage {public JestTestReportPage(PageParameters params) {super(params);-- reportName = params.get(PARAM_REPORT).toString();}@Override@@ -82,21 +75,6 @@ public abstract class JestTestReportPage extends BuildDetailPage {return reportDataModel.getObject();}- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccessReport(getBuild(), reportName);- }-- public String getReportName() {- return reportName;- }-- public static PageParameters paramsOf(Build build, String reportName) {- PageParameters params = paramsOf(build);- params.add(PARAM_REPORT, reportName);- return params;- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -117,7 +95,7 @@ public abstract class JestTestReportPage extends BuildDetailPage {BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since),BuildMetric.NAME_REPORT,BuildMetricQuery.getRuleName(BuildMetricQueryParser.Is),- reportName);+ getReportName());PageParameters params = JestTestStatsPage.paramsOf(getProject(), query);fragment.add(new ViewStateAwarePageLink<>("link", JestTestStatsPage.class, params));return fragment;@@ -131,7 +109,7 @@ public abstract class JestTestReportPage extends BuildDetailPage {protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {BuildDetailPage page = (BuildDetailPage) getPage();PageParameters params = JestTestReportPage.paramsOf(- page.getBuild(), reportName);+ page.getBuild(), getReportName());return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);}@@ -142,7 +120,7 @@ public abstract class JestTestReportPage extends BuildDetailPage {public boolean isActive(Page currentPage) {if (super.isActive(currentPage)) {JestTestReportPage jestReportPage = (JestTestReportPage) currentPage;- return reportName.equals(jestReportPage.getReportName());+ return getReportName().equals(jestReportPage.getReportName());} else {return false;}