Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring of TestReportHandler and TreePrinter for Improved Code Quality and performance optimization #57

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Refactoring of TestReportHandler and TreePrinter for Improved Code Quality and performance optimization #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e77a0d4
Refactoring TestReportHandler.java
neewrobert Aug 15, 2024
13d2c9b
Small refactoring in the TreePrinter class
neewrobert Aug 27, 2024
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
28 changes: 16 additions & 12 deletions src/main/java/org/apache/maven/plugin/surefire/report/TestReportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@

import org.apache.maven.surefire.api.report.ReportEntry;

import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;

import static java.util.Collections.*;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;

public class TestReportHandler {

protected static final Map<String, Set<String>> classNames = synchronizedMap(new HashMap<>());
protected static final Map<String, List<WrappedReportEntry>> classEntries = synchronizedMap(new HashMap<>());
protected static final Map<String, List<WrappedReportEntry>> testEntries = synchronizedMap(new HashMap<>());
protected static final Map<String, Set<String>> classNames = new ConcurrentHashMap<>();
protected static final Map<String, List<WrappedReportEntry>> classEntries = new ConcurrentHashMap<>();
protected static final Map<String, List<WrappedReportEntry>> testEntries = new ConcurrentHashMap<>();
protected static final int $ = 36;

private final ReportEntry report;
Expand All @@ -34,7 +42,7 @@ public void prepare() {
}
}

public void print(BiFunction<List<WrappedReportEntry>,List<WrappedReportEntry>, TreePrinter> getTreePrinter) {
public void print(BiFunction<List<WrappedReportEntry>, List<WrappedReportEntry>, TreePrinter> getTreePrinter) {
if (isMarkedAsNestedTest()) {
prepareEntriesForNestedTests();
if (isNestedTestReadyToPrint()) {
Expand All @@ -50,8 +58,7 @@ private boolean isMarkedAsNestedTest() {
}

private void prepareClassEntriesForNestedTest() {
classEntries.putIfAbsent(sourceRootName, new ArrayList<>());
classEntries.computeIfPresent(sourceRootName, addToCollection((WrappedReportEntry) report));
classEntries.computeIfAbsent(sourceRootName, k -> new ArrayList<>()).add((WrappedReportEntry) report);
}

private List<WrappedReportEntry> getClassEntryList() {
Expand Down Expand Up @@ -137,9 +144,6 @@ private boolean hasNestedTests(TestSetStats testSetStats) {
}

private boolean hasNestedTests(ReportEntry reportEntry) {
return reportEntry.getSourceName()
.chars()
.filter(c -> c == $)
.count() > 0;
return reportEntry.getSourceName().chars().anyMatch(c -> c == $);
}
}
51 changes: 25 additions & 26 deletions src/main/java/org/apache/maven/plugin/surefire/report/TreePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
package org.apache.maven.plugin.surefire.report;

import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup;
import static org.apache.maven.plugin.surefire.report.TextFormatter.abbreviateName;
import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer;

import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.LongStream;

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Expand All @@ -31,10 +17,24 @@
* under the License.
*/

package org.apache.maven.plugin.surefire.report;

import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.surefire.shared.lang3.StringUtils;
import org.apache.maven.surefire.shared.utils.logging.MessageBuilder;

import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.stream.LongStream;

import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup;
import static org.apache.maven.plugin.surefire.report.TextFormatter.abbreviateName;
import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer;

/**
* Tree view printer.
*
Expand Down Expand Up @@ -77,22 +77,22 @@ public void printTests() {
testSetStats
.stream()
.map(TestPrinter::new)
.forEach(TestPrinter::printTest);
testSetStats
.stream()
.map(TestPrinter::new)
.forEach(TestPrinter::printDetails);
.forEach(printer -> {
printer.printTest();
printer.printDetails();
});
}

private class TestPrinter {

private final WrappedReportEntry testResult;
private final int treeLength;
private final Theme theme = options.getTheme();
private final Theme theme;

public TestPrinter(WrappedReportEntry testResult) {
this.testResult = testResult;
this.treeLength = getTreeLength();
this.theme = options.getTheme();
}

private void printDetails() {
Expand Down Expand Up @@ -138,7 +138,7 @@ private void printSuccess() {
println(buffer()
.success(theme.successful() + abbreviateName(testResult.getReportName())));
}

private void printSkipped() {
println(buffer()
.warning(theme.skipped() + getSkippedReport())
Expand Down Expand Up @@ -175,27 +175,26 @@ private void printStdOut() {
println(buffer().strong("Standard out").toString());
try {
testResult.getStdout().writeTo(System.out);
} catch (final IOException ignored) {
}
catch (final IOException ignored) {}
}

private void printStdErr() {
println("");
println(buffer().strong("Standard error").toString());
try {
testResult.getStdErr().writeTo(System.err);
} catch (final IOException ignored) {
}
catch (final IOException ignored) {}
}

private void printStackTrace() {
println("");
println(buffer().strong("Stack trace").toString());
String stackTrace = testResult.getStackTrace(false);
if (stackTrace != null && !StringUtils.isBlank(stackTrace)) {
println(testResult.getStackTrace(false));
}
else {
} else {
println("[No stack trace available]");
}
}
Expand Down