Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import edu.hm.hafner.util.ResourceTest;

import io.jenkins.plugins.coverage.adapter.CoberturaReportAdapter;
import io.jenkins.plugins.coverage.adapter.JacocoReportAdapter;
import io.jenkins.plugins.coverage.adapter.JacocoReportAdapter.JacocoReportAdapterDescriptor;
import io.jenkins.plugins.coverage.exception.CoverageException;
Expand Down Expand Up @@ -47,6 +48,27 @@ public CoverageResult readResult(final String fileName) {
}
}

/**
* Reads the {@link CoverageResult} from a coverage report.
*
* @param fileName
* The name of the coverage report file
*
* @return the parsed coverage results
*/
public CoverageResult readCoberturaResult(final String fileName) {
try {
CoberturaReportAdapter parser = new CoberturaReportAdapter("unused");
CoverageElementRegister.addCoverageElements(new CoberturaReportAdapter.CoberturaReportAdapterDescriptor().getCoverageElements());
CoverageResult result = parser.getResult(getResourceAsFile(fileName).toFile());
result.stripGroup();
return result;
}
catch (CoverageException exception) {
throw new AssertionError(exception);
}
}

/**
* Reads the {@link CoverageNode} from a coverage report.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import nl.jqno.equalsverifier.Warning;

import io.jenkins.plugins.coverage.model.Coverage.CoverageBuilder;
import io.jenkins.plugins.coverage.targets.CoverageResult;

import static io.jenkins.plugins.coverage.model.Assertions.*;
import static org.mockito.Mockito.*;
Expand All @@ -32,6 +33,31 @@ void shouldProvideEmptyPathForDefaultPackage() {
assertThat(node.getPath()).isEqualTo("");
}

@Test
void shouldReturnCoberturaNpeReportIssue473() {
CoverageResult result = readCoberturaResult("cobertura-npe.xml");
CoverageNode tree = new CoverageNodeConverter().convert(result);

assertThat(tree.getAll(MODULE)).hasSize(1).extracting(CoverageNode::getName).containsOnly("cobertura: cobertura-npe.xml");
assertThat(tree.getAll(PACKAGE)).hasSize(1).extracting(CoverageNode::getName).containsOnly("CoverageTest.Service");
assertThat(tree.getAll(FILE)).hasSize(2).extracting(CoverageNode::getName).containsOnly("Program.cs", "Startup.cs");
assertThat(tree.getAll(CLASS)).hasSize(2).extracting(CoverageNode::getName).containsOnly("Lisec.CoverageTest.Program", "Lisec.CoverageTest.Startup");

assertThat(tree).hasOnlyMetrics(MODULE, PACKAGE, FILE, CLASS, METHOD, LINE, BRANCH);
assertThat(tree.getMetricsDistribution()).containsExactly(
entry(MODULE, getCoverage(1, 0)),
entry(PACKAGE, getCoverage(1, 0)),
entry(FILE, getCoverage(2, 0)),
entry(CLASS, getCoverage(2, 0)),
entry(METHOD, getCoverage(4, 1)),
entry(LINE, getCoverage(44, 9)),
entry(BRANCH, getCoverage(3, 1)));
}

private static Coverage getCoverage(final int covered, final int missed) {
return new CoverageBuilder().setCovered(covered).setMissed(missed).build();
}

@Test
void shouldReturnEmptyCoverageIfNotFound() {
CoverageNode root = readExampleReport();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
<?xml version="1.0" encoding="utf-8"?>
<coverage line-rate="0.8301000000000001" branch-rate="0.75" version="1.9" timestamp="1663310122" lines-covered="44" lines-valid="53" branches-covered="3" branches-valid="4">
<sources>
<source>/CoverageTest.Service/</source>
</sources>
<packages>
<package name="CoverageTest.Service" line-rate="0.8301000000000001" branch-rate="0.75" complexity="8">
<classes>
<class name="Lisec.CoverageTest.Program" filename="Program.cs" line-rate="0.6842" branch-rate="1" complexity="2">
<methods>
<method name="Main" signature="(System.String[])" line-rate="0" branch-rate="1" complexity="1">
<lines>
<line number="14" hits="0" branch="False" />
<line number="15" hits="0" branch="False" />
<line number="16" hits="0" branch="False" />
</lines>
</method>
<method name="CreateHostBuilder" signature="(System.String[])" line-rate="0.8125" branch-rate="1" complexity="1">
<lines>
<line number="19" hits="1" branch="False" />
<line number="20" hits="1" branch="False" />
<line number="21" hits="1" branch="False" />
<line number="22" hits="1" branch="False" />
<line number="23" hits="1" branch="False" />
<line number="24" hits="0" branch="False" />
<line number="25" hits="0" branch="False" />
<line number="26" hits="0" branch="False" />
<line number="27" hits="1" branch="False" />
<line number="28" hits="1" branch="False" />
<line number="29" hits="1" branch="False" />
<line number="30" hits="1" branch="False" />
<line number="31" hits="1" branch="False" />
<line number="32" hits="1" branch="False" />
<line number="33" hits="1" branch="False" />
<line number="34" hits="2" branch="False" />
</lines>
</method>
</methods>
<lines>
<line number="14" hits="0" branch="False" />
<line number="15" hits="0" branch="False" />
<line number="16" hits="0" branch="False" />
<line number="19" hits="1" branch="False" />
<line number="20" hits="1" branch="False" />
<line number="21" hits="1" branch="False" />
<line number="22" hits="1" branch="False" />
<line number="23" hits="1" branch="False" />
<line number="24" hits="0" branch="False" />
<line number="25" hits="0" branch="False" />
<line number="26" hits="0" branch="False" />
<line number="27" hits="1" branch="False" />
<line number="28" hits="1" branch="False" />
<line number="29" hits="1" branch="False" />
<line number="30" hits="1" branch="False" />
<line number="31" hits="1" branch="False" />
<line number="32" hits="1" branch="False" />
<line number="33" hits="1" branch="False" />
<line number="34" hits="2" branch="False" />
</lines>
</class>
<class name="Lisec.CoverageTest.Startup" filename="Startup.cs" line-rate="0.9117000000000001" branch-rate="0.75" complexity="6">
<methods>
<method name="ConfigureServices" signature="(Microsoft.Extensions.DependencyInjection.IServiceCollection)" line-rate="1" branch-rate="1" complexity="1">
<lines>
<line number="31" hits="2" branch="False" />
<line number="32" hits="2" branch="False" />
<line number="33" hits="2" branch="False" />
<line number="34" hits="2" branch="False" />
<line number="35" hits="2" branch="False" />
<line number="36" hits="2" branch="False" />
<line number="37" hits="2" branch="False" />
<line number="38" hits="2" branch="False" />
<line number="41" hits="2" branch="False" />
<line number="44" hits="2" branch="False" />
</lines>
</method>
<method name="Configure" signature="(Microsoft.AspNetCore.Builder.IApplicationBuilder,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)" line-rate="0.85" branch-rate="0.75" complexity="4">
<lines>
<line number="48" hits="1" branch="False" />
<line number="49" hits="1" branch="True" condition-coverage="100% (2/2)">
<conditions>
<condition number="27" type="jump" coverage="100%" />
</conditions>
</line>
<line number="50" hits="1" branch="False" />
<line number="51" hits="1" branch="False" />
<line number="52" hits="1" branch="False" />
<line number="54" hits="1" branch="False" />
<line number="56" hits="1" branch="False" />
<line number="57" hits="1" branch="False" />
<line number="58" hits="1" branch="False" />
<line number="59" hits="1" branch="False" />
<line number="60" hits="1" branch="False" />
<line number="61" hits="1" branch="True" condition-coverage="50% (1/2)">
<conditions>
<condition number="47" type="jump" coverage="50%" />
</conditions>
</line>
<line number="62" hits="0" branch="False" />
<line number="63" hits="1" branch="False" />
<line number="64" hits="1" branch="False" />
<line number="65" hits="0" branch="False" />
<line number="66" hits="0" branch="False" />
<line number="67" hits="1" branch="False" />
<line number="68" hits="2" branch="False" />
<line number="69" hits="1" branch="False" />
</lines>
</method>
<method name=".ctor" signature="(Microsoft.AspNetCore.Hosting.IWebHostEnvironment)" line-rate="1" branch-rate="1" complexity="1">
<lines>
<line number="23" hits="3" branch="False" />
<line number="24" hits="3" branch="False" />
<line number="25" hits="3" branch="False" />
<line number="26" hits="3" branch="False" />
</lines>
</method>
</methods>
<lines>
<line number="31" hits="2" branch="False" />
<line number="32" hits="2" branch="False" />
<line number="33" hits="2" branch="False" />
<line number="34" hits="2" branch="False" />
<line number="35" hits="2" branch="False" />
<line number="36" hits="2" branch="False" />
<line number="37" hits="2" branch="False" />
<line number="38" hits="2" branch="False" />
<line number="41" hits="2" branch="False" />
<line number="44" hits="2" branch="False" />
<line number="48" hits="1" branch="False" />
<line number="49" hits="1" branch="True" condition-coverage="100% (2/2)">
<conditions>
<condition number="27" type="jump" coverage="100%" />
</conditions>
</line>
<line number="50" hits="1" branch="False" />
<line number="51" hits="1" branch="False" />
<line number="52" hits="1" branch="False" />
<line number="54" hits="1" branch="False" />
<line number="56" hits="1" branch="False" />
<line number="57" hits="1" branch="False" />
<line number="58" hits="1" branch="False" />
<line number="59" hits="1" branch="False" />
<line number="60" hits="1" branch="False" />
<line number="61" hits="1" branch="True" condition-coverage="50% (1/2)">
<conditions>
<condition number="47" type="jump" coverage="50%" />
</conditions>
</line>
<line number="62" hits="0" branch="False" />
<line number="63" hits="1" branch="False" />
<line number="64" hits="1" branch="False" />
<line number="65" hits="0" branch="False" />
<line number="66" hits="0" branch="False" />
<line number="67" hits="1" branch="False" />
<line number="68" hits="2" branch="False" />
<line number="69" hits="1" branch="False" />
<line number="23" hits="3" branch="False" />
<line number="24" hits="3" branch="False" />
<line number="25" hits="3" branch="False" />
<line number="26" hits="3" branch="False" />
</lines>
</class>
</classes>
</package>
</packages>
</coverage>