Merge pull request #322 from uhafner/dependabot/maven/edu.hm.hafner-c…

…overage-model-0.42.0 Bump edu.hm.hafner:coverage-model from 0.41.0 to 0.42.0
uhafner · Mar 8, 2024 · 9d2970c · 9d2970c
2 parents fc4446f + 28a9465
commit 9d2970c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
  <jackson-databind.version>2.16.1</jackson-databind.version>
  <analysis-model.version>12.1.0</analysis-model.version>
- <coverage-model.version>0.41.0</coverage-model.version>
+ <coverage-model.version>0.42.0</coverage-model.version>
  <java.version>17</java.version>
 
  </properties>

diff --git a/src/main/java/edu/hm/hafner/grading/FileSystemCoverageReportFactory.java b/src/main/java/edu/hm/hafner/grading/FileSystemCoverageReportFactory.java
@@ -31,7 +31,7 @@ public Node create(final ToolConfiguration tool, final FilteredLog log) {
 
  var nodes = new ArrayList<Node>();
  for (Path file : REPORT_FINDER.find(tool, log)) {
- var node = parser.parse(new FileReaderFactory(file).create(), log);
+ var node = parser.parse(new FileReaderFactory(file).create(), file.toString(), log);
  log.logInfo("- %s: %s", PATH_UTIL.getRelativePath(file), extractMetric(tool, node));
  nodes.add(node);
  }

diff --git a/src/test/java/edu/hm/hafner/grading/AggregatedScoreTest.java b/src/test/java/edu/hm/hafner/grading/AggregatedScoreTest.java
@@ -393,9 +393,10 @@ void shouldGradeCoverageReport() {
 
  private Node readReport(final ToolConfiguration tool) {
  var parser = new ParserRegistry().get(CoverageParserType.JACOCO, ProcessingMode.FAIL_FAST);
- try (InputStream stream = createStream("jacoco.xml");
+ var fileName = "jacoco.xml";
+ try (InputStream stream = createStream(fileName);
  Reader reader = new InputStreamReader(Objects.requireNonNull(stream), StandardCharsets.UTF_8)) {
- var root = parser.parse(reader, new FilteredLog("Test"));
+ var root = parser.parse(reader, fileName, new FilteredLog("Test"));
  var containerNode = new ModuleNode(tool.getDisplayName());
  containerNode.addChild(root);
  return containerNode;

diff --git a/src/test/java/edu/hm/hafner/grading/FileSystemTestReportFactoryTest.java b/src/test/java/edu/hm/hafner/grading/FileSystemTestReportFactoryTest.java
@@ -47,7 +47,7 @@ void shouldCreateSingleReport() {
  }
 
  private void assertTestClasses(final List<ClassNode> classNodes) {
- assertThat(classNodes).extracting(ClassNode::getName).containsExactly(
+ assertThat(classNodes).extracting(ClassNode::getName).containsExactlyInAnyOrder(
  "Aufgabe3Test",
  "edu.hm.hafner.grading.AutoGradingActionTest",
  "edu.hm.hafner.grading.ReportFinderTest");
@@ -61,7 +61,7 @@ void shouldCreateAggregation() {
  score.gradeTests(new FileSystemTestReportFactory());
 
  assertTestClasses(score.getTestScores().get(0).getReport().getAllClassNodes());
- assertThat(log.getInfoMessages()).contains(
+ assertThat(log.getInfoMessages()).containsAnyOf(
  "Searching for Unittests results matching file name pattern **/src/**/TEST*.xml",
  "- src/test/resources/edu/hm/hafner/grading/TEST-Aufgabe3Test.xml: TESTS: 33",
  "- src/test/resources/edu/hm/hafner/grading/TEST-edu.hm.hafner.grading.AutoGradingActionTest.xml: TESTS: 1",