Skip to content

Commit 0d76246

Browse files
committed
chore: sonar issues
1 parent 413aada commit 0d76246

File tree

4 files changed

+42
-35
lines changed

4 files changed

+42
-35
lines changed

src/main/java/org/fugerit/java/junit5/tag/check/facade/DocHelper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
*/
1414
public class DocHelper {
1515

16+
public DocHelper() {}
17+
1618
/*
1719
* FreemarkerDocProcessConfig is thread-safe and should be initialized once for each config file.
1820
*
1921
* Consider using a @ApplicationScoped or Singleton approach.
2022
*/
21-
private static final FreemarkerDocProcessConfig docProcessConfig = FreemarkerDocProcessConfigFacade
23+
private final FreemarkerDocProcessConfig docProcessConfig = FreemarkerDocProcessConfigFacade
2224
.loadConfigSafe("cl://junit5-tag-check-maven-plugin/fm-doc-process-config.xml");
2325

24-
public static void generateReport(String handlerId, ReportHelper reportHelper, OutputStream os ) {
26+
public void generateReport(String handlerId, ReportHelper reportHelper, OutputStream os ) {
2527
SafeFunction.apply( () -> docProcessConfig.
2628
fullProcess( "report",
2729
DocProcessContext.newContext( "report", reportHelper )

src/main/java/org/fugerit/java/junit5/tag/check/facade/TagReportFacade.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.w3c.dom.Document;
1313
import org.w3c.dom.Element;
1414

15+
import javax.print.Doc;
1516
import java.io.*;
1617
import java.util.*;
1718
import java.util.stream.Collectors;
@@ -55,12 +56,14 @@ private void generateReport(Map<ExecutedTest, Set<String>> testTagMap)
5556
generateFjDocReport( helper, format.toLowerCase() );
5657
break;
5758
default:
58-
generateTextReport(testTagMap);
59+
generateTextReport(helper);
5960
}
6061
}
6162

62-
private void generateTextReport(Map<ExecutedTest, Set<String>> testTagMap)
63-
throws IOException {
63+
private void generateTextReport(ReportHelper helper) throws IOException {
64+
65+
Map<ExecutedTest, Set<String>> testTagMap = helper.getTestTagMap();
66+
6467
// Helper method for String.repeat(80)
6568
String separator = repeatString("=", 80);
6669
String line = repeatString("-", 80);
@@ -94,21 +97,8 @@ private void generateTextReport(Map<ExecutedTest, Set<String>> testTagMap)
9497
writer.write("\n");
9598

9699
// Summary by tag (Java 8 compatible map operations: computeIfAbsent is fine)
97-
Map<String, List<ExecutedTest>> tagToTests = new HashMap<>();
98-
Map<String, TestStats> tagStats = new HashMap<>();
99-
100-
for (Map.Entry<ExecutedTest, Set<String>> entry : testTagMap.entrySet()) {
101-
ExecutedTest test = entry.getKey();
102-
for (String tag : entry.getValue()) {
103-
tagToTests.computeIfAbsent(tag, k -> new ArrayList<>()).add(test);
104-
105-
TestStats stats = tagStats.computeIfAbsent(tag, k -> new TestStats());
106-
stats.increaseTotal();
107-
if (test.isFailed()) stats.increaseFailed();
108-
if (test.isError()) stats.increaseErrors();
109-
if (test.isSkipped()) stats.increaseSkipped();
110-
}
111-
}
100+
Map<String, List<ExecutedTest>> tagToTests = helper.getTagsToTests();
101+
Map<String, TestStats> tagStats = helper.getTagsStats();
112102

113103
writer.write("SUMMARY BY TAG:\n");
114104
writer.write(line + "\n");
@@ -193,7 +183,7 @@ private String repeatString(String s, int count) {
193183

194184
private void generateFjDocReport(ReportHelper reportHelper, String handlerId) throws IOException {
195185
try (OutputStream os = new FileOutputStream(outputFile)) {
196-
DocHelper.generateReport( handlerId, reportHelper, os );
186+
new DocHelper().generateReport( handlerId, reportHelper, os );
197187
}
198188
}
199189

src/main/java/org/fugerit/java/junit5/tag/check/model/ExecutedTest.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
package org.fugerit.java.junit5.tag.check.model;
22

3-
/*
4-
5-
{
6-
"class": "test.org.fugerit.java.demo.unittestdemoapp.DocResourceSicurezzaTest",
7-
"method": "testHtmlOkNoAdminRole",
8-
"time": 1.37,
9-
"skipped": false,
10-
"failed": false,
11-
"error": false,
12-
"tags": ["security", "authorized"]
13-
},
14-
15-
*/
16-
173
import com.fasterxml.jackson.annotation.JsonProperty;
184
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
195

src/main/java/org/fugerit/java/junit5/tag/check/model/ReportHelper.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,35 @@ public class ReportHelper {
1111

1212
private ReportModel reportModel;
1313

14+
private Map<String, List<ExecutedTest>> tagToTests;
15+
16+
private Map<String, TestStats> tagStats;
17+
1418
public ReportHelper(Map<ExecutedTest, Set<String>> testTagMap) {
1519
this.testTagMap = testTagMap;
20+
// report model
1621
this.reportModel = new ReportModel();
1722
for (Map.Entry<ExecutedTest, Set<String>> entry : this.getTestTagMap().entrySet()) {
1823
ExecutedTest current = entry.getKey();
1924
current.getTags().addAll(entry.getValue());
2025
reportModel.getExecutedTests().add( current );
2126
}
27+
// tag to test
28+
this.tagToTests = new HashMap<>();
29+
this.tagStats = new HashMap<>();
30+
31+
for (Map.Entry<ExecutedTest, Set<String>> entry : testTagMap.entrySet()) {
32+
ExecutedTest test = entry.getKey();
33+
for (String tag : entry.getValue()) {
34+
tagToTests.computeIfAbsent(tag, k -> new ArrayList<>()).add(test);
35+
36+
TestStats stats = tagStats.computeIfAbsent(tag, k -> new TestStats());
37+
stats.increaseTotal();
38+
if (test.isFailed()) stats.increaseFailed();
39+
if (test.isError()) stats.increaseErrors();
40+
if (test.isSkipped()) stats.increaseSkipped();
41+
}
42+
}
2243
}
2344

2445
public Map<ExecutedTest, Set<String>> getTestTagMap() {
@@ -52,4 +73,12 @@ public Map<String, List<ExecutedTest>> getTagsSummary() {
5273
return tagToTests;
5374
}
5475

76+
public Map<String, List<ExecutedTest>> getTagsToTests() {
77+
return this.tagToTests;
78+
}
79+
80+
public Map<String, TestStats> getTagsStats() {
81+
return this.tagStats;
82+
}
83+
5584
}

0 commit comments

Comments
 (0)