Merge pull request #425 from uhafner/empty-name

Add fallback name if no configuration name is specified
uhafner · Feb 26, 2025 · 831874e · 831874e
2 parents 5ef397f + d1eef99
commit 831874e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/main/java/edu/hm/hafner/grading/AggregatedScore.java b/src/main/java/edu/hm/hafner/grading/AggregatedScore.java
@@ -1,18 +1,5 @@
 package edu.hm.hafner.grading;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import org.apache.commons.lang3.StringUtils;
 
 import edu.hm.hafner.analysis.Issue;
@@ -27,6 +14,19 @@
 import edu.hm.hafner.util.FilteredLog;
 import edu.hm.hafner.util.Generated;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * Stores the scores of an autograding run. Persists the configuration and the scores for each metric.
  *
@@ -390,7 +390,7 @@ private <S extends Score<S, C>, C extends Configuration> void grade(final ToolPa
             }
 
             builder.setConfiguration(configuration);
-            builder.setName(StringUtils.defaultIfBlank(configuration.getName(), "Tests"));
+            builder.setName(configuration.getName());
             builder.setIcon(configuration.getIcon());
 
             var aggregation = builder.aggregate(scores);

diff --git a/src/main/java/edu/hm/hafner/grading/FileSystemToolParser.java b/src/main/java/edu/hm/hafner/grading/FileSystemToolParser.java
@@ -1,9 +1,5 @@
 package edu.hm.hafner.grading;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-
 import org.apache.commons.lang3.StringUtils;
 
 import edu.hm.hafner.analysis.FileReaderFactory;
@@ -18,6 +14,10 @@
 import edu.hm.hafner.util.FilteredLog;
 import edu.hm.hafner.util.PathUtil;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+
 /**
  * Reads analysis or coverage reports of a specific type from the file system into a corresponding Java model.
  *
@@ -48,7 +48,8 @@ public Report readReport(final ToolConfiguration tool, final FilteredLog log) {
 
     @Override
     public Node readNode(final ToolConfiguration tool, final FilteredLog log) {
-        var parser = new edu.hm.hafner.coverage.registry.ParserRegistry().get(StringUtils.upperCase(tool.getId()), ProcessingMode.IGNORE_ERRORS);
+        var parser = new edu.hm.hafner.coverage.registry.ParserRegistry().get(StringUtils.upperCase(tool.getId()),
+                ProcessingMode.IGNORE_ERRORS);
 
         var nodes = new ArrayList<Node>();
         for (Path file : REPORT_FINDER.find(log, tool.getName(), tool.getPattern())) {
@@ -80,7 +81,7 @@ public Node readNode(final ToolConfiguration tool, final FilteredLog log) {
     }
 
     private ContainerNode createEmptyContainer(final ToolConfiguration tool) {
-        return new ContainerNode(tool.getName());
+        return new ContainerNode(StringUtils.defaultIfBlank(tool.getName(), getMetric(tool).getLabel()));
     }
 
     String extractMetric(final ToolConfiguration tool, final Node node) {

diff --git a/src/test/java/edu/hm/hafner/grading/ReportFinderTest.java b/src/test/java/edu/hm/hafner/grading/ReportFinderTest.java
@@ -3,8 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import edu.hm.hafner.util.FilteredLog;
-
-import java.nio.file.Path;
+import edu.hm.hafner.util.PathUtil;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -25,9 +24,9 @@ void shouldFindTestReports() {
     @Test
     void shouldFindSources() {
         var finder = new ReportFinder();
-
+        var pathUtil = new PathUtil();
         assertThat(finder.findGlob("regex:.*Markdown.*\\.java", "src/main/java/", LOG))
-                .map(Path::toString)
+                .map(pathUtil::getRelativePath)
                 .containsExactlyInAnyOrder("src/main/java/edu/hm/hafner/grading/CoverageMarkdown.java",
                         "src/main/java/edu/hm/hafner/grading/CodeCoverageMarkdown.java",
                         "src/main/java/edu/hm/hafner/grading/AnalysisMarkdown.java",