[SUREFIRE-2257] [REGRESSION] NPEx: Cannot invoke "Object.toString()" …

…because "value" is null This closes #774
apache · Aug 28, 2024 · 69c1b46 · 69c1b46
1 parent e99f11e
commit 69c1b46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java b/...plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java
@@ -190,14 +190,14 @@ private void renderSectionPackages() {
         });
 
         for (Map.Entry<String, List<ReportTestSuite>> entry : suitePackages.entrySet()) {
-            String packageName = entry.getKey();
+            String packageName = !entry.getKey().isEmpty() ? entry.getKey() : "(default package)";
 
             List<ReportTestSuite> testSuiteList = entry.getValue();
 
             Map<String, Object> packageSummary = parser.getSummary(testSuiteList);
 
             tableRow(new String[] {
-                createLinkPatternedText(packageName, '#' + packageName),
+                createLinkPatternedText(packageName, '#' + DoxiaUtils.encodeId(packageName)),
                 String.valueOf(packageSummary.get("totalTests")),
                 String.valueOf(packageSummary.get("totalErrors")),
                 String.valueOf(packageSummary.get("totalFailures")),
@@ -213,7 +213,7 @@ private void renderSectionPackages() {
         paragraph(getI18nString("surefire", "text.note2"));
 
         for (Map.Entry<String, List<ReportTestSuite>> entry : suitePackages.entrySet()) {
-            String packageName = entry.getKey();
+            String packageName = !entry.getKey().isEmpty() ? entry.getKey() : "(default package)";
 
             List<ReportTestSuite> testSuiteList = entry.getValue();
 
@@ -265,7 +265,7 @@ private void renderSectionTestSuite(ReportTestSuite suite) {
 
         sink.tableCell();
 
-        sink.link("#" + suite.getPackageName() + '.' + suite.getName());
+        sink.link("#" + suite.getFullClassName());
 
         if (suite.getNumberOfErrors() > 0) {
             sinkIcon("error");
@@ -281,7 +281,7 @@ private void renderSectionTestSuite(ReportTestSuite suite) {
 
         sink.tableCell_();
 
-        tableCell(createLinkPatternedText(suite.getName(), '#' + suite.getPackageName() + '.' + suite.getName()));
+        tableCell(createLinkPatternedText(suite.getName(), '#' + suite.getFullClassName()));
 
         tableCell(Integer.toString(suite.getNumberOfTests()));
 
@@ -314,7 +314,7 @@ private void renderSectionTestCases() {
             List<ReportTestCase> testCases = suite.getTestCases();
 
             if (!testCases.isEmpty()) {
-                startSection(suite.getName(), suite.getPackageName() + '.' + suite.getName());
+                startSection(suite.getName(), suite.getFullClassName());
 
                 boolean showTable = false;
 

diff --git a/...report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java b/...report-parser/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
@@ -131,6 +131,8 @@ public ReportTestSuite setFullClassName(String fullClassName) {
         this.fullClassName = fullClassName;
         int lastDotPosition = fullClassName.lastIndexOf(".");
         name = fullClassName.substring(lastDotPosition + 1, fullClassName.length());
+        // For the default package we will set an empty string instead of null because otherwise
+        // the package name cannot be used as a map key.
         packageName = lastDotPosition == -1 ? "" : fullClassName.substring(0, lastDotPosition);
         return this;
     }