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

Jump to bottom

Use uppercase convention for enum member names #704

Merged
merged 1 commit into from
Dec 24, 2023
Merged

Use uppercase convention for enum member names #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 32 additions & 32 deletions ...-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@

import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel;
import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.error;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.failure;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.flake;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.skipped;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.success;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.unknown;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.ERROR;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.FAILURE;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.FLAKE;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.SKIPPED;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.SUCCESS;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.UNKNOWN;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.FAILURE;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
Expand Down Expand Up @@ -179,9 +179,9 @@ private void runCompleted() {
log("Results:");
log("");
}
boolean printedFailures = printTestFailures(failure);
boolean printedErrors = printTestFailures(error);
boolean printedFlakes = printTestFailures(flake);
boolean printedFailures = printTestFailures(TestResultType.FAILURE);
boolean printedErrors = printTestFailures(TestResultType.ERROR);
boolean printedFlakes = printTestFailures(TestResultType.FLAKE);
if (reportConfiguration.isPrintSummary()) {
if (printedFailures | printedErrors | printedFlakes) {
log("");
Expand Down Expand Up @@ -209,30 +209,30 @@ public RunStatistics getGlobalRunStatistics() {
// Use default visibility for testing
static TestResultType getTestResultType(List<ReportEntryType> reportEntries, int rerunFailingTestsCount) {
if (reportEntries == null || reportEntries.isEmpty()) {
return unknown;
return UNKNOWN;
}

boolean seenSuccess = false, seenFailure = false, seenError = false;
for (ReportEntryType resultType : reportEntries) {
if (resultType == SUCCESS) {
if (resultType == ReportEntryType.SUCCESS) {
seenSuccess = true;
} else if (resultType == FAILURE) {
} else if (resultType == ReportEntryType.FAILURE) {
seenFailure = true;
} else if (resultType == ERROR) {
} else if (resultType == ReportEntryType.ERROR) {
seenError = true;
}
}

if (seenFailure || seenError) {
if (seenSuccess && rerunFailingTestsCount > 0) {
return flake;
return TestResultType.FLAKE;
} else {
return seenError ? error : failure;
return seenError ? TestResultType.ERROR : TestResultType.FAILURE;
}
} else if (seenSuccess) {
return success;
return TestResultType.SUCCESS;
} else {
return skipped;
return SKIPPED;
}
}

Expand Down Expand Up @@ -276,26 +276,26 @@ private void mergeTestHistoryResult() {
}

switch (getTestResultType(resultTypes, reportConfiguration.getRerunFailingTestsCount())) {
case success:
case SUCCESS:
// If there are multiple successful runs of the same test, count all of them
int successCount = 0;
for (ReportEntryType type : resultTypes) {
if (type == SUCCESS) {
if (type == ReportEntryType.SUCCESS) {
successCount++;
}
}
completedCount += successCount - 1;
break;
case skipped:
case SKIPPED:
skipped++;
break;
case flake:
case FLAKE:
flakyTests.put(testClassMethodName, testMethodStats);
break;
case failure:
case FAILURE:
failedTests.put(testClassMethodName, testMethodStats);
break;
case error:
case ERROR:
errorTests.put(testClassMethodName, testMethodStats);
break;
default:
Expand All @@ -318,15 +318,15 @@ boolean printTestFailures(TestResultType type) {
final Map<String, List<TestMethodStats>> testStats;
final Level level;
switch (type) {
case failure:
case FAILURE:
testStats = failedTests;
level = Level.FAILURE;
break;
case error:
case ERROR:
testStats = errorTests;
level = Level.FAILURE;
break;
case flake:
case FLAKE:
testStats = flakyTests;
level = Level.UNSTABLE;
break;
Expand Down Expand Up @@ -363,12 +363,12 @@ boolean printTestFailures(TestResultType type) {

// Describe the result of a given test
enum TestResultType {
error("Errors: "),
failure("Failures: "),
flake("Flakes: "),
success("Success: "),
skipped("Skipped: "),
unknown("Unknown: ");
ERROR("Errors: "),
FAILURE("Failures: "),
FLAKE("Flakes: "),
SUCCESS("Success: "),
SKIPPED("Skipped: "),
UNKNOWN("Unknown: ");

private final String logPrefix;

Expand Down
10 changes: 5 additions & 5 deletions ...re-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,16 @@ private void serializeTestClassWithRerun(
throws IOException {
WrappedReportEntry firstMethodEntry = methodEntries.get(0);
switch (getTestResultType(methodEntries)) {
case success:
case SUCCESS:
for (WrappedReportEntry methodEntry : methodEntries) {
if (methodEntry.getReportEntryType() == SUCCESS) {
startTestElement(ppw, methodEntry);
ppw.endElement();
}
}
break;
case error:
case failure:
case ERROR:
case FAILURE:
// When rerunFailingTestsCount is set to larger than 0
startTestElement(ppw, firstMethodEntry);
boolean firstRun = true;
Expand Down Expand Up @@ -281,7 +281,7 @@ private void serializeTestClassWithRerun(
}
ppw.endElement();
break;
case flake:
case FLAKE:
WrappedReportEntry successful = null;
// Get the run time of the first successful run
for (WrappedReportEntry singleRunEntry : methodEntries) {
Expand All @@ -306,7 +306,7 @@ private void serializeTestClassWithRerun(
}
ppw.endElement();
break;
case skipped:
case SKIPPED:
startTestElement(ppw, firstMethodEntry);
getTestProblems(
fw,
Expand Down
31 changes: 13 additions & 18 deletions ...mon/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.maven.plugin.surefire.extensions.SurefireStatelessReporter;
import org.apache.maven.plugin.surefire.extensions.SurefireStatelessTestsetInfoReporter;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType;
import org.apache.maven.surefire.api.report.SafeThrowable;
import org.apache.maven.surefire.api.report.StackTraceWriter;
import org.apache.maven.surefire.api.report.TestOutputReportEntry;
Expand All @@ -42,12 +43,6 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.error;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.failure;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.flake;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.skipped;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.success;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.unknown;
import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.getTestResultType;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -143,7 +138,7 @@ public void testMergeTestHistoryResult() throws Exception {
assertEquals(0, mergedStatistics.getSkipped());

// Now test the result will be printed out correctly
factory.printTestFailures(flake);
factory.printTestFailures(TestResultType.FLAKE);
String[] expectedFlakeOutput = {
"Flakes: ",
TEST_FOUR,
Expand All @@ -163,14 +158,14 @@ public void testMergeTestHistoryResult() throws Exception {
assertEquals(asList(expectedFlakeOutput), reporter.getMessages());

reporter.reset();
factory.printTestFailures(error);
factory.printTestFailures(TestResultType.ERROR);
String[] expectedFailureOutput = {
"Errors: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, " Run 2: " + ERROR, " Run 3: " + ERROR, ""
};
assertEquals(asList(expectedFailureOutput), reporter.getMessages());

reporter.reset();
factory.printTestFailures(failure);
factory.printTestFailures(TestResultType.FAILURE);
assertEquals(emptyList(), reporter.getMessages());
}

Expand Down Expand Up @@ -238,41 +233,41 @@ void reset() {

public void testGetTestResultType() {
List<ReportEntryType> emptyList = new ArrayList<>();
assertEquals(unknown, getTestResultType(emptyList, 1));
assertEquals(TestResultType.UNKNOWN, getTestResultType(emptyList, 1));

List<ReportEntryType> successList = new ArrayList<>();
successList.add(ReportEntryType.SUCCESS);
successList.add(ReportEntryType.SUCCESS);
assertEquals(success, getTestResultType(successList, 1));
assertEquals(TestResultType.SUCCESS, getTestResultType(successList, 1));

List<ReportEntryType> failureErrorList = new ArrayList<>();
failureErrorList.add(ReportEntryType.FAILURE);
failureErrorList.add(ReportEntryType.ERROR);
assertEquals(error, getTestResultType(failureErrorList, 1));
assertEquals(TestResultType.ERROR, getTestResultType(failureErrorList, 1));

List<ReportEntryType> errorFailureList = new ArrayList<>();
errorFailureList.add(ReportEntryType.ERROR);
errorFailureList.add(ReportEntryType.FAILURE);
assertEquals(error, getTestResultType(errorFailureList, 1));
assertEquals(TestResultType.ERROR, getTestResultType(errorFailureList, 1));

List<ReportEntryType> flakeList = new ArrayList<>();
flakeList.add(ReportEntryType.SUCCESS);
flakeList.add(ReportEntryType.FAILURE);
assertEquals(flake, getTestResultType(flakeList, 1));
assertEquals(TestResultType.FLAKE, getTestResultType(flakeList, 1));

assertEquals(failure, getTestResultType(flakeList, 0));
assertEquals(TestResultType.FAILURE, getTestResultType(flakeList, 0));

flakeList = new ArrayList<>();
flakeList.add(ReportEntryType.ERROR);
flakeList.add(ReportEntryType.SUCCESS);
flakeList.add(ReportEntryType.FAILURE);
assertEquals(flake, getTestResultType(flakeList, 1));
assertEquals(TestResultType.FLAKE, getTestResultType(flakeList, 1));

assertEquals(error, getTestResultType(flakeList, 0));
assertEquals(TestResultType.ERROR, getTestResultType(flakeList, 0));

List<ReportEntryType> skippedList = new ArrayList<>();
skippedList.add(ReportEntryType.SKIPPED);
assertEquals(skipped, getTestResultType(skippedList, 1));
assertEquals(TestResultType.SKIPPED, getTestResultType(skippedList, 1));
}

public void testLogger() {
Expand Down